feature 代码提交

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

@@ -342,7 +342,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             updateConflictVo.setOldPlanEnddate(planstartdate);
             updateConflictVo.setOldPlanStartdate(planenddate);
             updateConflictVo.setCurrentProcessWay(processWay);
-            updateConflictVo.setOldEquId(apsProcessOperationDo.getProcessdeviceid());
+            updateConflictVo.setOldEquId(processEqus.getProcessdeviceid());
             // 待开工的直接修改
             if (JOBSTATUS_TO_BE_START.equals(processEqus.getWorkstatus())) {
                 // 待开工的工序作业明细 直接更换加工设备 和车间