Merge branch 'mode-min-unit' into mode-min-unit-新模型

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

@@ -4387,6 +4387,20 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             } 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("开始退火重排");
@@ -4396,21 +4410,21 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             } 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));
             }
-            //锁定所有 未锁定的 作业和作业明细
-            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 (!unLockingEquIdList.isEmpty()) {