From 04533633363ff41135698b3f8f3e341d3fe6ade5 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Wed, 18 Dec 2019 21:59:55 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=91=E8=BF=90=E9=85=8D=E6=96=99?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=B0=86=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=94=B9=E4=B8=BA=E5=89=A9=E4=BD=99=E9=85=8D?=
 =?UTF-8?q?=E6=96=99=E6=95=B0=E9=87=8F=E3=80=82=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=E3=80=91bug7063?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 36 +++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 87050ca..390532b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -110,6 +110,7 @@ public class WmsEnumUtil {
     /**
      * 移库单主表：优先级
      */
+    @Deprecated
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRIORITY {
         NORMAL(1, "正常"), URGENT(2, "紧急");
@@ -142,6 +143,38 @@ public class WmsEnumUtil {
 
 
     /**
+     * 移库单主表：优先级  (PRIORITY_NEW)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRIORITY_NEW {
+        URGENT(1, "紧急"), NORMAL(2, "正常");
+        private int value;
+        private String description;
+
+        PRIORITY_NEW(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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)
@@ -205,7 +238,8 @@ public class WmsEnumUtil {
         RECEIPT(20, "RECEIPT", "处理中"),
         RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
         CLOSED(40, "CLOSED", "已关闭"),
-        CANCELLED(50, "CANCELLED", "已取消");
+        CANCELLED(50, "CANCELLED", "已取消"),
+        FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成");
 
         private int value;
         private String code;