From 3f5c28e1af4317930c80b1e321189e1f14aad6ad Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 16 Jul 2019 18:10:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=8F=90=E4=BA=A4=E7=BB=84=E4=BB=B6=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=A4=8D=E7=9B=98=E5=BC=80=E5=8F=91=20?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=B8=9A=E5=8A=A1=E5=A2=9E=E5=8A=A0=E6=A8=A1?= =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 16 ++++++++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index efc024e..af44900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -103,6 +103,14 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam("是否范围内") public Integer isScope; + @Transient + @ApiParam(value = "实盘箱数", example = "1") + public Long countBoxQty; + + @Transient + @ApiParam(value = "物料数量", example = "1") + public Double sumPartQty; + public WmsCSFactTrans(){} public Integer getIsScopeVal() { @@ -133,4 +141,12 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } + + public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) { + this.countBoxQty = countBoxQty; + this.sumPartQty = sumPartQty; + this.zoneNo = zoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } 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 7803190..9291e8c 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 @@ -57,9 +57,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); - DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); @@ -78,9 +78,9 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); - DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); @@ -119,7 +119,7 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); @@ -139,7 +139,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); @@ -164,7 +164,7 @@ public class WmsHqlPack { DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(), WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); @@ -245,7 +245,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsPart(WmsPart wmsPart) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPart.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); DdlPreparedPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); DdlPreparedPack.getStringEqualPack(wmsPart.getPartType(), "partType", result); @@ -266,7 +266,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); @@ -290,7 +290,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);