bugFix

1.解决修改时间导致设备不正确的问题
2. 开始何修改时间不正确的问题

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

@@ -542,18 +542,19 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             blankIdSet.add(operationDo.getBlankid());
             vo.setOldEquId(processEquDo.getProcessdeviceid());
             if (StringUtils.isNotBlank(changeStartTimeVo.getEquId())) {
-                processEquDo.setProcessdevice(changeStartTimeVo.getEquId());
+                processEquDo.setProcessdeviceid(changeStartTimeVo.getEquId());
             }
             if (StringUtils.isNotBlank(changeStartTimeVo.getEquName())) {
-                processEquDo.setProcessdeviceid(changeStartTimeVo.getEquName());
+                processEquDo.setProcessdevice(changeStartTimeVo.getEquName());
             }
-            vo.setOldPlanEnddate(processEquDo.getPlanstartdate());
+            vo.setOldPlanEnddate(processEquDo.getPlanenddate());
+            vo.setOldPlanStartdate(processEquDo.getPlanstartdate());
             vo.setCurrentProcessWay(operationDo.getProcessway());
             // 当前工序的加工方式
             processEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
             processEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
             vo.setApsProcessOperationProcessEquDo(processEquDo);
-            vo.setOldPlanStartdate(processEquDo.getPlanenddate());
+
             updateConflictVos.add(vo);
             this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
                     .eq(ApsProcessOperationProcessEquDo::getId, id)