Merge branch 'master_chujiang_0805' into master_quotation

@@ -628,7 +628,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                         }
                         }
                     }
                     }
                     if (flag) {
                     if (flag) {
-                        // 更新订货单状态（草稿转为正常）
+                        // 更新发货单状态（草稿转为正常）
                         shipmentsOrderInfoService.updateStatus(shipmentOrderId, "UN_SHIPMENTS");
                         shipmentsOrderInfoService.updateStatus(shipmentOrderId, "UN_SHIPMENTS");
                     }
                     }
                 }
                 }

@@ -833,9 +833,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         Map<String, String> shipmentsOrderIdMap = new HashMap<>();
         Map<String, String> shipmentsOrderIdMap = new HashMap<>();
         Map<String, List<String>> deptIdMap = new HashMap<>();
         Map<String, List<String>> deptIdMap = new HashMap<>();
         Map<String, List<String>> regionMap = new HashMap<>();
         Map<String, List<String>> regionMap = new HashMap<>();
-        List<String> detailIds = new ArrayList<>();
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = new ArrayList<>();
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = new ArrayList<>();
         for (List<ShipmentsPlanDetail> details : batchList) {
         for (List<ShipmentsPlanDetail> details : batchList) {
+            List<String> detailIds = new ArrayList<>();
             String id = IdUtil.getId();
             String id = IdUtil.getId();
             String customerId = details.get(0).getCustomerId();
             String customerId = details.get(0).getCustomerId();
             StringBuilder deliveryTypeBuilder = new StringBuilder();
             StringBuilder deliveryTypeBuilder = new StringBuilder();