bufIX 解决拖拽工序作业没有正常生产冲突的问题

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

@@ -393,6 +393,10 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             List<ApsProcessOperationProcessEquDo> afterTheUpdateConflictId = this.baseMapper.getConflictId(changeStartTimeVo.getEquId(), changeStartTimeVo.getId(),
                     changeStartTimeVo.getPlanStartTime(), changeStartTimeVo.getPlanEndTime());
 
+            if (!beforeUpdatingConflictId.isEmpty()) {
+                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,CONFLICTING_PROCESSING_TIMES);
+            }
+
             if (!afterTheUpdateConflictId.isEmpty()) {
                 processEquDo.setHasconflict(LOCKMARK_Y);
                 // 更当前工序作业增加新的冲突
@@ -407,9 +411,6 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                         LOCKMARK_N : LOCKMARK_Y);
             }
 
-            if (!beforeUpdatingConflictId.isEmpty()) {
-                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,CONFLICTING_PROCESSING_TIMES);
-            }
 
 
             processEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
@@ -484,6 +485,10 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     apsProcessOperationProcessEquDo.getProcessdeviceid(), id,
                     apsProcessOperationProcessEquDo.getPlanstartdate(), apsProcessOperationProcessEquDo.getPlanenddate());
 
+            if (!beforeUpdatingConflictId.isEmpty()) {
+                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,CONFLICTING_PROCESSING_TIMES);
+            }
+
             if (!afterTheUpdateConflictId.isEmpty()) {
                 apsProcessOperationProcessEquDo.setHasconflict(LOCKMARK_Y);
                 // 更当前工序作业增加新的冲突
@@ -500,9 +505,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                         LOCKMARK_N : LOCKMARK_Y);
             }
 
-            if (!beforeUpdatingConflictId.isEmpty()) {
-                updateProcessEquBeforeAddConflictsDesc(beforeUpdatingConflictId,CONFLICTING_PROCESSING_TIMES);
-            }
+
 
         }
         this.updateById(apsProcessOperationProcessEquDo);