增加查询条件

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtEnumUtil.java

@@ -772,6 +772,7 @@ public class MesExtEnumUtil {
             return this.description;
         }
     }
+
     /**
      * 零件拉动组-拉动单类型
      */
@@ -811,6 +812,125 @@ public class MesExtEnumUtil {
     }
 
     /**
+     * 零件拉动组明细-发送灯光类型
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum PART_PULL_DETAIL_SEND_LIGHT_TYPE {
+        FLASHING_LIGHT(10, "闪烁灯"),
+        ALWAYS_LIGHT(20, "常亮灯"),
+        ALWAYS_LIGHT_DEDUCTION_FREQUENCY(30, "常亮灯逐次扣数");
+
+        private int value;
+        private String description;
+
+        private PART_PULL_DETAIL_SEND_LIGHT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = 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 int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    /**
+     * 零件拉动组明细-扫描验证方式
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum PART_PULL_DETAIL_SCAN_VALIDATION_TYPE {
+        VALIDATE(10, "验证"),
+        UN_VALIDATE(20, "不验证");
+
+        private int value;
+        private String description;
+
+        private PART_PULL_DETAIL_SCAN_VALIDATION_TYPE(int value, String description) {
+            this.value = value;
+            this.description = 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 int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    /**
+     * 零件拉动组明细-时效规则
+     */
+    @JsonFormat(
+            shape = JsonFormat.Shape.OBJECT
+    )
+    public static enum PART_PULL_DETAIL_TIMELINESS_RULES {
+        LESS_MIN_TIME_DIFFERENCE_VALID(10, "小于最小时差有效"),
+        GREATER_MAX_TIME_DIFFERENCE_VALID(20, "大于最大时差有效"),
+        max_and_min_time_difference_valid(30, "最大最小时差间有效");
+
+        private int value;
+        private String description;
+
+        private PART_PULL_DETAIL_TIMELINESS_RULES(int value, String description) {
+            this.value = value;
+            this.description = 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 int getValue() {
+            return this.value;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
+    }
+
+    /**
      * 物料信息-零件类别
      */
     @JsonFormat(