Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -207,4 +207,13 @@ public class WmsCSOrderDetails extends BaseBean {
         this.organizeCode = organizeCode;
         this.qty=qty;
     }
+
+    public WmsCSOrderDetails (String orderNo, String partNo,String partNameRdd, String locateNo, double qty, double factQty){
+    	this.orderNo=orderNo;
+        this.partNo=partNo;
+        this.partNameRdd=partNameRdd;
+        this.qty=qty;
+        this.factQty=factQty;
+        this.locateNo=locateNo;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.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.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -52,6 +53,7 @@ public class WmsCSRange extends BaseBean {
 
     @Column(name = "LOCATE_NO")
     @ApiParam("库位编号")
+    @AnnoOutputColumn(hidden = true)
     public String locateNo;
 
     @Column(name = "UNIT")
@@ -59,7 +61,8 @@ public class WmsCSRange extends BaseBean {
     public String unit;
 
     @Transient
-    @ApiParam("存储区编号")
+    @ApiParam("存储区编号组")
+    @AnnoOutputColumn(hidden = true)
     public String[] zoneNos;
 
     public WmsCSRange(){}

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

@@ -187,4 +187,8 @@ public class WmsDocMovementMaster extends BaseBean {
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;
     }
+
+    public int getBusiTypeVal() {
+        return this.busiType == null ? 0 : this.busiType;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1388,6 +1388,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result);
         DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);