开发 交叉盘点 库存容量更新

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

@@ -60,4 +60,17 @@ public class WmsCSAdjustRange extends BaseBean {
     @Transient
     @ApiParam("单位")
     public String unit;
+
+    public WmsCSAdjustRange(){}
+    public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
+        this.orderNo = orderNo;
+        this.item = item;
+        this.isAdjust = isAdjust;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.unit = unit;
+        this.organizeCode = organizeCode;
+    }
 }

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

@@ -200,6 +200,14 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "工厂名称")
     public String organizeName;
 
+    @Transient
+    @ApiParam(value = "物料数量总和")
+    public Double sumPartQty;
+
+    @Transient
+    @ApiParam(value = "条码数量总和")
+    public Long snCount;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){
@@ -209,4 +217,10 @@ public class WmsStockSn extends BaseBean {
     public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
 
     public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
+
+    public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) {
+        this.snCount = snCount;
+        this.sumPartQty = sumPartQty;
+        this.locateNo = locateNo;
+    }
 }

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

@@ -1740,7 +1740,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(),
                 WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
+        DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
 
         getStringBuilderPack(wmsCSOrderMaster, result);