Browse Source

aps-甘特图修改功能

sucheng 4 months ago
parent
commit
b51469fd46

+ 1 - 0
cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -187,6 +187,7 @@
         apro.ORDERDATE,
         art.ROLLERTYPE,
         apope.ROLLERID,
+        apo.CANCHOOSEDEVICEID,
         ifnull(apop.CUSTOMORDERNO,apro.CUSTOMORDERNO) CUSTOMORDERNO,
         Date(apro.PROMISEDELIVERYDATE) as PROMISEDELIVERYDATE,
         Date(apro.SCHEDULEDELIVERYDATE) as SCHEDULEDELIVERYDATE,

+ 4 - 0
cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/GanttVos.java

@@ -256,4 +256,8 @@ public class GanttVos {
      * 辊id
      */
     private String rollerid;
+    /**
+     * 可选设备
+     */
+    private String canchoosedeviceid;
 }

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

@@ -115,7 +115,7 @@ public class ApsProcessOperationProcessEquController {
     @PostMapping("/update")
     public R updateDetails(@RequestBody JobDetailsVo jobDetailsVo) {
         log.info("修改作业详情,甘特图");
-        return apsProcessOperationProcessEquService.updateDetails(jobDetailsVo);
+        return R.ok(ganttService.getListById(apsProcessOperationProcessEquService.updateDetails2(jobDetailsVo)));
     }
     /**
      * 修改作业详情