Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -991,6 +991,51 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * Mes  对象结构是否展示
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OBJECT_CFG_IS_SHOW {
+
+        SHOW(1, "是"),
+        NO_SHOW(2, "否");
+
+        private int value;
+        private String description;
+
+        OBJECT_CFG_IS_SHOW(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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * Mes  客户订单来源

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

@@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable {
     @ApiParam("是否保存 1存 2不存")
     private Integer isSave;
 
+    @Column(name = "SHOW_SEQ")
+    @ApiParam("显示顺序")
+    private Integer showSeq;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam("是否显示")
+    private Integer isShow;
+
     @Transient
     @ApiParam("是否存储名")
     private String isSaveName;

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

@@ -33,6 +33,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("箱条码状态")
     public Integer printStatus;
 
+    @ApiParam("打印状态")
+    public String printStatusDesc;
+
     // 涂装客户标签打印
     @ApiParam("客户标签")
     public String custSn;
@@ -43,7 +46,7 @@ public class ProdPackModel implements Serializable {
 
     // 涂装客户标签打印
     @ApiParam("更新时间")
-    public String modifyDateTime;
+    public String modifyDatetime;
 
     @ApiParam("工单号")
     public String workOrderNo;
@@ -64,11 +67,11 @@ public class ProdPackModel implements Serializable {
         this.printStatus = printStatus;
     }
 
-    public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
+    public ProdPackModel(String productSn, String packageNo, String custSn, Integer printStatus, String modifyDatetime) {
         this.productSn = productSn;
         this.packageNo = packageNo;
         this.custSn = custSn;
-        this.processCode = processCode;
-        this.modifyDateTime = modifyDateTime;
+        this.printStatus = printStatus;
+        this.modifyDatetime = modifyDatetime;
     }
 }

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

@@ -954,6 +954,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(qcOrder.getCheckType())) {
             DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
         }
+        if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
+        }
         // 时间段查询
         if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(