aps-撤回发布时不要退回领料，取消排程时再退回备料在制品

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -178,6 +178,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         Set<String> orderIds = blankOrderDoList.stream().map(ApsBlankOrderDo::getProductionorderid).collect(Collectors.toSet());
         //清除排程备份
         deleteBackup(apsBlankIds, new ArrayList<>(orderIds));
+        for (String apsBlankId : apsBlankIds) {
+            removeBatchNumberByBlankId(apsBlankId);
+        }
     }
 
     @Override

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -593,20 +593,20 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                         .eq(ApsWorkInProgressInventoryDo::getBatchnumber, req.getInputBatchNumber())
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0"));
 
-                List<ApsProcessOperationProcessEquDo> needUpdateProcessEqus = null;
+//                List<ApsProcessOperationProcessEquDo> needUpdateProcessEqus = null;
 
                 /**
                  * 如果该工序作业明细有前道工序作业明细，
                  * 则将前道工序作业明细的所有后道工序作业明细的待加工料卷批次号去掉“{批次号}，”
                  */
-                if (ObjectUtil.isNotEmpty(apsProcessOperationProcessEquDo.getPreviousprocessesids())) {
-                    needUpdateProcessEqus = apsProcessOperationProcessEquService.list(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getPreviousprocessesids, apsProcessOperationProcessEquDo.getPreviousprocessesids()));
+//                if (ObjectUtil.isNotEmpty(apsProcessOperationProcessEquDo.getPreviousprocessesids())) {
+//                    needUpdateProcessEqus = apsProcessOperationProcessEquService.list(new QueryWrapper<ApsProcessOperationProcessEquDo>().lambda().eq(ApsProcessOperationProcessEquDo::getPreviousprocessesids, apsProcessOperationProcessEquDo.getPreviousprocessesids()));
 //                    if (ObjectUtil.isNotEmpty(needUpdateBatchNumber)) {
 //                        List<String> needUpdateIds = needUpdateBatchNumber.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
 //                        String join = String.join(",", needUpdateIds);
 //                        this.baseMapper.updateAllProcessEquBatchNumberByIds(req.getInputBatchNumber(), join);
 //                    }
-                }
+//                }
                 /**
                  * 如果该工序作业明细没有前道工序作业明细，则该作业明细对应作业的所有作业明细的待加工料卷批次号去掉“{输入物料批次号}，”
                  */

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductionOrderController.java

@@ -187,7 +187,7 @@ public class ApsProductionOrderController {
      * 数据眼报表 定时任务 准备数据
      */
     @GetMapping("/dataEyeReport")
-    @Scheduled(cron = "0 30 11 * * *")
+    @Scheduled(cron = "0 30 0 * * *")
     public R dataEyeReport() {
         log.info("数据眼报表 定时任务 准备数据开始");
         Thread thread = new Thread(() -> apsProductionOrderService.dataEyeReport());