From bcd3e43867bbb15f5d53d05e75d7aa0e864e77bb Mon Sep 17 00:00:00 2001 From: shiyanghuan <714967695@qq.com> Date: Fri, 21 Jun 2019 21:14:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BA=A4=E6=98=93=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9=E6=96=99?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 17 +++++++-- .../wms/repository/WmsTransQuanRepository.java | 2 + .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 43 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index a173734..aa23e71 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 库存交易条码信息 （移库类的交易需要记录2笔交易数据，正负各一笔） @@ -144,4 +141,16 @@ public class WmsTransQuan extends BaseBean { @ColumnDefault("0") @ApiParam(value = "报废数量", example = "0") private Double scrapQty; + + @Transient + @ApiParam("交易类型") + private String transTypeName; + + @Transient + @ApiParam("仓库名称") + private String warehouseName; + + @Transient + @ApiParam("存储区名称") + private String zoneName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java index 41992cd..f626008 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransQuanRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan; +import org.springframework.stereotype.Repository; /** * @Description : 库存业务dao层 @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan; * @CreateDate : 2018-11-17 15:57 * @Modify: **/ +@Repository public interface WmsTransQuanRepository extends BaseRepository { } 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 49caa41..a407dfb 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 @@ -1957,4 +1957,47 @@ public class WmsHqlPack { return result; } + + //库层交易报表packHqlWmsTransQuan + + + public static DdlPackBean packHqlWmsTransQuan(WmsTransQuan wmsTransQuan) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "transNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getUnit(), "unit", result); + DdlPreparedPack.getNumEqualPack(wmsTransQuan.getTransStatus(), "transStatus", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRefType(), "refType", result); + DdlPreparedPack.getNumEqualPack(wmsTransQuan.getBusiType(), "busiType", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransCode(), "transCode", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getErrorMessage(), "errorMessage", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQty().toString(), "qty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFailQty().toString(), "failQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getHoldQty().toString(), "holdQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getQcQty().toString(), "qcQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getRinQty().toString(), "rinQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getFreezeQty().toString(), "freezeQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getConsignQty().toString(), "consignQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLockQty().toString(), "lockQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransNo(), "scrapQty", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getScrapQty().toString(), "transTypeName", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWarehouseName(), "warehouseName", result); +// DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneName(), "zoneName", result); +// + + getStringBuilderPack(wmsTransQuan, result); + + return result; + } + + }