aps-调度重排

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

@@ -4163,9 +4163,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             //排程设置
             ApsScheduleConfigDo apsScheduleConfigDo = apsScheduleConfigService.getById("1");
             //冷轧重排
-            lenzhaChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo);
+//            lenzhaChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo);
             //退火重排
-//            tuihuoChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo);
+            tuihuoChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo);
 
         }
     }
@@ -4214,16 +4214,19 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         for (ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo : needScheduleList) {
             if (ObjectUtil.isNotEmpty(apsProcessOperationProcessEquDo.getNextprocessesids())) {
                 for (String nextProcessId : apsProcessOperationProcessEquDo.getNextprocessesids().split(",")) {
-                    //不在重排中，但在基准中，如果是 精整工序，需要解锁加入排程
+                    //不在重排中，但在基准中，如果是 精整工序，并且是最后一道工序，需要解锁加入排程
                     if (!needScheduleIdList.contains(nextProcessId)
                             && allProcessEquIdList.contains(nextProcessId)) {
                         //查询后道的明细
                         ApsProcessOperationProcessEquDo nextEqu = allProcessEquList.stream().filter(item -> nextProcessId.equals(item.getId())).findFirst().orElse(null);
                         if (ObjectUtil.isNotEmpty(nextEqu)) {
-                            //查询后道的工序作业
-                            ApsProcessOperationDo nextProcess = allProcessList.stream().filter(item -> nextEqu.getProcessid().equals(item.getId())).findFirst().orElse(null);
-                            if (jzProcessNameList.contains(nextProcess.getProcess())) {
-                                needUnLockList.add(nextEqu);
+                            //是最后一道工序
+                            if (ObjectUtil.isEmpty(nextEqu.getNextprocessesids())) {
+                                //查询后道的工序作业
+                                ApsProcessOperationDo nextProcess = allProcessList.stream().filter(item -> nextEqu.getProcessid().equals(item.getId())).findFirst().orElse(null);
+                                if (jzProcessNameList.contains(nextProcess.getProcess())) {
+                                    needUnLockList.add(nextEqu);
+                                }
                             }
                         }
                     }
@@ -4320,7 +4323,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                                 break;
                             }
                             //如果不可解锁，直接将前道明细放入不解锁
-                            if (!canUnLock){
+                            if (!canUnLock) {
                                 previousprocessesid = previousEqu.getPreviousprocessesids();
                                 nowProcess = previousProcess;
                                 notNeedUnLockList.add(previousEqu);