排程明细锁定

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

@@ -511,15 +511,18 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             String retMsg = "";
             // 锁定
             if(LOCKMARK_Y.equals(lockMark)){
+                List<String> yproids = null;
                 if(notlockdetailproids != null && notlockdetailproids.size()>0){
                     // 没有未锁定作业明细的作业ID
-                    List<String> yproids = proids.stream().filter(v -> !notlockdetailproids.contains(v)).collect(Collectors.toList());
-                    if(yproids != null && yproids.size()>0){
-                        // 所有作业明细都是锁定状态则锁定作业
-                        apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
-                                .in(ApsProcessOperationDo::getId, yproids)
-                                .set(ApsProcessOperationDo::getLockmark, LOCKMARK_Y));
-                    }
+                    yproids = proids.stream().filter(v -> !notlockdetailproids.contains(v)).collect(Collectors.toList());
+                }else{
+                    yproids = proids;
+                }
+                if(yproids != null && yproids.size()>0){
+                    // 所有作业明细都是锁定状态则锁定作业
+                    apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
+                            .in(ApsProcessOperationDo::getId, yproids)
+                            .set(ApsProcessOperationDo::getLockmark, LOCKMARK_Y));
                 }
                 retMsg = "锁定成功";
             }