aps-调度重排

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

@@ -4406,28 +4406,28 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         log.info("不用解锁，但需要传入排程的作业明细：{}", notNeedUnLockList);
         log.info("不用解锁，但需要传入排程的作业ID：{}", notNeedUnLockProcessIdList);
         //解锁
-//        apsProcessOperationProcessEquService.update(
-//                new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-//                        .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
-//                        .in(ApsProcessOperationProcessEquDo::getId, needUnLockProcessEquIdList));
-//        apsProcessOperationService.update(
-//                new LambdaUpdateWrapper<ApsProcessOperationDo>()
-//                        .set(ApsProcessOperationDo::getLockmark, "n")
-//                        .in(ApsProcessOperationDo::getId, needUnLockProcessIdList)
-//        );
-//
-//        String scheduletype = apsScheduleConfigDo.getScheduletype();
-//        ApsTypeVo apsTypeVo = BeanUtil.toBean(scheduletype, ApsTypeVo.class);
-//        apsTypeVo.setMixIf("default");
-//        apsTypeVo.setThMergeMode("notThMergeBf");
-//        apsTypeVo.setConstraintMode("lz");
-//        apsTypeVo.setScheduleType("dd");
-//        //重新排程
-//        //组装需要传入排程的工序作业ID
-//        needUnLockProcessIdList.addAll(notNeedUnLockProcessIdList);
-//        needUnLockProcessIdList = needUnLockProcessIdList.stream().distinct().collect(Collectors.toList());
-//        log.info("所有传入冷轧排程的作业ID：{}", needUnLockProcessIdList);
-//        apsService.apsSchedule(new ArrayList<>(), apsTypeVo, null, needUnLockProcessIdList);
+        apsProcessOperationProcessEquService.update(
+                new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                        .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
+                        .in(ApsProcessOperationProcessEquDo::getId, needUnLockProcessEquIdList));
+        apsProcessOperationService.update(
+                new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                        .set(ApsProcessOperationDo::getLockmark, "n")
+                        .in(ApsProcessOperationDo::getId, needUnLockProcessIdList)
+        );
+
+        String scheduletype = apsScheduleConfigDo.getScheduletype();
+        ApsTypeVo apsTypeVo = BeanUtil.toBean(scheduletype, ApsTypeVo.class);
+        apsTypeVo.setMixIf("default");
+        apsTypeVo.setThMergeMode("notThMergeBf");
+        apsTypeVo.setConstraintMode("lz");
+        apsTypeVo.setScheduleType("dd");
+        //重新排程
+        //组装需要传入排程的工序作业ID
+        needUnLockProcessIdList.addAll(notNeedUnLockProcessIdList);
+        needUnLockProcessIdList = needUnLockProcessIdList.stream().distinct().collect(Collectors.toList());
+        log.info("所有传入冷轧排程的作业ID：{}", needUnLockProcessIdList);
+        apsService.apsSchedule(new ArrayList<>(), apsTypeVo, null, needUnLockProcessIdList);
 
     }