feature 代码优化

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

@@ -539,9 +539,7 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 throw new RuntimeException("该作业已发布，不能调整开工时间");
             }
             blankIdSet.add(operationDo.getBlankid());
-            // 当前工序的加工方式
-            processEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
-            processEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
+
             if (StringUtils.isNotBlank(changeStartTimeVo.getEquId())) {
                 processEquDo.setProcessdevice(changeStartTimeVo.getEquId());
             }
@@ -549,11 +547,15 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             if (StringUtils.isNotBlank(changeStartTimeVo.getEquName())) {
                 processEquDo.setProcessdeviceid(changeStartTimeVo.getEquName());
             }
-            vo.setApsProcessOperationProcessEquDo(processEquDo);
-            vo.setOldEquId(changeStartTimeVo.getEquId());
             vo.setOldPlanEnddate(processEquDo.getPlanstartdate());
             vo.setCurrentProcessWay(operationDo.getProcessway());
+            // 当前工序的加工方式
+            processEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
+            processEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
+            vo.setApsProcessOperationProcessEquDo(processEquDo);
+            vo.setOldEquId(changeStartTimeVo.getEquId());
             vo.setOldPlanStartdate(processEquDo.getPlanenddate());
+
             updateConflictVos.add(vo);
             this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                     .eq(ApsProcessOperationProcessEquDo::getId, id)