aps-工序作业明细编辑修改

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

@@ -49,4 +49,5 @@ public interface ApsProcessOperationProcessEquService extends IService<ApsProces
                          List<ApsProcessOperationProcessEquDo> waitUpdateEquList,
                          List<ApsProcessOperationProcessEquDo> waitInsertEquList);
 
+    List<String> updateDetails2(JobDetailsVo jobDetailsVo);
 }

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

@@ -1395,6 +1395,22 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
         return R.ok(ganttService.getListById(aboutIds));
     }
 
+    /**
+     * 更新工序作业明细
+     *
+     * @param jobDetailsVo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<String> updateDetails2(JobDetailsVo jobDetailsVo) {
+        ChangingWiresVo changingWiresVo = BeanUtil.toBean(jobDetailsVo, ChangingWiresVo.class);
+        changingWiresVo.setProcessingTime(jobDetailsVo.getPlanStartTime());
+        List<ChangingWiresVo> changingWiresVos = new LinkedList<>();
+        changingWiresVos.add(changingWiresVo);
+        return changingWires(changingWiresVos);
+    }
+
     /**
      * 工序作业明细拆分
      *

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

@@ -59,6 +59,7 @@ public class ApsProcessOperationProcessEquController {
         log.info("开始进行换线作业");
         return R.ok(ganttService.getListById(apsProcessOperationProcessEquService.changingWires(changingWiresVos)));
     }
+
     /**
      * 换线作业2，区分甘特图和车间作业跟踪
      *
@@ -70,6 +71,7 @@ public class ApsProcessOperationProcessEquController {
         log.info("开始进行换线作业2");
         return R.ok(apsProcessOperationProcessEquService.changingWires(changingWiresVos));
     }
+
     /**
      * 排单
      *
@@ -84,6 +86,7 @@ public class ApsProcessOperationProcessEquController {
 
     /**
      * 换线获取可选设备
+     *
      * @param operationJobDetailsId
      * @return
      */
@@ -104,7 +107,6 @@ public class ApsProcessOperationProcessEquController {
         log.info("开修改工序作业开工时间");
         return apsProcessOperationProcessEquService.changeStartTime(changeStartTimeVo);
     }
-
     /**
      * 修改作业详情
      *
@@ -112,9 +114,19 @@ public class ApsProcessOperationProcessEquController {
      */
     @PostMapping("/update")
     public R updateDetails(@RequestBody JobDetailsVo jobDetailsVo) {
-        log.info("开修改作业详情");
+        log.info("修改作业详情，甘特图");
         return apsProcessOperationProcessEquService.updateDetails(jobDetailsVo);
     }
+    /**
+     * 修改作业详情
+     *
+     * @return
+     */
+    @PostMapping("/update2")
+    public R updateDetails2(@RequestBody JobDetailsVo jobDetailsVo) {
+        log.info("修改作业详情，车间作业跟踪");
+        return R.ok(apsProcessOperationProcessEquService.updateDetails2(jobDetailsVo));
+    }
 
     /**
      * 拆分工序作业明细
@@ -129,6 +141,7 @@ public class ApsProcessOperationProcessEquController {
 
     /**
      * 车间作业跟踪锁定/解锁
+     *
      * @return
      */
     @PostMapping("/workshopLocked")