库存报表业务改动以及bug修改

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

@@ -126,6 +126,26 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "总数量")
     private Double totalQty;
 
+    @Transient
+    @ApiParam(value = "项目名称")
+    private String prodCfgTypeName;
+
+    @Transient
+    @ApiParam(value = "箱数", example = "-1")
+    private Integer boxQty;
+
+    @Transient
+    @ApiParam(value = "零件数", example = "-1")
+    private Double partQty;
+
+    @Transient
+    @ApiParam(value = "ERP库存地")
+    private String areaNo;
+
+    public String getAreaNo() {
+        return areaNo;
+    }
+
     public Double getQtyVal() {
         return this.qty == null ? 0 : this.qty;
     }
@@ -166,6 +186,14 @@ public class WmsStockQuan extends BaseBean {
         return this.totalQty == null ? 0 : this.totalQty;
     }
 
+    public Double getPartQtyVal() {
+        return this.partQty == null ? 0 : this.partQty;
+    }
+
+    public Integer getBoxQtyVal() {
+        return this.boxQty == null ? 0 : this.boxQty;
+    }
+
     public WmsStockQuan() {
     }
 
@@ -196,4 +224,45 @@ public class WmsStockQuan extends BaseBean {
         this.lockQty = lockQty;
         this.scrapQty = scrapQty;
     }
+
+    public WmsStockQuan(String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
+                        Double sumQty, Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+        this.locateNo = locateNo;
+        this.boxQty = boxQty;
+        this.partQty = partQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.sumQty = sumQty;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
+    }
+
+    public WmsStockQuan(String whNo, String zoneNo, String locateNo,Integer boxQty,Double partQty,String partNo,String partNameRdd, String unit,
+                         Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.boxQty = boxQty;
+        this.partQty = partQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.qty = qty;
+        this.failQty = failQty;
+        this.holdQty = holdQty;
+        this.qcQty = qcQty;
+        this.rinQty = rinQty;
+        this.freezeQty = freezeQty;
+        this.consignQty = consignQty;
+        this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
+    }
 }

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

@@ -2000,8 +2000,8 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
         DdlPackBean result = new DdlPackBean();
 
-        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
-        DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
+        DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitCode(), "unitCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsUnit.getUnitName(), "unitName", result);
         DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);
         getStringBuilderPack(wmsUnit, result);