新增mes 报表查询周期枚举

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

@@ -7859,4 +7859,42 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 查询周期
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUERY_GAP_TYPE {
+        MINUTE("MINUTE", "分钟"),
+        HOUR("HOUR", "小时"),
+        DAY("DAY", " 日"),
+        WEEK("WEEK", " 周"),
+        MONTH("MONTH", " 月");
+
+        private String value;
+        private String description;
+
+        QUERY_GAP_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -116,6 +116,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("特殊标识")
     private Integer specialFlag;
 
+    @ApiParam("箱条码")
+    private String packageNo;
+
     public QueueOrderModel() {
     }