@@ -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,
@@ -256,4 +256,8 @@ public class GanttVos {
* 辊id
*/
private String rollerid;
+ /**
+ * 可选设备
+ */
+ private String canchoosedeviceid;
}
@@ -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)));
/**
* 修改作业详情