From d92850c1a48541aaf11e19c345f3493a7507290a Mon Sep 17 00:00:00 2001
From: gcj <changjiang.gao@estsh.com>
Date: Tue, 17 Dec 2019 19:50:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 36 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java |  6 ++++
 2 files changed, 42 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 d6d917c..fbac38e 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
@@ -4709,4 +4709,40 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VENDOR_TYPE {
+        VENDOR(10, "供应商"), CARRIERS(20, "承运商");
+
+        private int value;
+        private String description;
+
+        VENDOR_TYPE(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;
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java
index 7f62f02..388e6a7 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java
@@ -23,4 +23,10 @@ public class WmsTmsShipModel {
     private Double recQty;
     @ApiParam("单位")
     private String unit;
+
+    @ApiParam("序号")
+    private Integer item;
+
+    @ApiParam("装车时间")
+    private String modifyDatetime;
 }

From b5006a88f1a9c24991645109df860277b30a4117 Mon Sep 17 00:00:00 2001
From: E <1565181015@qq.com>
Date: Wed, 18 Dec 2019 09:42:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90#1302=20=E5=99=A8=E5=85=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E5=99=A8=E5=85=B7?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=A3=80=E6=9F=A5=E7=BB=84=E4=BB=B6=E3=80=91?=
 =?UTF-8?q?=E3=80=90#1303=20=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9B=B4=E6=96=B0=E7=AE=B1=E6=9D=A1=E7=A0=81=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E3=80=91?=
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 insertion(+)

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 a76b0fc..114c08f 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
@@ -990,6 +990,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
+        SCRAP(70,"报废"),
         COMMING(80, "在途");
 
         private int value;