From 692110b92b0c40786e1bf538ea231f7275e81f12 Mon Sep 17 00:00:00 2001
From: "bleakney.liu" <bleakney.liu@estsh.com>
Date: Mon, 30 Sep 2019 12:10:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E6=8A=A4=E3=80=91=E5=A2=9E=E5=8A=A0=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 84ecce4..8736d15 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
@@ -3632,5 +3632,63 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    
+    
+    /**
+     * 物流规则 处理模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_RULE_MODE {
+        CREATE_TASK(10, "CREATE_TASK", "生成任务"),
+        AUTO_OPT(20, "AUTO_OPT", "自动操作"),
+    	MENU_OPT(30, "MENU_OPT", "手工操作"),
+    	AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTING_RULE_MODE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }
\ No newline at end of file

From 8beee972a9b54aac9fa7c01ece6050ae7cc5599e Mon Sep 17 00:00:00 2001
From: "bleakney.liu" <bleakney.liu@estsh.com>
Date: Mon, 30 Sep 2019 12:14:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=89=A9=E6=B5=81=E7=BA=BF?=
 =?UTF-8?q?=E8=B7=AF=E7=BB=B4=E6=8A=A4=E3=80=91=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java    | 1 -
 1 file changed, 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 8736d15..016db6d 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
@@ -3643,7 +3643,6 @@ public class WmsEnumUtil {
         AUTO_OPT(20, "AUTO_OPT", "自动操作"),
     	MENU_OPT(30, "MENU_OPT", "手工操作"),
     	AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易");
-
         private int value;
         private String code;
         private String description;