From 6cbcea7c2cc980d95aee105cd649f70adb659238 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 18 Sep 2019 10:09:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E5=80=BC=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
index a839741..ff5adbd 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
@@ -74,7 +74,7 @@ public class SysMenu extends BaseBean {
     @Column(name="MENU_SORT")
     @ApiParam(value ="资源排序", example = "0")
     @AnnoOutputColumn(required = false)
-    private Integer menuSort;
+    private Integer menuSort = 0;
 
     @Column(name="MENU_URL")
     @ApiParam(value ="资源 url" , access ="资源 url")

From 512ebb495ceed3c4ae19946bbd67854e377d9b0c Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Wed, 18 Sep 2019 10:34:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=20=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/engine/rule/GenerateLocateRule.java   | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
new file mode 100644
index 0000000..e18e45e
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description : VDA收货 推荐入库
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-09-17 19:50
+ * @Modify:
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GenerateLocateRule {
+
+    List<String> zonesList;
+
+    Integer locateType;
+
+    String organizeCode;
+
+    String locateNo;
+
+    Integer destQty;
+
+    String partNo;
+
+}

From 9e2169fa87cc8028c11df460ca5bccfd72193392 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Wed, 18 Sep 2019 10:42:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=85=A5=E5=BA=93=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/engine/rule/GenerateLocateRule.java       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
index e18e45e..6b478cf 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
@@ -19,16 +19,34 @@ import java.util.List;
 @NoArgsConstructor
 public class GenerateLocateRule {
 
+    /**
+     * 存储区
+     */
     List<String> zonesList;
 
+    /**
+     * 库位类型
+     */
     Integer locateType;
 
+    /**
+     * 工厂代码
+     */
     String organizeCode;
 
+    /**
+     * 库位代码
+     */
     String locateNo;
 
+    /**
+     * 入库箱数
+     */
     Integer destQty;
 
+    /**
+     * 物料名称
+     */
     String partNo;
 
 }