Parcourir la source

排程明细锁定

fangpy il y a 8 mois
Parent
commit
3fc66d1dbf

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

@@ -571,6 +571,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
                 .in(ApsProcessOperationDo::getId, processIds)
                 .set(ApsProcessOperationDo::getLockmark, LOCKMARK_N));
+        // 作业明细解锁
+        apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                .in(ApsProcessOperationProcessEquDo::getProcessid, processIds)
+                .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, LOCKMARK_N));
+
         // 判断当前工序作业是否存在加工中或已完工的数据
         boolean b = unlockProcessInfo.stream().anyMatch(info -> COMPLETED.equals(info.getProcessstatus()) || PROCESSING.equals(info.getProcessstatus()));
         if (b) {
@@ -599,6 +604,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
                 .in(ApsProcessOperationDo::getId, unlockedIds)
                 .set(ApsProcessOperationDo::getLockmark, LOCKMARK_Y));
+        // 作业明细锁定
+        apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                .in(ApsProcessOperationProcessEquDo::getProcessid, unlockedIds)
+                .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, LOCKMARK_Y));
         return R.ok("200", "锁定成功", unlockedIds);
     }