Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test

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

@@ -3687,6 +3687,39 @@ public class MesEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_PRINT_STATUS {
+
+        UNPRINTED(10, "未打印"),
+        PRINTED(20, "已打印");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_PRINT_STATUS(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;
+        }
+    }
+
     /**
      * MesProduceSn实体对应的printStatus值  条码表条码打印状态
      */

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

@@ -2585,6 +2585,39 @@ public class MesPcnEnumUtil {
     }
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_PRINT_STATUS {
+
+        UNPRINTED(10, "未打印"),
+        PRINTED(20, "已打印");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_PRINT_STATUS(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;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PACKAGE_PRINT_STATUS {
 
         UNPRINTED(10, "未打印"),