Merge remote-tracking branch 'remotes/origin/dev' into test

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")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

@@ -0,0 +1,52 @@
+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;
+
+}