소스 검색

aps-换线锁问题处理

sucheng 5 달 전
부모
커밋
180ad248cf

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

@@ -1188,6 +1188,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 log.error("该作业明细已被:{}其他操作员拆分", splitLock.get(equId));
                 throw new CustomException("该作业明细已被其他操作员拆分");
             }
+        }
+        for (String equId : ids) {
             splitLock.put(equId, nowWorkUser.getId());
         }
         try {
@@ -2027,8 +2029,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
     }
 
     public List<ProcessVo> checkNeedAdd(List<ProcessVo> newList,
-                                         Date newPlanstartdate, Date newPlanenddate,
-                                         String processEquId) {
+                                        Date newPlanstartdate, Date newPlanenddate,
+                                        String processEquId) {
         //判断当前是否存在冲突
         List<ProcessVo> haveTimeOverLapList = newList.stream().filter(item -> haveTimeOverLap(item, processEquId, newPlanstartdate, newPlanenddate, false)).collect(Collectors.toList());
         return haveTimeOverLapList;