Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
@@ -47,6 +48,7 @@ public class WmsLocate extends BaseBean {
      */
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.LOCATE_TYPE.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE")
     private Integer locateType;
 
@@ -192,6 +194,14 @@ public class WmsLocate extends BaseBean {
         this.destBoxQty = destBoxQty;
     }
 
+    public WmsLocate(String locateNo,Integer destBoxQty, Integer y, Integer x, Integer z) {
+        this.locateNo = locateNo;
+        this.destBoxQty = destBoxQty;
+        this.y = y;
+        this.x = x;
+        this.z = z;
+    }
+
     public WmsLocate(Integer boxQty ,  Double partQty,String locateNo){
         this.boxQty=boxQty;
         this.partQty=partQty;

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

@@ -48,4 +48,11 @@ public class GenerateLocateRule {
      * 物料名称
      */
     private String partNo;
+
+    /**
+     * 按照坐标排序
+     */
+    private boolean orderByAxle;
+
+
 }