From 0341dd2f5ee810ae9fd6aada65d2c0af2e15100c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 22 Jul 2019 13:49:31 +0800 Subject: [PATCH 1/2] bug #5030 --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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 6116e44..f8c6f5c 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 @@ -685,9 +685,9 @@ public class WmsHqlPack { // 来源单据类型 DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); // 来源单据号 - DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrint.getRefNo(), "refNo", result); // 打印机 - DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); + DdlPreparedPack.getStringLikerPack(wmsSnPrint.getPrinter(), "printer", result); // 打印机状态 DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); @@ -948,8 +948,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); - DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getStringLikerPack(wmsPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringLikerPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); @@ -985,11 +985,11 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true); @@ -1085,13 +1085,13 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //单号 - DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //关联单据类型 DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 - DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringLikerPack(wmsQCMaster.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsQCMaster, result); @@ -1712,10 +1712,10 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsTransModule(WmsTransModule wmsTransModule) { DdlPackBean packBean = new DdlPackBean(); if (!Strings.isNullOrEmpty(wmsTransModule.getTmName())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getTmName(), "tmName", packBean); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmName(), "tmName", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getCallClass())) { - DdlPreparedPack.getStringEqualPack(wmsTransModule.getCallClass(), "callClass", packBean); + DdlPreparedPack.getStringLikerPack(wmsTransModule.getCallClass(), "callClass", packBean); } if (!Strings.isNullOrEmpty(wmsTransModule.getTmDesc())) { DdlPreparedPack.getStringLikerPack(wmsTransModule.getTmDesc(), "tmDesc", packBean); From b4a538ebb58009a544448b37e941f0d589432648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Mon, 22 Jul 2019 17:26:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=8D=A2=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 6116e44..6571144 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 @@ -48,6 +48,23 @@ public class WmsHqlPack { } /** + * 单位换算 分页查询 + * @return + */ + public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){ + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getUnitCode(), "unitCode", result); + DdlPreparedPack.getStringEqualPack(wmsUnitConvert.getDestUnitCode(), "destUnitCode", result); + + getStringBuilderPack(wmsUnitConvert, result); + + return result; + } + + + /** * PO订单明细表 分页查询 * * @param wmsPOMasterDetails