Przeglądaj źródła

aps-甘特图锁定/解锁增加校验遗漏点完善

zhoudazhuang 6 miesięcy temu
rodzic
commit
c452fda766

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

@@ -513,10 +513,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             List<ApsProcessOperationDo> apsProcessOperationDos = new ArrayList<>(apsProcessOperationService.listByIds(proids));
             if (!apsProcessOperationDos.isEmpty()){
                 //解锁的情况下校验 工序作业对应的生产状态
-                boolean b = apsProcessOperationDos.stream().allMatch(info -> COMPLETED.equals(info.getProcessstatus()) ||
+                boolean b = apsProcessOperationDos.stream().anyMatch(info -> COMPLETED.equals(info.getProcessstatus()) ||
                         PROCESSING.equals(info.getProcessstatus()));
                 if (b) {
-                    return R.error("所选作业已开工,不可以解锁,不能锁定");
+                    return R.error("所选作业包含已开工,不可以解锁,不能锁定");
                 }
             }
             apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()