Jenkins自动合并

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -50,14 +50,14 @@ public class MesEnumUtil {
      * JIS发运模式类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_JIS_PATTERN_TYPE {
+    public enum JIS_PATTERN_TYPE {
         ONE_PROD(10, "单产品发运"),
         MANY_PROD(20, "多产品发运");
 
         private int value;
         private String description;
 
-        MES_JIS_PATTERN_TYPE(int value, String description) {
+        JIS_PATTERN_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -3419,7 +3419,8 @@ public class MesEnumUtil {
         EXP_TEXT("exp_text", "异常文本"),
         FILE("file", "定制内容文件"),
         IMAGE("image", "图片"),
-        BUTTON("button", "按钮");
+        BUTTON("button", "按钮"),
+        TABLES("tables", "多个表格");
 
         private String value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -16,49 +16,14 @@ public class MesPcnEnumUtil {
      * JIS发运模式类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_JIS_PATTERN_TYPE {
+    public enum JIS_PATTERN_TYPE {
         ONE_PROD(10, "单产品发运"),
         MANY_PROD(20, "多产品发运");
 
         private int value;
         private String description;
 
-        MES_JIS_PATTERN_TYPE(int value, String description) {
+        JIS_PATTERN_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
-     * JIS发运是否按主队列顺序扫描
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_JIS_SCAN_TYPE {
-        TRUE(10, "是"),
-        FALSE(20, "否");
-
-        private int value;
-        private String description;
-
-        MES_JIS_SCAN_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -86,7 +51,7 @@ public class MesPcnEnumUtil {
      * JIS发运队列状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIS_STATUS {
+    public enum JIS_QUEUE_STATUS {
 
         TRUE(10, "已发运"),
         FALSE(20, "未发运");
@@ -94,7 +59,7 @@ public class MesPcnEnumUtil {
         private int value;
         private String description;
 
-        MES_QUEUE_JIS_STATUS(int value, String description) {
+        JIS_QUEUE_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -2516,7 +2481,8 @@ public class MesPcnEnumUtil {
         EXP_TEXT("exp_text", "异常文本"),
         FILE("file", "定制内容文件"),
         IMAGE("image", "图片"),
-        BUTTON("button", "按钮");
+        BUTTON("button", "按钮"),
+        TABLES("tables", "多个表格");
 
         private String value;
         private String description;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java

@@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean {
     @ApiParam("模式名称")
     private String patternName;
 
-    @Lob
+    @Column(name = "QUEUE_NO")
-    @Column(name = "RULE")
+    @ApiParam("显示主队列数")
-    @ApiParam("规则")
+    private Integer queueNo;
-    private String rule;
+
+    @Column(name = "HANDLE_NO")
+    @ApiParam("一次处理套数")
+    private Integer handleNo;
 
     @Column(name = "PATTERN_DESC")
     @ApiParam("描述")
     private String patternDesc;
 
-    @Column(name = "TOP_NO")
+    @Column(name = "PRODUCE_CTGY_CODE")
-    @ApiParam("一次显示TOP数")
+    @ApiParam("产品类型组")
-    private Integer topNo;
+    private String produceCategoryCode;
-
-    @Column(name = "HANDLE_NO")
-    @ApiParam("一次处理套数")
-    private Integer handleNo;
 
     @Column(name = "PATTERN_TYPE")
     @ApiParam("模式类型")
     private Integer patternType;
 
-    @Column(name = "SCAN_TYPE")
+    @Lob
-    @ApiParam("是否按主队列顺序扫描")
+    @Column(name = "RULE")
-    private Integer scanType;
+    @ApiParam("规则")
+    private String rule;
 
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :JIS发运队列
@@ -61,4 +62,8 @@ public class MesQueueJis extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Transient
+    @ApiParam("颜色")
+    private String color;
+
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java

@@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean {
     @ApiParam("状态")
     private Integer status;
 
+    @Column(name = "FINAL_STATUS")
+    @ApiParam("明细整体状态")
+    private Integer finalStatus;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java

@@ -42,24 +42,37 @@ public class QueueJisModel implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @ApiParam("明细整体状态")
+    private Integer finalStatus;
+
     @ApiParam("状态名称")
     private String statusName;
 
     @ApiParam("明细状态名称")
     private String detailStatusName;
 
+    @ApiParam("明细整体状态名称")
+    private Integer finalStatusName;
+
+    @ApiParam("颜色")
+    private String color;
+
     public String getStatusName() {
-        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status);
+        return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status);
     }
 
     public String getDetailStatusName() {
-        return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus);
+        return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus);
+    }
+
+    public String getFinalStatusName() {
+        return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus);
     }
 
     public QueueJisModel() {
     }
 
-    public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) {
+    public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) {
         this.jisNo = jisNo;
         this.vinCode = vinCode;
         this.carNo = carNo;
@@ -71,6 +84,7 @@ public class QueueJisModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
         this.detailStatus = detailStatus;
         this.serialNumber = serialNumber;
+        this.finalStatus = finalStatus;
     }
 
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java

@@ -49,4 +49,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("图片路径")
     private String imageUrl;
+
+    @ApiParam("多个数据集")
+    private List<StationResultBean<T>> stationResultBeans;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java

@@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean {
     @ApiParam("模式名称")
     private String patternName;
 
-    @Lob
+    @Column(name = "QUEUE_NO")
-    @Column(name = "RULE")
+    @ApiParam("显示主队列数")
-    @ApiParam("规则")
+    private Integer queueNo;
-    private String rule;
+
+    @Column(name = "HANDLE_NO")
+    @ApiParam("一次处理队列数")
+    private Integer handleNo;
 
     @Column(name = "PATTERN_DESC")
     @ApiParam("描述")
     private String patternDesc;
 
-    @Column(name = "TOP_NO")
+    @Column(name = "PRODUCE_CTGY_CODE")
-    @ApiParam("一次显示TOP数")
+    @ApiParam("产品类型组")
-    private Integer topNo;
+    private String produceCategoryCode;
-
-    @Column(name = "HANDLE_NO")
-    @ApiParam("一次处理套数")
-    private Integer handleNo;
 
     @Column(name = "PATTERN_TYPE")
     @ApiParam("模式类型")
     private Integer patternType;
 
-    @Column(name = "SCAN_TYPE")
+    @Lob
-    @ApiParam("是否按主队列顺序扫描")
+    @Column(name = "RULE")
-    private Integer scanType;
+    @ApiParam("规则")
+    private String rule;
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java

@@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean {
     @ApiParam("状态")
     private Integer status;
 
+    @Column(name = "FINAL_STATUS")
+    @ApiParam("发运整体状态")
+    private Integer finalStatus;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2105,8 +2105,8 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(patternJis.getPatternNo())) {
             DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean);
         }
-        if (!StringUtils.isEmpty(patternJis.getTopNo())) {
+        if (!StringUtils.isEmpty(patternJis.getQueueNo())) {
-            DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean);
+            DdlPreparedPack.getNumEqualPack(patternJis.getQueueNo(), "queueNo", packBean);
         }
         if (!StringUtils.isEmpty(patternJis.getHandleNo())) {
             DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean);