楚江ERP：去除补货单生成发货计划

@@ -236,18 +236,6 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
                 orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(PurchaseOrderInfo::getId, Function.identity()));
             }
         }
-
-        // 获取补货单数据
-        List<ReplenishmentOrderLine> replenishmentOrderLineList = replenishmentOrderLineService.listByShipmentDate(dateList);
-        Map<String, ReplenishmentOrder> replenishmentOrderMap = new HashMap<>();
-        if (CollectionUtils.isNotEmpty(replenishmentOrderLineList)) {
-            List<String> replenishmentOrderIdList = replenishmentOrderLineList.stream().map(ReplenishmentOrderLine::getReplenishmentOrderId).collect(Collectors.toList());
-            List<ReplenishmentOrder> replenishmentOrderList = replenishmentOrderService.listByIds(replenishmentOrderIdList);
-            if (CollectionUtils.isNotEmpty(replenishmentOrderList)) {
-                replenishmentOrderMap = replenishmentOrderList.stream().collect(Collectors.toMap(ReplenishmentOrder::getId, Function.identity()));
-            }
-        }
-
         for (Workshop workshop : workshopList) {
             // 生成发货计划
             ShipmentsPlan plan = new ShipmentsPlan();
@@ -259,8 +247,8 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
 
             shipmentsPlanService.getBaseMapper().insert(plan);
             // 生成发货计划明细
-            List<ShipmentsPlanDetail> planDetails = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(orderLineList)) {
+                List<ShipmentsPlanDetail> planDetails = new ArrayList<>();
                 for (PurchaseOrderLine line : orderLineList) {
                     ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
                     detail.setId(IdUtil.getId());
@@ -284,38 +272,10 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
 
                     planDetails.add(detail);
                 }
-            }
-            // 补货单生成发货单明细
-            if (CollectionUtils.isNotEmpty(replenishmentOrderLineList)) {
-                for (ReplenishmentOrderLine replenishmentOrderLine : replenishmentOrderLineList) {
-                    ReplenishmentOrder replenishmentOrder = replenishmentOrderMap.get(replenishmentOrderLine.getReplenishmentOrderId());
-                    if (replenishmentOrder == null) {
-                        continue;
-                    }
-
-                    if (!workshop.getId().equals(replenishmentOrder.getWorkshopId())) {
-                        continue;
-                    }
-
-                    ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
-                    detail.setId(IdUtil.getId());
-                    detail.setPlanId(plan.getId());
-                    detail.setOrderId(replenishmentOrder.getId());
-                    detail.setOrderSpecId(replenishmentOrderLine.getId());
-                    detail.setShipmentsDate(replenishmentOrderLine.getConfirmedDeliveryDate());
-                    detail.setPreShipments(afTomorrow.equals(replenishmentOrderLine.getConfirmedDeliveryDate()));
-                    detail.setDelFlag(Boolean.FALSE);
-
-                    detail.setCreateById("1");
-                    detail.setUpdateById("1");
-
-                    planDetails.add(detail);
+                if (CollectionUtils.isNotEmpty(planDetails)) {
+                    getBaseMapper().batchAdd(planDetails);
                 }
             }
-
-            if (CollectionUtils.isNotEmpty(planDetails)) {
-                getBaseMapper().batchAdd(planDetails);
-            }
         }
     }