aps-调度排程退火重排不解锁后道的精整工序

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

@@ -4837,31 +4837,31 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             }
         }
 
-        //查询工序类别为：精整 的工序
-        List<ApsProductionProcessesDo> jzProcessList = apsProductionProcessesService.list(new LambdaQueryWrapper<ApsProductionProcessesDo>().eq(ApsProductionProcessesDo::getProcesscategory, "精整"));
-        List<String> jzProcessNameList = jzProcessList.stream().map(ApsProductionProcessesDo::getProductprocessname).distinct().collect(Collectors.toList());
-        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)) {
-                            //是最后一道工序
-                            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);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
+//        //查询工序类别为：精整 的工序
+//        List<ApsProductionProcessesDo> jzProcessList = apsProductionProcessesService.list(new LambdaQueryWrapper<ApsProductionProcessesDo>().eq(ApsProductionProcessesDo::getProcesscategory, "精整"));
+//        List<String> jzProcessNameList = jzProcessList.stream().map(ApsProductionProcessesDo::getProductprocessname).distinct().collect(Collectors.toList());
+//        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)) {
+//                            //是最后一道工序
+//                            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);
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
 
         //需要解锁的明细ID
         List<String> needUnLockProcessEquIdList = needUnLockList.stream().map(ApsProcessOperationProcessEquDo::getId).distinct().collect(Collectors.toList());