库存报表存储区级联子存储区查询

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -502,8 +502,8 @@ public class WmsEnumUtil {
         SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
         NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
         NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
-        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库");
-
+        LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
+        AMPR(190, "AMPR", "AMPR");
 
         private int value;
         private String code;
@@ -2868,6 +2868,7 @@ public class WmsEnumUtil {
         ASSIST("ASSIST", "辅助"),
         NC("NC", "NC"),
         CS("CS", "盘点");
+
         private String value;
         private String description;
 

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

@@ -36,7 +36,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "ASN_TYPE")
     @ApiParam("单据类型")
-    public String asnType;
+    public Integer asnType;
 
     @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 库存信息
@@ -126,6 +127,10 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "总数量")
     private Double totalQty;
 
+    @Transient
+    @ApiParam(value = "存储区集合")
+    private List<String> zoneList;
+
     public Double getQtyVal() {
         return this.qty == null ? 0 : this.qty;
     }

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

@@ -521,7 +521,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
+        DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
         DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
@@ -821,9 +821,9 @@ public class WmsHqlPack {
     public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) {
         DdlPackBean result = new DdlPackBean();
 
+        DdlPreparedPack.getInPackList(wmsStockQuan.getZoneList(),"zoneNo",result);
         //查询参数封装
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);