排程明细锁定

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

@@ -773,7 +773,7 @@ public class ApsServiceImpl implements ApsService {
         if (StringUtils.isNotBlank(operationDo.getCanchoosedeviceid())) {
             String canchoosedeviceid = operationDo.getCanchoosedeviceid();
             // 锁定作业添加可选设备里没有但已锁定排程明细的设备
-            if("y".equals(operationDo.getLockmark())){
+            /*if("y".equals(operationDo.getLockmark())){
                 List<ApsProcessOperationProcessEquDo> pros = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
                         .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()));
                 if(pros != null && pros.size()>0){
@@ -787,7 +787,21 @@ public class ApsServiceImpl implements ApsService {
                         }
                     }
                 }
+            }*/
+            List<ApsProcessOperationProcessEquDo> pros = processOperationProcessEquService.list(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>()
+                    .eq(ApsProcessOperationProcessEquDo::getProcessid, operationDo.getId()).eq(ApsProcessOperationProcessEquDo::getLockmarkdetail,"y"));
+            if(pros != null && pros.size()>0){
+                for (ApsProcessOperationProcessEquDo pro : pros) {
+                    if(!canchoosedeviceid.contains(pro.getProcessdeviceid())){
+                        if(StrUtil.isBlank(canchoosedeviceid)){
+                            canchoosedeviceid = pro.getProcessdeviceid();
+                        }else{
+                            canchoosedeviceid = canchoosedeviceid + "," + pro.getProcessdeviceid();
+                        }
+                    }
+                }
             }
+
             String[] sbIds = canchoosedeviceid.split(",");
             for (String equIds : sbIds) {
                 if(equIds.equals("0001be252874536843730b100017")){