From 5f76a142768655bfcc68436c8335cf53b0b513a3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 21 Mar 2019 15:52:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=A1=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 5012840..6333860 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; /** @@ -134,4 +135,16 @@ public class WmsStockSn extends BaseBean { @Column(name = "CUST_SN") @ApiParam(value = "客户条码") private String custSn; + + @ApiParam(value = "仓库名称") + @Transient + public String whNameRdd; + + @ApiParam(value = "存储区名称") + @Transient + public String zoneNameRdd; + + @ApiParam(value = "库位名称") + @Transient + public String locateNameRdd; } 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 b474e3b..dac5fb6 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 @@ -1320,9 +1320,15 @@ public class WmsHqlPack { public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getWhNo(), "whNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getPartNo(), "partNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); }