From a13d87c24661c3119ab4859ed41e54af01393c9c Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 17 Apr 2019 16:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 63 +++++++++++----------- 1 file changed, 33 insertions(+), 30 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 1c0d26e..edde64c 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 @@ -413,16 +413,16 @@ public class WmsHqlPack { * @param wmsOpType * @return */ - public static String packHqlWmsOpType(WmsOpType wmsOpType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsOpType(WmsOpType wmsOpType) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); + DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + DdlPreparedPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result); getStringBuilderPack(wmsOpType, result); - return result.toString(); + return result; } /** @@ -462,15 +462,15 @@ public class WmsHqlPack { return result.toString(); } - public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); getStringBuilderPack(wmsOpType, result); - return result.toString(); + return result; } /** @@ -1431,13 +1431,13 @@ public class WmsHqlPack { * * @return */ - public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); + public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result); String data = String.join(",", roleIds); - HqlPack.getInPackString(data, "roleCode", result); + DdlPreparedPack.getInPack(data, "roleCode", result); getStringBuilderPack(new WmsDataAuth(), result); - return result.toString(); + return result; } /** @@ -1446,8 +1446,8 @@ public class WmsHqlPack { * @param groupDataAuth * @return */ - public static String packHqlWmsTaskDetail(Map> groupDataAuth) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth) { + DdlPackBean result = new DdlPackBean(); Set>> entries = groupDataAuth.entrySet(); //拼sql entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())).forEach(o -> { @@ -1458,25 +1458,25 @@ public class WmsHqlPack { List mapList = JSONObject.parseArray(data, Map.class); if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) { for (Map whNoItem : mapList) { - HqlPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result); + DdlPreparedPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result); } } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) { for (Map locateNoItem : mapList) { - HqlPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result); + DdlPreparedPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result); } } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) { for (Map zoneNoItem : mapList) { - HqlPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result); + DdlPreparedPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result); } } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) { for (Map zoneNoItem : mapList) { - HqlPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result); + DdlPreparedPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result); } } } }); getStringBuilderPack(new WmsDataAuth(), result); - return result.toString(); + return result; } /** @@ -1486,14 +1486,17 @@ public class WmsHqlPack { * @param vals * @return */ - public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List vals) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List vals) { + DdlPackBean packBean = new DdlPackBean(); String data = String.join(",", vals); - HqlPack.getInPackString(data, columnName, result); - HqlPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result); - getStringBuilderPack(bean, result); - return result.toString(); + DdlPreparedPack.getInPack(data, columnName, packBean); + DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); + + getStringBuilderPack(bean, packBean); + + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean); + return packBean; } /**