楚江ERP-生成发货单时要车相关数据逻辑调整

@@ -46,6 +46,11 @@ public class RequestCarTicket extends BaseEntity implements BaseDto {
     private String purchaseOrderId;
 
     /**
+     * 发货单ID
+     */
+    private String shipmentsOrderId;
+
+    /**
      * 要车日期
      */
     private LocalDate requestCarDate;

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.components.redis.RedisHandler;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.*;
 import com.lframework.starter.web.inner.dto.dic.city.DicCityDto;
@@ -71,6 +72,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private CarRequestPlanService carRequestPlanService;
     @Resource
     private RequestCarTicketService requestCarTicketService;
+    @Resource
+    private RedisHandler redisHandler;
 
 
     @Override
@@ -401,6 +404,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         if (CollectionUtils.isNotEmpty(orderInfoList)) {
             orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(PurchaseOrderInfo::getId, Function.identity()));
         }
+        Map<String, BigDecimal> quantityMap = new HashMap<>();
+        Map<String, String> shipmentsOrderIdMap = new HashMap<>();
         Map<String, List<String>> deptIdMap = new HashMap<>();
         List<String> detailIds = new ArrayList<>();
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = new ArrayList<>();
@@ -454,6 +459,15 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                         destinationBuilder.append(" | ");
                     }
                 }
+                // 计划吨位
+                BigDecimal bigDecimal = quantityMap.get(detail.getOrderId());
+                if (bigDecimal == null) {
+                    bigDecimal = new BigDecimal(0);
+                }
+                BigDecimal result = bigDecimal.add(detail.getQuantity());
+                quantityMap.put(detail.getOrderId(), result);
+                // 发货单ID和订货单ID映射
+                shipmentsOrderIdMap.put(detail.getOrderId(), id);
             }
             if (deliveryTypeBuilder.length() > 3) {
                 deliveryTypeBuilder.setLength(deliveryTypeBuilder.length() - 3);
@@ -495,7 +509,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         batchAdd(shipmentsOrderInfoList);
         // todo 后续如果数据量过大，则此处需要优化
         // 生成要车相关数据
-        generateRequestCarData(orderInfoList, orderIds, plan);
+        generateRequestCarData(orderInfoList, orderIds, plan, quantityMap, shipmentsOrderIdMap);
     }
 
 
@@ -506,7 +520,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
      * @param orderIds      订货单ID集合
      * @param plan          发货计划
      */
-    private void generateRequestCarData(List<PurchaseOrderInfo> orderInfoList, List<String> orderIds, ShipmentsPlan plan) {
+    private void generateRequestCarData(List<PurchaseOrderInfo> orderInfoList, List<String> orderIds, ShipmentsPlan plan
+            , Map<String, BigDecimal> quantityMap, Map<String, String> shipmentsOrderIdMap) {
         // 根据订货单获取草稿要车单
         Map<String, DraftRequestCarTicket> draftTicketMap = new HashMap<>();
         List<DraftRequestCarTicket> draftTickets = draftRequestCarTicketService.listByOrderId(orderIds);
@@ -515,11 +530,17 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                     , (v1, v2) -> v2));
         }
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
-            DraftRequestCarTicket draftTicket = draftTicketMap.get(orderInfo.getId());
+            String orderId = orderInfo.getId();
+            DraftRequestCarTicket draftTicket = draftTicketMap.get(orderId);
+            BigDecimal quantity = quantityMap.get(orderId);
+            String shipmentsOrderId = shipmentsOrderIdMap.get(orderId);
             if (draftTicket == null) {
                 // 生成草稿要车单
-                CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate());
-                draftRequestCarTicketService.create(createVo);
+                CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate(), quantity);
+                String draftId = draftRequestCarTicketService.create(createVo);
+
+                // 草稿要车单id和要车单id映射
+                redisHandler.set("GET_SHIPMENTS_ORDER_ID_" + draftId, shipmentsOrderId);
                 break;
             }
             if ("PASS".equals(draftTicket.getStatus())) {
@@ -530,7 +551,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 String requestCarPlanId = carRequestPlanService.create(planCreateVo);
                 // 生成要车单
                 CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(orderInfo, requestCarPlanId,
-                        draftTicket.getId(), plan.getTomoPreShipDate(), draftTicket.getExternalAuditor());
+                        draftTicket.getId(), plan.getTomoPreShipDate(), draftTicket.getExternalAuditor(), quantity, shipmentsOrderId);
                 requestCarTicketService.create(ticketCreateVo);
             } else {
                 throw new DefaultClientException("请先补充草稿要车单数据！");
@@ -546,7 +567,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
      * @param shipmentsDate 发货日期
      * @return              CreateDraftRequestCarTicketVo
      */
-    private CreateDraftRequestCarTicketVo packDraftRequestCarTicket(PurchaseOrderInfo orderInfo, LocalDate shipmentsDate) {
+    private CreateDraftRequestCarTicketVo packDraftRequestCarTicket(PurchaseOrderInfo orderInfo, LocalDate shipmentsDate, BigDecimal quantity) {
         CreateDraftRequestCarTicketVo draftTicketVo = new CreateDraftRequestCarTicketVo();
         draftTicketVo.setPurchaseOrderId(orderInfo.getId());
         draftTicketVo.setDeptId(orderInfo.getDeptId());
@@ -554,10 +575,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         draftTicketVo.setWorkshopId(orderInfo.getWorkshopId());
         draftTicketVo.setOrderNo(orderInfo.getOrderNo());
         draftTicketVo.setOrderingUnit(orderInfo.getOrderingUnit());
-        if (orderInfo.getTotalQuantity() != null) {
-            BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
-            draftTicketVo.setQuantity(result);
-        }
+        draftTicketVo.setQuantity(quantity);
         //经营办审核人(发货计划提交人)
         draftTicketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
         //发货计划
@@ -572,7 +590,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
      * @return CreateRequestCarTicketVo
      */
     private CreateRequestCarTicketVo packRequestCarTicket(PurchaseOrderInfo orderInfo, String planId, String draftId,
-                                                          LocalDate shipmentsDate, String externalAuditor) {
+                                                          LocalDate shipmentsDate, String externalAuditor, BigDecimal quantity, String shipmentsOrderId) {
         CreateRequestCarTicketVo ticketVo = new CreateRequestCarTicketVo();
         ticketVo.setDraftId(draftId);
         ticketVo.setPlanId(planId);
@@ -583,10 +601,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         ticketVo.setWorkshopId(orderInfo.getWorkshopId());
         ticketVo.setOrderNo(orderInfo.getOrderNo());
         ticketVo.setOrderingUnit(orderInfo.getOrderingUnit());
-        if (orderInfo.getTotalQuantity() != null) {
-            BigDecimal result = orderInfo.getTotalQuantity().divide(new BigDecimal(1000), 4, BigDecimal.ROUND_HALF_UP);
-            ticketVo.setQuantity(result);
-        }
+        ticketVo.setQuantity(quantity);
+        ticketVo.setShipmentsOrderId(shipmentsOrderId);
         //外办审核人(草稿要车单审核人)
         ticketVo.setExternalAuditor(externalAuditor);
         //经营办审核人(发货计划提交人)

@@ -74,6 +74,9 @@ public class RequestCarTicketServiceImpl extends BaseMpServiceImpl<RequestCarTic
         if (!StringUtil.isBlank(vo.getPurchaseOrderId())) {
             data.setPurchaseOrderId(vo.getPurchaseOrderId());
         }
+        if (!StringUtil.isBlank(vo.getShipmentsOrderId())) {
+            data.setShipmentsOrderId(vo.getShipmentsOrderId());
+        }
         if (vo.getRequestCarDate() != null) {
             data.setRequestCarDate(vo.getRequestCarDate());
         }

@@ -34,6 +34,12 @@ public class CreateRequestCarTicketVo implements BaseVo, Serializable {
     private String purchaseOrderId;
 
     /**
+     * 发货单ID
+     */
+    @ApiModelProperty("发货单ID")
+    private String shipmentsOrderId;
+
+    /**
      * 要车日期
      */
     @ApiModelProperty("要车日期")

@@ -256,9 +256,11 @@
     <select id="listByPlanId" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">
         select
             pd.*,
+            ol.quantity,
             c.id as customer_id
         from shipments_plan_detail pd
         inner join shipments_plan p on pd.plan_id = p.id and pd.shipments_date = p.tomo_pre_ship_date
+        left join tbl_purchase_order_line ol on pd.order_spec_id = ol.id
         left join purchase_order_info o on pd.order_id = o.id
         left join base_data_customer c on o.ordering_unit = c.id
         where pd.del_flag = false