diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index fb9a9df..d56b315 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -102,6 +102,11 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "锁定数量", example = "0") private Double lockQty; + @Column(name = "SCRAP_QTY") + @ColumnDefault("0") + @ApiParam(value = "报废数量", example = "0") + private Double scrapQty; + public Double getQty() { return this.qty == null ? 0 : this.qty; } @@ -134,10 +139,14 @@ public class WmsStockQuan extends BaseBean { return this.lockQty == null ? 0 : this.lockQty; } + public Double getScrapQty() { + return this.scrapQty == null ? 0 : this.scrapQty; + } + public WmsStockQuan() { } - public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) { + public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) { this.qty = qty; this.failQty = failQty; this.holdQty = holdQty; @@ -146,5 +155,6 @@ public class WmsStockQuan extends BaseBean { this.freezeQty = freezeQty; this.consignQty = consignQty; this.lockQty = lockQty; + this.scrapQty = scrapQty; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index eeb9fba..9129da2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1687,6 +1687,18 @@ public class WmsHqlPack { getStringBuilderPack(wmsLineLocatePart, result); return result; } + /** + * 任务数据来源 分页查询 + * + * @param wmsTaskSrc + * @return + */ + public static DdlPackBean packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) { + DdlPackBean result = new DdlPackBean(); - + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result); + getStringBuilderPack(wmsTaskSrc, result); + return result; + } }