Merge branch 'master_chujiang_0805' into master_quotation

@@ -481,11 +481,20 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             if (MapUtils.isEmpty(detailMap)) {
             if (MapUtils.isEmpty(detailMap)) {
                 throw new DefaultClientException("不存在可以自动发货的数据！");
                 throw new DefaultClientException("不存在可以自动发货的数据！");
             }
             }
+            // 汇总：所有客户、所有批次处理完后再统一判断是否提示补充草稿
+            boolean overallNeedDraft = false;
             // todo 如果客户很多，则此处需要优化
             // todo 如果客户很多，则此处需要优化
             for (Map.Entry<String, List<ShipmentsPlanDetail>> entry : detailMap.entrySet()) {
             for (Map.Entry<String, List<ShipmentsPlanDetail>> entry : detailMap.entrySet()) {
                 List<ShipmentsPlanDetail> value = entry.getValue();
                 List<ShipmentsPlanDetail> value = entry.getValue();
                 List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(value, 8);
                 List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(value, 8);
-                handleBatchData(batchList, planId);
+                boolean needDraft = handleBatchData(batchList, planId);
+                if (needDraft) {
+                    overallNeedDraft = true;
+                }
+            }
+            // 统一抛出：保证所有客户的草稿都先被创建后再提示补充
+            if (overallNeedDraft) {
+                throw new DefaultClientException("请先补充草稿要车单数据！");
             }
             }
         } else {
         } else {
             List<String> planDetailIds = vo.getPlanDetailIds();
             List<String> planDetailIds = vo.getPlanDetailIds();
@@ -506,7 +515,10 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 }
                 }
             }
             }
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
             List<List<ShipmentsPlanDetail>> batchList = CommonUtil.partition(detailList, 8);
-            handleBatchData(batchList, planId);
+            boolean needDraft = handleBatchData(batchList, planId);
+            if (needDraft) {
+                throw new DefaultClientException("请先补充草稿要车单数据！");
+            }
         }
         }
         ShipmentsPlan plan = shipmentsPlanService.findById(planId);
         ShipmentsPlan plan = shipmentsPlanService.findById(planId);
         if ("IN_PROGRESS".equals(plan.getStatus())) {
         if ("IN_PROGRESS".equals(plan.getStatus())) {
@@ -911,10 +923,11 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
      * 处理批次数据
      * 处理批次数据
      *
      *
      * @param batchList 数据批次
      * @param batchList 数据批次
+     * @return          是否存在需要补充的草稿（新建或未审核通过）
      */
      */
-    private void handleBatchData(List<List<ShipmentsPlanDetail>> batchList, String planId) {
+    private boolean handleBatchData(List<List<ShipmentsPlanDetail>> batchList, String planId) {
         if (CollectionUtils.isEmpty(batchList)) {
         if (CollectionUtils.isEmpty(batchList)) {
-            return;
+            return false;
         }
         }
         // 获取发货计划数据
         // 获取发货计划数据
         ShipmentsPlan plan = shipmentsPlanService.findById(planId);
         ShipmentsPlan plan = shipmentsPlanService.findById(planId);
@@ -1068,7 +1081,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             }
             }
         }
         }
         // 先检查是否都有审核通过的草稿，再批量新增发货单，否则只生成草稿要车单
         // 先检查是否都有审核通过的草稿，再批量新增发货单，否则只生成草稿要车单
-        generateRequestCarData(orderInfoList, orderIds, plan, quantityMap);
+        boolean needDraft = generateRequestCarData(orderInfoList, orderIds, plan, quantityMap);
         // todo 后续如果数据量过大，则此处需要优化
         // todo 后续如果数据量过大，则此处需要优化
         batchAdd(shipmentsOrderInfoList);
         batchAdd(shipmentsOrderInfoList);
         // 生成发货单编号
         // 生成发货单编号
@@ -1084,6 +1097,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             shipmentsOrderInfo.setCode(serialNumber);
             shipmentsOrderInfo.setCode(serialNumber);
         }
         }
         getBaseMapper().setShipmentOrderCode(shipmentsOrderInfoList);
         getBaseMapper().setShipmentOrderCode(shipmentsOrderInfoList);
+        return needDraft;
     }
     }
 
 
     /**
     /**
@@ -1119,8 +1133,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
      * @param orderInfoList 订货单数据集合
      * @param orderInfoList 订货单数据集合
      * @param orderIds      订货单ID集合
      * @param orderIds      订货单ID集合
      * @param plan          发货计划
      * @param plan          发货计划
+     * @return              是否存在需要补充的草稿（新建或未审核通过）
      */
      */
-    private void generateRequestCarData(List<PurchaseOrderInfo> orderInfoList, List<String> orderIds, ShipmentsPlan plan
+    private boolean generateRequestCarData(List<PurchaseOrderInfo> orderInfoList, List<String> orderIds, ShipmentsPlan plan
             , Map<String, BigDecimal> quantityMap) {
             , Map<String, BigDecimal> quantityMap) {
         // 1. 批量获取已有的草稿要车单
         // 1. 批量获取已有的草稿要车单
         Map<String, DraftRequestCarTicket> draftTicketMap = new HashMap<>();
         Map<String, DraftRequestCarTicket> draftTicketMap = new HashMap<>();
@@ -1152,12 +1167,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             }
             }
         }
         }
 
 
-        // 【第二阶段：统一校验并返回提示】
-        // 循环结束后，只要生成了新的草稿或有未通过的草稿，就统一抛出异常
-        // 这样既保证了所有草稿都被创建，又实现了已创建数据不回退的效果
-        if (hasNewDraftCreated) {
-            throw new DefaultClientException("请先补充草稿要车单数据！");
-        }
+        // 返回给上层统一处理抛出：避免按客户循环时中途抛出导致后续客户无法生成草稿
+        return hasNewDraftCreated;
     }
     }