发货计划：后日预发是的时候默认填写发货时点(10:00)，在第二天创建明日预发数据时自动带入发货时点

房远帅
1 parent 60729944
Showing 1 changed file with 61 additions and 4 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsPlanDetailServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsPlanDetailServiceImpl.java
View file @daf6bdc
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsPlanDetailServiceImpl.java
View file @daf6bdc
@@ -336,9 +336,9 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByShipmentDate(dateList, false);
         // 获取订货单数据
         Map<String, PurchaseOrderInfo> orderInfoMap = new HashMap<>();
+        List<String> orderIds = new ArrayList<>();
+        List<String> orderSpecIds = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(orderLineList)) {
-            List<String> orderIds = new ArrayList<>();
-            List<String> orderSpecIds = new ArrayList<>();
             // 获取发货明细
             for (PurchaseOrderLine orderLine : orderLineList) {
                 orderSpecIds.add(orderLine.getId());
@@ -376,6 +376,30 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             shipmentsPlanService.getBaseMapper().insert(plan);
             // 生成发货计划明细
             if (CollectionUtils.isNotEmpty(orderLineList)) {
+                // 不考虑分厂：昨天（D-1）的定时任务里写入的后日预发（preShipments=true），其 shipmentsDate = 昨天后日 = (D-1)+2 = D+1 = tomorrow
+                // 因此今天生成明日预发明细（shipmentsDate=tomorrow）时，按同一 orderSpecId 在 shipmentsDate=tomorrow + preShipments=true + canShipments=YES 的记录里取 shipmentsTime
+                Map<String, LocalTime> shipmentsTimeMap = new HashMap<>();
+                if (CollectionUtils.isNotEmpty(orderSpecIds)) {
+                    LambdaQueryWrapper<ShipmentsPlanDetail> preQueryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+                    preQueryWrapper.in(ShipmentsPlanDetail::getOrderSpecId, orderSpecIds)
+                            .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE)
+                            .eq(ShipmentsPlanDetail::getPreShipments, Boolean.TRUE)
+                            .eq(ShipmentsPlanDetail::getCanShipments, Boolean.TRUE)
+                            .eq(ShipmentsPlanDetail::getShipmentsDate, tomorrow)
+                            .isNotNull(ShipmentsPlanDetail::getShipmentsTime);
+                    List<ShipmentsPlanDetail> preDetailList = getBaseMapper().selectList(preQueryWrapper);
+                    if (CollectionUtils.isNotEmpty(preDetailList)) {
+                        // 同一 orderSpecId 取创建时间最新的一条发货时点
+                        preDetailList.sort(Comparator.comparing(ShipmentsPlanDetail::getUpdateTime,
+                                Comparator.nullsLast(Comparator.naturalOrder())).reversed());
+                        for (ShipmentsPlanDetail preDetail : preDetailList) {
+                            if (StringUtils.isBlank(preDetail.getOrderSpecId()) || preDetail.getShipmentsTime() == null) {
+                                continue;
+                            }
+                            shipmentsTimeMap.putIfAbsent(preDetail.getOrderSpecId(), preDetail.getShipmentsTime());
+                        }
+                    }
+                }
                 List<ShipmentsPlanDetail> planDetails = new ArrayList<>();
                 for (PurchaseOrderLine line : orderLineList) {
                     ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
@@ -408,7 +432,13 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                     detail.setDelFlag(Boolean.FALSE);
                     detail.setCreateById("1");
                     detail.setUpdateById("1");
-
+                    // 新建「明日预发」明细时：前一天的后日预发里若 canShipments=YES，自动带入原发货时点
+                    if (Boolean.FALSE.equals(detail.getPreShipments())) {
+                        LocalTime shipmentsTime = shipmentsTimeMap.get(line.getId());
+                        if (shipmentsTime != null) {
+                            detail.setShipmentsTime(shipmentsTime);
+                        }
+                    }
                     planDetails.add(detail);
                 }
                 if (CollectionUtils.isNotEmpty(planDetails)) {
@@ -489,6 +519,30 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
         }
         // 6. 生成发货计划明细，加入明日预发
+        // 不考虑分厂：昨天（D-1）的定时任务里写入的后日预发（preShipments=true），其 shipmentsDate = 昨天后日 = (D-1)+2 = D+1 = tomorrow
+        // 因此今天生成明日预发明细（shipmentsDate=tomorrow）时，按同一 orderSpecId 在 shipmentsDate=tomorrow + preShipments=true + canShipments=YES 的记录里取 shipmentsTime
+        Map<String, LocalTime> shipmentsTimeMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(specIds)) {
+            LambdaQueryWrapper<ShipmentsPlanDetail> preQueryWrapper = Wrappers.lambdaQuery(ShipmentsPlanDetail.class);
+            preQueryWrapper.in(ShipmentsPlanDetail::getOrderSpecId, specIds)
+                    .eq(ShipmentsPlanDetail::getDelFlag, Boolean.FALSE)
+                    .eq(ShipmentsPlanDetail::getPreShipments, Boolean.TRUE)
+                    .eq(ShipmentsPlanDetail::getCanShipments, Boolean.TRUE)
+                    .eq(ShipmentsPlanDetail::getShipmentsDate, tomorrow)
+                    .isNotNull(ShipmentsPlanDetail::getShipmentsTime);
+            List<ShipmentsPlanDetail> preDetailList = getBaseMapper().selectList(preQueryWrapper);
+            if (CollectionUtils.isNotEmpty(preDetailList)) {
+                preDetailList.sort(Comparator.comparing(ShipmentsPlanDetail::getUpdateTime,
+                        Comparator.nullsLast(Comparator.naturalOrder())).reversed());
+                for (ShipmentsPlanDetail preDetail : preDetailList) {
+                    if (StringUtils.isBlank(preDetail.getOrderSpecId()) || preDetail.getShipmentsTime() == null) {
+                        continue;
+                    }
+                    shipmentsTimeMap.putIfAbsent(preDetail.getOrderSpecId(), preDetail.getShipmentsTime());
+                }
+            }
+        }
+        // 6. 生成发货计划明细，加入明日预发
         List<ShipmentsPlanDetail> planDetails = new ArrayList<>();
         for (PurchaseOrderLine line : orderLines) {
             ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
@@ -501,7 +555,10 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
             detail.setDelFlag(Boolean.FALSE);
             detail.setCreateById("1");
             detail.setUpdateById("1");
-
+            LocalTime shipmentsTime = shipmentsTimeMap.get(line.getId());
+            if (shipmentsTime != null) {
+                detail.setShipmentsTime(shipmentsTime);
+            }
             planDetails.add(detail);
         }
         if (CollectionUtils.isNotEmpty(planDetails)) {