Merge branch 'master_chujiang_0805' into master_quotation

@@ -170,7 +170,7 @@ public class ReceiptLedgerInfoController extends DefaultBaseController {
      */
     @ApiOperation("自动生成台账明细数据")
     @GetMapping("/autoGenerate")
-    @Scheduled(cron = "0 10 2 * * ?")
+//    @Scheduled(cron = "0 10 2 * * ?")
     public InvokeResult<Void> autoGenerate() {
         receiptLedgerInfoService.autoGenerate();
         return InvokeResultBuilder.success();

@@ -160,10 +160,18 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             return;
         }
 
-        boolean isYwy = roleCodes.contains("ywy");
+        // 1. 优先判断：是否拥有【办事处内勤】或【办事处主管】权限
+        boolean isNeiqinOrZhuguan = roleCodes.contains("bscnq") || roleCodes.contains("bsczg");
 
-        if (isYwy) {
-            // 业务员：有区域按区域过滤，没有则按办事处过滤
+        if (isNeiqinOrZhuguan) {
+            // 办事处内勤/办事处主管：始终按办事处过滤
+            if (StringUtils.isNotBlank(scope.getOfficeDeptId())) {
+                vo.setDeptId(scope.getOfficeDeptId());
+                vo.setRegion(null);
+            }
+        } else if (roleCodes.contains("ywy")) {
+            // 2. 次优先级：业务员权限
+            // 有区域按区域过滤，没有则按办事处过滤
             if (StringUtils.isNotBlank(scope.getRegionId())) {
                 vo.setRegion(scope.getRegionId());
                 vo.setDeptId(null);
@@ -171,12 +179,6 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                 vo.setDeptId(scope.getOfficeDeptId());
                 vo.setRegion(null);
             }
-        } else {
-            // 办事处内勤/办事处主管：始终按办事处过滤
-            if (StringUtils.isNotBlank(scope.getOfficeDeptId())) {
-                vo.setDeptId(scope.getOfficeDeptId());
-                vo.setRegion(null);
-            }
         }
     }
 
@@ -308,7 +310,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     @HasPermission({"shipping-plan-manage:shipping-plan:generate"})
     @PostMapping("/generate")
     public InvokeResult<Void> generate(@Valid @RequestBody GenerateShipmentsOrderVo vo) {
-        // 生成发货单和要车相关数据
+        // 生成发货单和要车单、要车计划相关数据
         shipmentsOrderInfoService.generate(vo);
         return InvokeResultBuilder.success();
     }
@@ -330,7 +332,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     }
 
     /**
-     * 明细数据补充录入
+     * 明细数据补充录入（填写实发数）
      */
     @ApiOperation("明细数据补充录入")
     @HasPermission({"shipping-plan-manage:invoice:fill"})
@@ -383,7 +385,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
 
     @ApiModelProperty("数据处理")
     @GetMapping("/dataHandler")
-    @Scheduled(cron = "0 8 0 * * ?")
+//    @Scheduled(cron = "0 8 0 * * ?")
     public InvokeResult<Void> dataHandler() {
         // 只处理今日应该发货但状态仍是未发货的数据，避免已签收/已发货的数据被重复处理
         log.info("=========定时任务开始执行========");
@@ -411,7 +413,8 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                         }
                     }
                     List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
-                    shipmentsOrderInfoService.handleData(shipmentsOrderInfo, orderInfoList, orderSpecIds, detailIds);
+                    //todo 暂时只在填写实发数的时候处理相关数据（生成发货明细报表数据、生成台账等）
+//                    shipmentsOrderInfoService.handleData(shipmentsOrderInfo, orderInfoList, orderSpecIds, detailIds);
                 } catch (Exception e) {
                     // 单张发货单处理失败不影响其他发货单
                     log.error("定时任务处理发货单 [{}] 失败：{}", orderInfo.getId(), e.getMessage(), e);

@@ -610,7 +610,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             //更新外办审核人
             draftRequestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
             //如果是发货计划生成的草稿要车单-需要生成要车单和要车计划
-            DraftRequestCarTicket draftRequestCarTicket = draftRequestCarTicketService.findById(businessId);
+/*            DraftRequestCarTicket draftRequestCarTicket = draftRequestCarTicketService.findById(businessId);
             if (draftRequestCarTicket != null && "SHIPMENTSPLAN".equals(draftRequestCarTicket.getSource())) {
                 // 处理发货单
                 String shipmentOrderId = (String) redisHandler.get("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
@@ -632,7 +632,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                         shipmentsOrderInfoService.updateStatus(shipmentOrderId, "UN_SHIPMENTS");
                     }
                 }
-            }
+            }*/
         } else if (FlowInstanceStatus.REVOKE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.REFUSE.getCode().equals(flowStatus)
                 || FlowInstanceStatus.TERMINATION.getCode().equals(flowStatus)) {

@@ -797,7 +797,7 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         // 生成发货明细报表数据
         shipmentDetailStatisticsService.generateStatisticsData(detailIds);
         // 生成要车计划、要车单
-        generateCarPlanAndTicket(shipmentsOrderInfos);
+//        generateCarPlanAndTicket(shipmentsOrderInfos);
     }
 
     @Override

@@ -443,7 +443,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 }
             }
             List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
-            this.handleData(data, orderInfoList, orderSpecIds, detailIds);
+            //todo 暂时只在填写实发数的时候处理相关数据（生成发货明细报表数据、生成台账等）
+//            this.handleData(data, orderInfoList, orderSpecIds, detailIds);
         }
     }
 
@@ -642,12 +643,13 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             }
         }
         // 判断当前日期是否大于等于发货日期
-        LocalDate now = LocalDate.now();
-        LocalDate shipmentsDate = orderInfo.getShipmentsDate();
-        if (BooleanUtils.isTrue(vo.getOnTimeShipment()) && !now.isBefore(shipmentsDate)) {
-            orderInfo = findById(shipmentsOrderId);
+//        LocalDate now = LocalDate.now();
+//        LocalDate shipmentsDate = orderInfo.getShipmentsDate();
+//        if (BooleanUtils.isTrue(vo.getOnTimeShipment()) && !now.isBefore(shipmentsDate)) {
+//            orderInfo = findById(shipmentsOrderId);
+        //todo 填写实发数的时候就直接生成相关数据，目前暂时不考虑不是当日发货的情况
             handleData(orderInfo, orderInfoList, orderSpecIds, detailIds);
-        }
+//        }
     }
 
     @Override
@@ -882,7 +884,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         // 生成发货明细报表数据
         shipmentDetailStatisticsService.generateStatisticsData(detailIds);
         // 生成要车计划、要车单数据
-        carRequestPlanService.generate(orderInfoList, shipmentsOrderInfo);
+        //todo 提前到生成发货单的时候生成要车计划、要车单数据
+//        carRequestPlanService.generate(orderInfoList, shipmentsOrderInfo);
         // 消息通知
         String type = shipmentsOrderInfo.getShipmentType();
         List<String> userIds = new ArrayList<>();
@@ -927,12 +930,22 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         if (CollectionUtils.isNotEmpty(orderInfoList)) {
             orderInfoMap = orderInfoList.stream().collect(Collectors.toMap(PurchaseOrderInfo::getId, Function.identity()));
         }
+        //先检查是否都有审核通过的草稿要车单
+        boolean allApproved = areAllDraftTicketsApproved(orderIds);
+
         Map<String, BigDecimal> quantityMap = new HashMap<>();
         Map<String, String> shipmentsOrderIdMap = new HashMap<>();
         Map<String, List<String>> deptIdMap = new HashMap<>();
         Map<String, List<String>> regionMap = new HashMap<>();
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = new ArrayList<>();
         for (List<ShipmentsPlanDetail> details : batchList) {
+            // 获取当前批次订货单数据
+            List<String> batchOrderIds = details.stream()
+                    .map(ShipmentsPlanDetail::getOrderId)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .collect(Collectors.toList());
+            List<PurchaseOrderInfo> batchOrderInfoList = purchaseOrderInfoService.queryByIds(batchOrderIds);
             List<String> detailIds = new ArrayList<>();
             String id = IdUtil.getId();
             String customerId = details.get(0).getCustomerId();
@@ -1034,7 +1047,11 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
 
             shipmentsOrderInfoList.add(shipmentsOrderInfo);
             // 更新明细数据
-            shipmentsPlanDetailService.setShipmentsOrderId(detailIds, id);
+            if (allApproved) {
+                shipmentsPlanDetailService.setShipmentsOrderId(detailIds, id);
+                //生成要车单和要车计划
+                carRequestPlanService.generate(batchOrderInfoList, shipmentsOrderInfo);
+            }
         }
         // 获取所有部门数据
         for (ShipmentsOrderInfo orderInfo : shipmentsOrderInfoList) {
@@ -1050,11 +1067,10 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 orderInfo.setRegion(regionStr);
             }
         }
-        // 批量新增发货单
-        batchAdd(shipmentsOrderInfoList);
+        // 先检查是否都有审核通过的草稿，再批量新增发货单，否则只生成草稿要车单
+        generateRequestCarData(orderInfoList, orderIds, plan, quantityMap);
         // todo 后续如果数据量过大，则此处需要优化
-        // 生成要车相关数据
-        generateRequestCarData(orderInfoList, orderIds, plan, quantityMap, shipmentsOrderIdMap);
+        batchAdd(shipmentsOrderInfoList);
         // 生成发货单编号
         // 获取当月最后一天的23:59:59
         LocalDateTime monthEnd = LocalDateTime.now()
@@ -1070,6 +1086,32 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         getBaseMapper().setShipmentOrderCode(shipmentsOrderInfoList);
     }
 
+    /**
+     * 检查指定的订单是否都存在审核通过的草稿要车单
+     * @param orderIds 订单ID列表
+     * @return true-全部审核通过；false-存在缺失或未通过的草稿
+     */
+    private boolean areAllDraftTicketsApproved(List<String> orderIds) {
+        if (CollectionUtils.isEmpty(orderIds)) {
+            return true;
+        }
+
+        List<DraftRequestCarTicket> draftTickets = draftRequestCarTicketService.listByOrderId(orderIds);
+        Map<String, DraftRequestCarTicket> draftTicketMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(draftTickets)) {
+            draftTicketMap = draftTickets.stream()
+                    .collect(Collectors.toMap(DraftRequestCarTicket::getPurchaseOrderId, Function.identity(), (v1, v2) -> v2));
+        }
+
+        for (String orderId : orderIds) {
+            DraftRequestCarTicket draftTicket = draftTicketMap.get(orderId);
+            // 只要有一个不存在，或者状态不是 PASS，直接返回 false
+            if (draftTicket == null || !"PASS".equals(draftTicket.getStatus())) {
+                return false;
+            }
+        }
+        return true;
+    }
 
     /**
      * 生成要车相关数据
@@ -1079,44 +1121,53 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
      * @param plan          发货计划
      */
     private void generateRequestCarData(List<PurchaseOrderInfo> orderInfoList, List<String> orderIds, ShipmentsPlan plan
-            , Map<String, BigDecimal> quantityMap, Map<String, String> shipmentsOrderIdMap) {
-        // 根据订货单获取草稿要车单
+            , Map<String, BigDecimal> quantityMap) {
+        // 1. 批量获取已有的草稿要车单
         Map<String, DraftRequestCarTicket> draftTicketMap = new HashMap<>();
         List<DraftRequestCarTicket> draftTickets = draftRequestCarTicketService.listByOrderId(orderIds);
         if (CollectionUtils.isNotEmpty(draftTickets)) {
-            draftTicketMap = draftTickets.stream().collect(Collectors.toMap(DraftRequestCarTicket::getPurchaseOrderId, Function.identity()
-                    , (v1, v2) -> v2));
+            draftTicketMap = draftTickets.stream()
+                    .collect(Collectors.toMap(DraftRequestCarTicket::getPurchaseOrderId, Function.identity(), (v1, v2) -> v2));
         }
+
+        // 标记本次循环中是否有新生成的草稿要车单
+        boolean hasNewDraftCreated = false;
+
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
             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(), quantity);
-                String draftId = draftRequestCarTicketService.create(createVo);
-                // 草稿要车单ID和发货单ID映射
-                redisHandler.set("GET_SHIPMENTS_ORDER_ID_" + draftId, shipmentsOrderId);
-                //发送消息提醒业务员（发货单中合同创建人）补充草稿要车单相关数据
+                draftRequestCarTicketService.create(createVo);
+                // 发送消息提醒业务员补充数据
                 SysSiteMessageDto messageDto = new SysSiteMessageDto();
                 List<String> userIdList = new ArrayList<>();
                 userIdList.add(orderInfo.getContractCreateById());
                 messageDto.setUserIdList(userIdList);
                 messageDto.setTitle("草稿要车单补充通知");
-                messageDto.setContent("您有新的草稿要车单需要补充，请尽快完成！");
+                messageDto.setContent("您有新的草稿要车单需要补充，请尽快完成！订单编号：" + orderInfo.getOrderNo());
                 messageDto.setBizKey(IdUtil.getId());
-                //如果是空表示由系统自动发起
-                messageDto.setCreateUserId(null);
+                messageDto.setCreateUserId(null); // 系统自动发起
                 mqProducerService.createSysSiteMessage(messageDto);
-                // 更新发货单状态为草稿
-                updateStatus(shipmentsOrderId, "DRAFT");
-                continue;
-            }
-            if (!"PASS".equals(draftTicket.getStatus())) {
-                throw new DefaultClientException("请先补充草稿要车单数据！");
+
+                // 标记已生成新草稿
+                hasNewDraftCreated = true;
+
+            } else if (!"PASS".equals(draftTicket.getStatus())) {
+                // 如果草稿已存在但未通过审核，也标记为需要补充
+                hasNewDraftCreated = true;
             }
         }
+
+        // 【第二阶段：统一校验并返回提示】
+        // 循环结束后，只要生成了新的草稿或有未通过的草稿，就统一抛出异常
+        // 这样既保证了所有草稿都被创建，又实现了已创建数据不回退的效果
+        if (hasNewDraftCreated) {
+            throw new DefaultClientException("请先补充草稿要车单数据！");
+        }
     }
 
 

@@ -91,7 +91,7 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
     void batchAdd(List<ShipmentsOrderInfo> orderInfos);
 
     /**
-     * 数据补充录入
+     * 数据补充录入（填写实发数）
      *
      * @param vo    数据实体
      */