aps-删除可选设备冲突

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

@@ -867,20 +867,20 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         //查询工序作业详情
         ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(processid);
         //查询工艺步骤指定的可选设备
-        List<String> processOperationEquList = Arrays.asList(apsProcessOperationDo.getCanchoosedeviceid().split(","));
+//        List<String> processOperationEquList = Arrays.asList(apsProcessOperationDo.getCanchoosedeviceid().split(","));
 //        List<ApsProcessOperationEquDo> processOperationEquDos = apsProcessOperationEquService.list(new LambdaQueryWrapper<ApsProcessOperationEquDo>().eq(ApsProcessOperationEquDo::getMainid, processid));
-        long count = processOperationEquList.stream().filter(item -> item.equals(apsProcessOperationProcessEquDo.getProcessdeviceid())).count();
+//        long count = processOperationEquList.stream().filter(item -> item.equals(apsProcessOperationProcessEquDo.getProcessdeviceid())).count();
         String newConflictdes = apsProcessOperationProcessEquDo.getConflictdes();
-        if (count <= 0) {
-            //如果加工设备不是工艺步骤指定的可选设备，记录冲突：加工设备不是工艺要求的可选设备
-            apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
-                    apsProcessOperationProcessEquDo.getProcessdeviceid(), NO_NEED_EQU, 1, null);
-            newConflictdes = addNewConflictsDesc(newConflictdes, NO_NEED_EQU);
-        } else {
-            apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
-                    apsProcessOperationProcessEquDo.getProcessdeviceid(), NO_NEED_EQU, 2, null);
-            newConflictdes = removeConflictsDesc(newConflictdes, NO_NEED_EQU);
-        }
+//        if (count <= 0) {
+//            //如果加工设备不是工艺步骤指定的可选设备，记录冲突：加工设备不是工艺要求的可选设备
+//            apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
+//                    apsProcessOperationProcessEquDo.getProcessdeviceid(), NO_NEED_EQU, 1, null);
+//            newConflictdes = addNewConflictsDesc(newConflictdes, NO_NEED_EQU);
+//        } else {
+//            apsConflictLogService.recordLog(apsProcessOperationProcessEquDo.getId(),
+//                    apsProcessOperationProcessEquDo.getProcessdeviceid(), NO_NEED_EQU, 2, null);
+//            newConflictdes = removeConflictsDesc(newConflictdes, NO_NEED_EQU);
+//        }
 //        //查询工序作业详情
 //        ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(apsProcessOperationProcessEquDo.getProcessid());