aps-调度排程增加可选调度类型

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

@@ -70,7 +70,7 @@ public interface ApsBlankOrderService extends IService<ApsBlankOrderDo> {
 
     R checkAddMaterial(AddMaterialReq req);
 
-    void apsScheduleRestart(Integer hour,String chongpaiStartDateStr,String chongpaiEndDateStr,SysUserVo currentUser, String blankId);
+    void apsScheduleRestart(Integer hour,String chongpaiStartDateStr,String chongpaiEndDateStr,SysUserVo currentUser, String blankId, Boolean haveLenZha, Boolean haveTuiHuo);
 
     void sortLenZha(DateTime chongpaiEndDate, String tenantId);
 

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

@@ -4302,7 +4302,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     }
 
     @Override
-    public void apsScheduleRestart(Integer hour, String chongpaiStartDateStr, String chongpaiEndDateStr, SysUserVo currentUser, String blankIds) {
+    public void apsScheduleRestart(Integer hour, String chongpaiStartDateStr, String chongpaiEndDateStr, SysUserVo currentUser, String blankIds, Boolean haveLenZha, Boolean haveTuiHuo) {
         if (currentUser == null) {
             currentUser = CXCommonUtils.getCurrentUser();
         }
@@ -4397,51 +4397,55 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             if (StringUtils.isNotBlank(blankIds)) {
                 blankIdList = new LinkedList<>(Arrays.asList(blankIds.split(",")));
             }
-            try {
-                log.info("开始冷轧重排");
-                //冷轧重排
-                lenzhaChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo, currentUser, blankIdList);
-                log.info("冷轧重排结束");
-            } catch (Exception e) {
-                log.error("冷轧重排失败");
-                log.error(e);
-            } finally {
-                //锁定所有 未锁定的 作业和作业明细
-                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-                        .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "y")
-                        .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
-                        .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
-                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-                        .set(ApsProcessOperationProcessEquDo::getLockmark, "y")
-                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "n")
-                        .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
-                apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
-                        .set(ApsProcessOperationDo::getLockmark, "y")
-                        .eq(ApsProcessOperationDo::getLockmark, "n")
-                        .eq(ApsProcessOperationDo::getTenantid, tenantId));
-            }
-            try {
-                log.info("开始退火重排");
-                //退火重排
-                tuihuoChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo, currentUser, blankIdList);
-                log.info("退火重排结束");
-            } catch (Exception e) {
-                log.error("退火重排失败");
-                log.error(e);
-            } finally {
-                //锁定所有 未锁定的 作业和作业明细
-                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-                        .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "y")
-                        .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
-                        .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
-                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-                        .set(ApsProcessOperationProcessEquDo::getLockmark, "y")
-                        .eq(ApsProcessOperationProcessEquDo::getLockmark, "n")
-                        .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
-                apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
-                        .set(ApsProcessOperationDo::getLockmark, "y")
-                        .eq(ApsProcessOperationDo::getLockmark, "n")
-                        .eq(ApsProcessOperationDo::getTenantid, tenantId));
+            if (haveLenZha) {
+                try {
+                    log.info("开始冷轧重排");
+                    //冷轧重排
+                    lenzhaChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo, currentUser, blankIdList);
+                    log.info("冷轧重排结束");
+                } catch (Exception e) {
+                    log.error("冷轧重排失败");
+                    log.error(e);
+                } finally {
+                    //锁定所有 未锁定的 作业和作业明细
+                    apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                            .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "y")
+                            .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
+                            .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
+                    apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                            .set(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                            .eq(ApsProcessOperationProcessEquDo::getLockmark, "n")
+                            .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
+                    apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                            .set(ApsProcessOperationDo::getLockmark, "y")
+                            .eq(ApsProcessOperationDo::getLockmark, "n")
+                            .eq(ApsProcessOperationDo::getTenantid, tenantId));
+                }
+            }
+            if (haveTuiHuo) {
+                try {
+                    log.info("开始退火重排");
+                    //退火重排
+                    tuihuoChongpai(chongpaiStartDate, chongpaiEndDate, apsScheduleConfigDo, currentUser, blankIdList);
+                    log.info("退火重排结束");
+                } catch (Exception e) {
+                    log.error("退火重排失败");
+                    log.error(e);
+                } finally {
+                    //锁定所有 未锁定的 作业和作业明细
+                    apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                            .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, "y")
+                            .eq(ApsProcessOperationProcessEquDo::getLockmarkdetail, "n")
+                            .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
+                    apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                            .set(ApsProcessOperationProcessEquDo::getLockmark, "y")
+                            .eq(ApsProcessOperationProcessEquDo::getLockmark, "n")
+                            .eq(ApsProcessOperationProcessEquDo::getTenantid, tenantId));
+                    apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                            .set(ApsProcessOperationDo::getLockmark, "y")
+                            .eq(ApsProcessOperationDo::getLockmark, "n")
+                            .eq(ApsProcessOperationDo::getTenantid, tenantId));
+                }
             }
             //调度排程结束
             //将之前锁定的作业和明细重新解锁
@@ -4698,7 +4702,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
 
         try {
-            apsScheduleRestart(null, needScheduleStartDate, needScheduleEndDate, currentUser, null);
+            apsScheduleRestart(null, needScheduleStartDate, needScheduleEndDate, currentUser, null, true, true);
         } catch (Exception e) {
             log.error(e);
             return "success";

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

@@ -71,8 +71,10 @@ public class ApsBlankOrderController {
     public R apsScheduleRestart(@RequestParam(required = false) Integer hour,
                                 @RequestParam(required = false) String chongpaiStartDate,
                                 @RequestParam(required = false) String chongpaiEndDate,
-                                @RequestParam(required = false) String blankIds) {
-        apsBlankOrderService.apsScheduleRestart(hour, chongpaiStartDate, chongpaiEndDate, null, blankIds);
+                                @RequestParam(required = false) String blankIds,
+                                @RequestParam(required = false) Boolean haveLenZha,
+                                @RequestParam(required = false) Boolean haveTuiHuo) throws Exception {
+        apsBlankOrderService.apsScheduleRestart(hour, chongpaiStartDate, chongpaiEndDate, null, blankIds,haveLenZha,haveTuiHuo);
         return R.ok();
     }