feature 代码提交

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

@@ -399,6 +399,12 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         // 找到更新时间之后存在冲突的工序作业
         List<String> afterTheUpdateConflictId = this.baseMapper.getConflictId(changeStartTimeVo.getQeuId(), changeStartTimeVo.getId(),
                 changeStartTimeVo.getPlanStartTime(), changeStartTimeVo.getPlanEndTime());
+        if (!beforeUpdatingConflictId.isEmpty()) {
+            this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                    .in(ApsProcessOperationProcessEquDo::getId, beforeUpdatingConflictId)
+                    .set(ApsProcessOperationProcessEquDo::getHasconflict, LOCKMARK_N)
+                    .set(ApsProcessOperationProcessEquDo::getConflictdes, ""));
+        }
         if (!afterTheUpdateConflictId.isEmpty()) {
             processEquDo.setHasconflict(LOCKMARK_Y);
             processEquDo.setConflictdes(CONFLICTING_PROCESSING_TIMES);
@@ -407,16 +413,8 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                     .set(ApsProcessOperationProcessEquDo::getHasconflict, LOCKMARK_Y)
                     .set(ApsProcessOperationProcessEquDo::getConflictdes, CONFLICTING_PROCESSING_TIMES));
         }
-        if (!beforeUpdatingConflictId.isEmpty()) {
-            this.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
-                    .in(ApsProcessOperationProcessEquDo::getId, beforeUpdatingConflictId)
-                    .set(ApsProcessOperationProcessEquDo::getHasconflict, LOCKMARK_N)
-                    .set(ApsProcessOperationProcessEquDo::getConflictdes, ""));
-        }
         processEquDo.setPlanstartdate(changeStartTimeVo.getPlanStartTime());
         processEquDo.setPlanenddate(changeStartTimeVo.getPlanEndTime());
-        processEquDo.setHasconflict(LOCKMARK_N);
-        processEquDo.setConflictdes("");
         this.updateById(processEquDo);
         return R.ok();
     }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProcessOperationProcessEquController.java

@@ -69,9 +69,14 @@ public class ApsProcessOperationProcessEquController {
         return  apsProcessOperationProcessEquService.getOptionalEquipment(operationJobDetailsId);
     }
 
+    /**
+     * 工序作业修改开始时间
+     * @param changeStartTimeVo
+     * @return
+     */
     @PostMapping("/change/start-time")
     public R changeStartTime(@RequestBody @Validated ChangeStartTimeVo changeStartTimeVo) {
-        log.info("开始进行换线作业");
+        log.info("开修改工序作业开工时间");
         return  apsProcessOperationProcessEquService.changeStartTime(changeStartTimeVo);
     }
 }