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

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

@@ -386,11 +386,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 throw new RuntimeException("该作业已发布，不能调整开工时间");
             }
             // 获取更新之前的存在冲突的工序作业
-            List<ApsProcessOperationProcessEquDo> beforeUpdatingConflictId = this.baseMapper.getConflictId(changeStartTimeVo.getQeuId(), changeStartTimeVo.getId(),
+            List<ApsProcessOperationProcessEquDo> beforeUpdatingConflictId = this.baseMapper.getConflictId(changeStartTimeVo.getEquId(), changeStartTimeVo.getId(),
                     processEquDo.getPlanstartdate(), processEquDo.getPlanenddate());
 
             // 找到更新时间之后存在冲突的工序作业
-            List<ApsProcessOperationProcessEquDo> afterTheUpdateConflictId = this.baseMapper.getConflictId(changeStartTimeVo.getQeuId(), changeStartTimeVo.getId(),
+            List<ApsProcessOperationProcessEquDo> afterTheUpdateConflictId = this.baseMapper.getConflictId(changeStartTimeVo.getEquId(), changeStartTimeVo.getId(),
                     changeStartTimeVo.getPlanStartTime(), changeStartTimeVo.getPlanEndTime());
 
             if (!afterTheUpdateConflictId.isEmpty()) {

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/ChangeStartTimeVo.java

@@ -23,7 +23,7 @@ public class ChangeStartTimeVo {
      * 设备ID
      */
     @NotBlank(message = "设备必传")
-    private String qeuId;
+    private String equId;
     /**
      * 计划开工时间
      */