aps-甘特图增加返回值

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

@@ -170,6 +170,7 @@
         apo.PROCESSSTATUS,
         apope.ACTUALSTARTDATE,
         apope.ACTUALFINISHDATE,
+        apo.PROCESS,
         apo.PROCESSNAME,
         apo.LOCKMARK as ProcessLock, -- 原工序作业的是否锁定改名
         apope.LOCKMARKDETAIL as LOCKMARK, -- 增加作业明细的是否锁定字段
@@ -185,6 +186,7 @@
         apro.CUSTOMNAME,
         apro.ORDERDATE,
         art.ROLLERTYPE,
+        apope.ROLLERID,
         ifnull(apop.CUSTOMORDERNO,apro.CUSTOMORDERNO) CUSTOMORDERNO,
         Date(apro.PROMISEDELIVERYDATE) as PROMISEDELIVERYDATE,
         Date(apro.SCHEDULEDELIVERYDATE) as SCHEDULEDELIVERYDATE,

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

@@ -69,6 +69,10 @@ public class GanttVos {
      * 期望交货日期
      */
     private Date deliverydate;
+    /**
+     * 工序
+     */
+    private String process;
     /**
      * 工序名
      */
@@ -248,4 +252,8 @@ public class GanttVos {
      * 作业明细辊名称
      */
     private String rollertype;
+    /**
+     * 辊id
+     */
+    private String rollerid;
 }