From 13106615eee91d912f04bea376bbfd1d7330e5e1 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 17 Apr 2019 11:56:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?PO=E6=98=8E=E7=BB=86=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=94=B9=E4=B8=BADouble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 9d973a8..1fc9671 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean { @Column(name = "SNP") @ApiParam("标准包装") - public Integer snp; + public Double snp; /** * 是否免费:0=计费,1=免费 From fc6368ca5f0a6c62f409a14dfae9cdf8f9cfcf7a Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Wed, 17 Apr 2019 13:49:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 59 +++++++++++----------- 1 file changed, 30 insertions(+), 29 deletions(-) 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 2fef73f..1c0d26e 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 @@ -136,18 +136,19 @@ public class WmsHqlPack { * @param wmsDocMovementMaster * @return */ - public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { + DdlPackBean packBean = new DdlPackBean(); +// StringBuffer result = new StringBuffer(); //查询参数封装 - HqlPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); - HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean); + DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean); + DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean); - getStringBuilderPack(wmsDocMovementMaster, result); + getStringBuilderPack(wmsDocMovementMaster, packBean); - return result.toString(); + return packBean; } /** @@ -984,28 +985,28 @@ public class WmsHqlPack { * @param wmsMoveDetails * @return */ - public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result); - HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result); - HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result); - HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result); - - getStringBuilderPack(wmsMoveDetails, result); + public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { + DdlPackBean packBean = new DdlPackBean(); +// StringBuffer result = new StringBuffer(); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean); + DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean); + DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean); + DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean); + + getStringBuilderPack(wmsMoveDetails, packBean); - return result.toString(); + return packBean; } /** From 5d5291096053960c81caafd49feafb7aa1ff8c5b Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 17 Apr 2019 13:50:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E5=8D=95=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E2=80=9C=E6=98=AF=E5=90=A6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E2=80=9D=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index fdbeed4..bd4c822 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -115,10 +115,6 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "是否散件", example = "1") private Integer isPart; - @Column(name = "IS_SN") - @ApiParam(value = "是否指定条码", example = "1") - private Integer isSn; - @Transient @ApiParam(value = "发运单号") private String shipOrderNo;