From 2231000f9a7bbe3906c6949878765fe169378a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sun, 5 May 2019 17:04:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BUG#4050+=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=8D=E5=8A=A1=E5=88=92=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 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 13bf512..a3b4325 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 @@ -474,7 +474,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); @@ -578,7 +578,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); @@ -627,7 +627,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); //采购单号 DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); @@ -646,7 +646,7 @@ public class WmsHqlPack { } public static DdlPackBean packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); @@ -828,6 +828,7 @@ public class WmsHqlPack { /** * 根据条件查询单据锁定封装类 + * * @return 单据锁定信息 */ public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { @@ -951,10 +952,10 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { - DdlPackBean result =new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(),"transTypeCode",result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); @@ -1032,6 +1033,7 @@ public class WmsHqlPack { /** * 针对质检查询库存移动条码条件封装(特殊处理) + * * @param sn * @return */ @@ -1102,7 +1104,7 @@ public class WmsHqlPack { * @return */ public static DdlPackBean packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) { - DdlPackBean result = new DdlPackBean(); + DdlPackBean result = new DdlPackBean(); //查询参数封装 DdlPreparedPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", @@ -1520,7 +1522,7 @@ public class WmsHqlPack { * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List orderList) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List orderList) { DdlPackBean packBean = new DdlPackBean(); DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); @@ -1572,12 +1574,12 @@ public class WmsHqlPack { * @param wmsTaskCreateLog * @return */ - public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result); - HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result); + public static DdlPackBean packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result); + DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result); getStringBuilderPack(wmsTaskCreateLog, result); - return result.toString(); + return result; } /** From 7ffa55fbe8796496bb8b1f84b0e13aa050821af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Sun, 5 May 2019 18:39:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 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 a3b4325..64c8aba 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 @@ -101,15 +101,15 @@ public class WmsHqlPack { * @param wmsDocMovementDetails * @return */ - public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); getStringBuilderPack(wmsDocMovementDetails, result); - return result.toString(); + return result; } /** @@ -1627,14 +1627,14 @@ public class WmsHqlPack { * @param wmsDocMovementSn * @return */ - public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + public static DdlPackBean packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); getStringBuilderPack(wmsDocMovementSn, result); - return result.toString(); + return result; } /** @@ -1643,14 +1643,14 @@ public class WmsHqlPack { * @param details * @return */ - public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result); + public static DdlPackBean packHqlWmsDocMovementDetails(WmsDocMovementDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result); getStringBuilderPack(details, result); - return result.toString(); + return result; } /**