From 380f16943fd6e66a33875bbb2d3aae74d228c1a7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 6 Mar 2019 12:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 29 +++++++++++++++++++--- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-) 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 1ef80a0..a35f07d 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 @@ -56,8 +56,31 @@ public class WmsStockQuan extends BaseBean { @ApiParam(value = "可用数量", example = "0") public Double qty; - @Column(name = "TOTAL_QTY") - @ApiParam(value = "总数量", example = "0") - private Double totalQty; + @Column(name = "FAIL_QTY") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + @Column(name = "HOLD_QTY") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; } 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 1fd89ec..b4fd62a 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 @@ -1245,13 +1245,24 @@ public class WmsHqlPack { */ public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getSn2d(),"sn2d", result); HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result); HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result); HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); } + + /** + * 根据条件查询库存信息 + * @param wmsStockQuan + * @return + */ + public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result); + HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result); + getStringBuilderPack(wmsStockQuan, result); + return result.toString(); + } }