aps-定时任务调度重排之后预排

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

@@ -4266,6 +4266,19 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                         .set(ApsProcessOperationDo::getLockmark, "y")
                         .eq(ApsProcessOperationDo::getLockmark, "n")
                         .eq(ApsProcessOperationDo::getTenantid, tenantId));
+
+                //调度排程结束
+                //将之前锁定的作业和明细重新解锁
+                if (!unLockingEquIdList.isEmpty()) {
+                    apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                            .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
+                            .in(ApsProcessOperationProcessEquDo::getId, unLockingEquIdList));
+                }
+                if (!unLockingProcessIdList.isEmpty()) {
+                    apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                            .set(ApsProcessOperationDo::getLockmark, "n")
+                            .in(ApsProcessOperationDo::getId, unLockingProcessIdList));
+                }
             }
 
             //推算非退火、非铸轧的重叠数据，按序排列
@@ -4273,19 +4286,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             //推算退火，按序排列
             sortTuiHuo(chongpaiEndDate, tenantId);
 
-            //调度排程结束
-            //将之前锁定的作业和明细重新解锁
-            if (!unLockingEquIdList.isEmpty()) {
-                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-                        .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
-                        .in(ApsProcessOperationProcessEquDo::getId, unLockingEquIdList));
-            }
-            if (!unLockingProcessIdList.isEmpty()) {
-                apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
-                        .set(ApsProcessOperationDo::getLockmark, "n")
-                        .in(ApsProcessOperationDo::getId, unLockingProcessIdList));
-            }
-
         }
     }
 
@@ -4408,7 +4408,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 List<ApsBlankOrderVo> resBlankList = apsBlankOrderDao.getNeedScheduleList(bancaiTenantId);
                 blankOrderAps(resBlankList);
             }
-            log.info("线程执行完成：{}",bancaiTenantId);
+            log.info("线程执行完成：{}", bancaiTenantId);
         });
         thread.start();
 
@@ -4430,7 +4430,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 List<ApsBlankOrderVo> resBlankList = apsBlankOrderDao.getNeedScheduleList(bocaiTenantId);
                 blankOrderAps(resBlankList);
             }
-            log.info("线程执行完成：{}",bocaiTenantId);
+            log.info("线程执行完成：{}", bocaiTenantId);
         });
         thread1.start();
     }