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

@@ -504,6 +504,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         }
         // 作业明细锁定
         if (orderLockVo.getId() != null && orderLockVo.getId().size() > 0) {
+            //校验工序作业状态
+            List<ApsProcessOperationDo> apsProcessOperationDos = new ArrayList<>(apsProcessOperationService.listByIds(orderLockVo.getId()));
+            //解锁的情况下校验 工序作业对应的生产状态
+            boolean b = apsProcessOperationDos.stream().allMatch(info -> COMPLETED.equals(info.getProcessstatus()) ||
+                    PROCESSING.equals(info.getProcessstatus()));
+            if (b) {
+                return R.error("所选作业都已开工，不可以解锁，不能锁定");
+            }
             apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                     .in(ApsProcessOperationProcessEquDo::getId, orderLockVo.getId())
                     .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, lockMark));