feature 工序作业修改开始时间逻辑优

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

@@ -542,6 +542,13 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
             // 当前工序的加工方式
             processEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
             processEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
+            if (StringUtils.isNotBlank(changeStartTimeVo.getEquId())) {
+                processEquDo.setProcessdevice(changeStartTimeVo.getEquId());
+            }
+
+            if (StringUtils.isNotBlank(changeStartTimeVo.getEquName())) {
+                processEquDo.setProcessdeviceid(changeStartTimeVo.getEquName());
+            }
             vo.setApsProcessOperationProcessEquDo(processEquDo);
             vo.setOldEquId(changeStartTimeVo.getEquId());
             vo.setOldPlanEnddate(processEquDo.getPlanstartdate());
@@ -552,6 +559,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     .eq(ApsProcessOperationProcessEquDo::getId, id)
                     .set(ApsProcessOperationProcessEquDo::getPlanstartdate, changeStartTimeVo.getPlanStartTime())
                     .set(ApsProcessOperationProcessEquDo::getPlanenddate, changeStartTimeVo.getPlanEndTime())
+                    .set(StringUtils.isNotBlank(changeStartTimeVo.getEquId()), ApsProcessOperationProcessEquDo::getProcessdeviceid, changeStartTimeVo.getEquId())
+                    .set(StringUtils.isNotBlank(changeStartTimeVo.getEquName()), ApsProcessOperationProcessEquDo::getProcessdevice, changeStartTimeVo.getEquName())
             );
         }
         updateConflictVos.forEach(data -> {

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

@@ -24,8 +24,13 @@ public class ChangeStartTimeVo {
     /**
      * 设备ID
      */
-    @NotBlank(message = "设备必传")
+    @NotBlank(message = "设备ID必传")
     private String equId;
+    /**
+     * 设备名称
+     */
+    @NotBlank(message = "设备名称必传")
+    private String equName;
     /**
      * 计划开工时间
      */
@@ -36,6 +41,7 @@ public class ChangeStartTimeVo {
      */
     @NotNull(message = "计划完工时间必填")
     private Date planEndTime;
+
     /**
      * 需要返回的相关IDs
      */