feature 甘特图增加取消卷数

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

@@ -164,6 +164,7 @@
         a1.SOFTCONFLICTDES,
         a1.nextprocessesids,
         a1.previousprocessesids,
+        a1.CANCELROLL,
         a2.ID as processid,
         a2.PLANINPUT AS INMATERCONDITION,
         a2.PROCESSSTATUS,

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

@@ -22,8 +22,8 @@ public class GanttVos {
     private String productname;
     /**
      * 计划加工卷数
-      */
-    private Integer planprocessrall =0;
+     */
+    private Integer planprocessrall = 0;
     /**
      * 生产状态
      */
@@ -75,19 +75,23 @@ public class GanttVos {
     /**
      * 已开工
      */
-    private Integer startingroll =0;
+    private Integer startingroll = 0;
     /**
      * 已报工
      */
-    private Integer reportroll =0;
+    private Integer reportroll = 0;
     /**
      * 已检验
      */
-    private Integer checkoutroll =0;
+    private Integer checkoutroll = 0;
     /**
      * 未完工
      */
-    private Integer unfinishroll =0;
+    private Integer unfinishroll = 0;
+    /**
+     * 已取消卷数
+     */
+    private Integer cancelroll = 0;
     /**
      * 作业状态
      */
@@ -99,7 +103,7 @@ public class GanttVos {
     /**
      * 客户简称
      */
-    private String customerabbreviation="";
+    private String customerabbreviation = "";
     /**
      * 工序作业ID
      */
@@ -122,7 +126,7 @@ public class GanttVos {
     @Deprecated
     private Date promisedeliverydate;
     /**
-     *  排程交货日期
+     * 排程交货日期
      */
     private Date scheduledeliverydate;
 
@@ -152,22 +156,22 @@ public class GanttVos {
      */
     private String hasconflict;
     /**
-     *非强制冲突描述
+     * 非强制冲突描述
      */
-    private String conflictdes ="";
+    private String conflictdes = "";
 
     /**
      * 强制冲突描述
      */
-    private String softconflictdes  ="";
+    private String softconflictdes = "";
     /**
      * 输入物料描述
      */
-    private String inmatercondition="";
+    private String inmatercondition = "";
     /**
      * 客户订单号
      */
-    private String customorderno="";
+    private String customorderno = "";
     /**
      * 批量需求的输出订单产品
      */
@@ -184,11 +188,11 @@ public class GanttVos {
     /**
      * 输入批次号
      */
-    private String inputnumber="";
+    private String inputnumber = "";
     /**
      * 输出批次号
      */
-    private String outputnumber="";
+    private String outputnumber = "";
     /**
      * 承诺交货日期-起
      */
@@ -200,17 +204,17 @@ public class GanttVos {
     /**
      * 后道工序作业明细ID
      */
-    private String nextprocessesids="";
+    private String nextprocessesids = "";
     /**
      * 前道工序作业明细ID
      */
-    private String previousprocessesids="";
+    private String previousprocessesids = "";
     /**
      * 产线名称
      */
-    private String productlinename="";
+    private String productlinename = "";
     /**
      * 产线ID
      */
-    private String productlineid="";
+    private String productlineid = "";
 }