Merge branch 'master_chujiang' into master_quotation

@@ -5521,7 +5521,7 @@ INSERT INTO `sys_data_permission_model_detail` VALUES (12, '状态', 1, '0,5,6,7
 INSERT INTO `sys_data_permission_model_detail` VALUES (13, '创建时间', 1, '0,1,2,3,4,5', 2, 'product', 'create_time', NULL, NULL);
 INSERT INTO `sys_data_permission_model_detail` VALUES (14, '创建人部门与本人相同', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN ({__var#curDeptIds})');
 INSERT INTO `sys_data_permission_model_detail` VALUES (15, '创建人部门是本人的上级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE FIND_IN_SET(__ud.dept_id,(SELECT GROUP_CONCAT(__mp.path) FROM sys_dept AS __d INNER JOIN recursion_mapping AS __mp ON __mp.node_id=__d.id AND __mp.node_type=1 WHERE __d.id IN ({__var#curDeptIds}) AND __mp.level> 1))');
-INSERT INTO `sys_data_permission_model_detail` VALUES (16, '创建人部门是本人的下级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN (SELECT __mp.node_id FROM recursion_mapping AS __mp WHERE FIND_IN_SET((SELECT __d.id FROM sys_dept AS __d WHERE __d.id IN ({__var#curDeptIds})),__mp.path) AND __mp.node_type=1)');
+INSERT INTO `sys_data_permission_model_detail` VALUES (16, '创建人部门是本人的下级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN (SELECT __mp.node_id FROM recursion_mapping AS __mp WHERE __mp.node_type=1 AND EXISTS (SELECT 1 FROM sys_dept AS __d WHERE __d.id IN ({__var#curDeptIds}) AND FIND_IN_SET(__d.id,__mp.path)))');
 INSERT INTO `sys_data_permission_model_detail` VALUES (17, '创建时间', 2, '0,1,2,3,4,5', 2, 'order', 'create_time', NULL, NULL);
 
 -- ----------------------------
@@ -7768,4 +7768,4 @@ CREATE TABLE `tbl_take_stock_sheet_detail`  (
 -- Records of tbl_take_stock_sheet_detail
 -- ----------------------------
 
-SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS = 1;

@@ -421,5 +421,5 @@ INSERT INTO `sys_data_permission_model_detail` VALUES (12, '状态', 1, '0,5,6,7
 INSERT INTO `sys_data_permission_model_detail` VALUES (13, '创建时间', 1, '0,1,2,3,4,5', 2, 'product', 'create_time', NULL, NULL);
 INSERT INTO `sys_data_permission_model_detail` VALUES (14, '创建人部门与本人相同', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN ({__var#curDeptIds})');
 INSERT INTO `sys_data_permission_model_detail` VALUES (15, '创建人部门是本人的上级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE FIND_IN_SET(__ud.dept_id,(SELECT GROUP_CONCAT(__mp.path) FROM sys_dept AS __d INNER JOIN recursion_mapping AS __mp ON __mp.node_id=__d.id AND __mp.node_type=1 WHERE __d.id IN ({__var#curDeptIds}) AND __mp.level> 1))');
-INSERT INTO `sys_data_permission_model_detail` VALUES (16, '创建人部门是本人的下级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN (SELECT __mp.node_id FROM recursion_mapping AS __mp WHERE FIND_IN_SET((SELECT __d.id FROM sys_dept AS __d WHERE __d.id IN ({__var#curDeptIds})),__mp.path) AND __mp.node_type=1)');
+INSERT INTO `sys_data_permission_model_detail` VALUES (16, '创建人部门是本人的下级部门', 2, '6', 99, 'order', 'create_by_id', NULL, 'SELECT DISTINCT __ud.user_id FROM sys_user_dept AS __ud WHERE __ud.dept_id IN (SELECT __mp.node_id FROM recursion_mapping AS __mp WHERE __mp.node_type=1 AND EXISTS (SELECT 1 FROM sys_dept AS __d WHERE __d.id IN ({__var#curDeptIds}) AND FIND_IN_SET(__d.id,__mp.path)))');
 INSERT INTO `sys_data_permission_model_detail` VALUES (17, '创建时间', 2, '0,1,2,3,4,5', 2, 'order', 'create_time', NULL, NULL);

@@ -248,30 +248,36 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     @GetMapping("/dataHandler")
     @Scheduled(cron = "0 8 0 * * ?")
     public InvokeResult<Void> dataHandler() {
-        List<ShipmentsOrderInfo> shipmentsOrderInfoList = shipmentsOrderInfoService.queryByShipmentDate(LocalDate.now());
+        // 只处理今日应该发货但状态仍是未发货的数据，避免已签收/已发货的数据被重复处理
+        List<ShipmentsOrderInfo> shipmentsOrderInfoList = shipmentsOrderInfoService.queryUnShipmentsByShipmentDate(LocalDate.now());
         if (CollectionUtils.isNotEmpty(shipmentsOrderInfoList)) {
             for (ShipmentsOrderInfo  orderInfo : shipmentsOrderInfoList) {
-                ShipmentsOrderInfo shipmentsOrderInfo = shipmentsOrderInfoService.findById(orderInfo.getId());
-                List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentsOrderInfo.getId());
-                if (CollectionUtils.isNotEmpty(detailList)) {
-                    continue;
-                }
-                List<String> orderIds = new ArrayList<>();
-                List<String> orderSpecIds = new ArrayList<>();
-                List<String> detailIds = new ArrayList<>();
-                for (ShipmentsPlanDetail shipmentsPlanDetail : detailList) {
-                    if (!orderIds.contains(shipmentsPlanDetail.getOrderId())) {
-                        orderIds.add(shipmentsPlanDetail.getOrderId());
-                    }
-                    if (!orderSpecIds.contains(shipmentsPlanDetail.getOrderSpecId())) {
-                        orderSpecIds.add(shipmentsPlanDetail.getOrderSpecId());
+                try {
+                    ShipmentsOrderInfo shipmentsOrderInfo = shipmentsOrderInfoService.findById(orderInfo.getId());
+                    List<ShipmentsPlanDetail> detailList = shipmentsPlanDetailService.listByShipmentOrderId(shipmentsOrderInfo.getId());
+                    if (CollectionUtils.isEmpty(detailList)) {
+                        continue;
                     }
-                    if (!detailIds.contains(shipmentsPlanDetail.getId())) {
-                        detailIds.add(shipmentsPlanDetail.getId());
+                    List<String> orderIds = new ArrayList<>();
+                    List<String> orderSpecIds = new ArrayList<>();
+                    List<String> detailIds = new ArrayList<>();
+                    for (ShipmentsPlanDetail shipmentsPlanDetail : detailList) {
+                        if (!orderIds.contains(shipmentsPlanDetail.getOrderId())) {
+                            orderIds.add(shipmentsPlanDetail.getOrderId());
+                        }
+                        if (!orderSpecIds.contains(shipmentsPlanDetail.getOrderSpecId())) {
+                            orderSpecIds.add(shipmentsPlanDetail.getOrderSpecId());
+                        }
+                        if (!detailIds.contains(shipmentsPlanDetail.getId())) {
+                            detailIds.add(shipmentsPlanDetail.getId());
+                        }
                     }
+                    List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
+                    shipmentsOrderInfoService.handleData(shipmentsOrderInfo, orderInfoList, orderSpecIds, detailIds);
+                } catch (Exception e) {
+                    // 单张发货单处理失败不影响其他发货单
+                    log.error("定时任务处理发货单 [{}] 失败：{}", orderInfo.getId(), e.getMessage(), e);
                 }
-                List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
-                shipmentsOrderInfoService.handleData(shipmentsOrderInfo, orderInfoList, orderSpecIds, detailIds);
             }
         }
         return InvokeResultBuilder.success();

@@ -705,6 +705,47 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     }
 
     @Override
+    public List<ShipmentsOrderInfo> queryUnShipmentsByShipmentDate(LocalDate shipmentDate) {
+        // 只查未发货状态
+        LambdaQueryWrapper<ShipmentsOrderInfo> queryWrapper = Wrappers.lambdaQuery(ShipmentsOrderInfo.class);
+        queryWrapper.eq(ShipmentsOrderInfo::getStatus, "UN_SHIPMENTS");
+        if (shipmentDate != null) {
+            LocalDate finalShipmentDate = shipmentDate;
+            queryWrapper.and(wrapper -> wrapper
+                    .eq(ShipmentsOrderInfo::getShipmentsDate, finalShipmentDate)
+                    .or()
+                    .eq(ShipmentsOrderInfo::getNewShipmentDate, finalShipmentDate));
+        } else {
+            shipmentDate = LocalDate.now();
+            queryWrapper.and(wrapper -> wrapper
+                    .lt(ShipmentsOrderInfo::getShipmentsDate, LocalDate.now())
+                    .or()
+                    .lt(ShipmentsOrderInfo::getNewShipmentDate, LocalDate.now()));
+        }
+        List<ShipmentsOrderInfo> shipmentsOrderInfos = getBaseMapper().selectList(queryWrapper);
+        if (CollectionUtils.isEmpty(shipmentsOrderInfos)) {
+            return Collections.emptyList();
+        }
+        // 过滤掉不符合条件的数据
+        Iterator<ShipmentsOrderInfo> iterator = shipmentsOrderInfos.iterator();
+        while (iterator.hasNext()) {
+            ShipmentsOrderInfo next = iterator.next();
+            Boolean onTimeShipment = next.getOnTimeShipment();
+            if (BooleanUtils.isFalse(onTimeShipment)) {
+                LocalDate newShipmentDate = next.getNewShipmentDate();
+                if (newShipmentDate == null || newShipmentDate.isAfter(shipmentDate)) {
+                    iterator.remove();
+                }
+            } else {
+                if (next.getShipmentsDate().isAfter(shipmentDate)) {
+                    iterator.remove();
+                }
+            }
+        }
+        return shipmentsOrderInfos;
+    }
+
+    @Override
     public String generateSerialNumber(String pre, String key, String format, LocalDateTime startTime, LocalDateTime endTime) {
         // 获取当前时间，并做格式化处理
         String datePart = LocalDate.now().format(DateTimeFormatter.ofPattern(format));

@@ -130,6 +130,14 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
     List<ShipmentsOrderInfo> queryByShipmentDate(LocalDate shipmentDate);
 
     /**
+     * 根据发货日期获取未发货的数据
+     *
+     * @param shipmentDate  发货日期
+     * @return              List<ShipmentsOrderInfo>
+     */
+    List<ShipmentsOrderInfo> queryUnShipmentsByShipmentDate(LocalDate shipmentDate);
+
+    /**
      * 生成流水号
      *
      * @param pre           流水号前缀