From fca198486090637af53d768a532bfbdf47511681 Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Tue, 27 Nov 2018 18:38:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
index 9972172..11db5e5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@@ -38,5 +38,7 @@ public class WmsActionResponseBean {
     @ApiParam("选中的明细数据")
     public String details;
 
+    @ApiParam("返回代码 10-正确  20-失败 30-不跳转")
+    public String code;
 
 }

From e67151271b983aeb4d180f27b0b9ef5501e8cb39 Mon Sep 17 00:00:00 2001
From: "jessica.chen" <jessica.chen@estsh.com>
Date: Tue, 27 Nov 2018 19:39:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=B8=AD=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=9E=9A=E4=B8=BE=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 35 ++++++++++++++++++++++
 1 file changed, 35 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 59423a3..f35085e 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
@@ -1472,4 +1472,39 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 组件扫描单号 单据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RC_ORDER_TYPE {
+        PO(10, "PO"),
+        ASN(20, "ASN");
+
+        private int value;
+        private String description;
+
+        RC_ORDER_TYPE(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;
+        }
+    }
 }