From 1adb344e31a856776d1ae541285f10b2a5acce66 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 3 Apr 2019 14:22:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E7=A8=8B=E7=AE=A1?= =?UTF-8?q?=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 | 176 ++++++++++++--------- 1 file changed, 99 insertions(+), 77 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 0f5f954..eccbdfa 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 @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -27,7 +29,6 @@ public class WmsHqlPack { public static String packInParams(String colnumName, String[] params) { StringBuffer sb = new StringBuffer(); HqlPack.getInPackString(String.join(",", params), colnumName, sb); - HqlPack.getNumEqualPack( WmsEnumUtil.IS_PART.IS_ADJUST.getValue(),"snControl", sb); return sb.toString(); } @@ -37,16 +38,36 @@ public class WmsHqlPack { * @param hqlStr 查询语句 * @return 封装完成的查询语句 */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 封装公用查询参数 + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + HqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } // 封装有效状态和删除状态 - SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); - SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + HqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr.toString(); } @@ -313,17 +334,17 @@ public class WmsHqlPack { * @param wmsTransType * @return */ - public static String packHqlWmsTransType(WmsTransType wmsTransType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTransType(WmsTransType wmsTransType) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); - HqlPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); - HqlPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); + DdlPreparedPack.getStringEqualPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); + DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); getStringBuilderPack(wmsTransType, result); - return result.toString(); + return result; } /** @@ -1138,19 +1159,19 @@ public class WmsHqlPack { * @param wmsActionStepCall * @return */ - public static String packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepCall(WmsActionStepCall wmsActionStepCall) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); - HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); - HqlPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAsId(), "asId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCall.getAmType(), "amType", result); getStringBuilderPack(wmsActionStepCall, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** @@ -1159,15 +1180,15 @@ public class WmsHqlPack { * @param wmsActionStepType * @return */ - public static String packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepType(WmsActionStepType wmsActionStepType) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); + DdlPreparedPack.getStringEqualPack(wmsActionStepType.getAtNameC(), "atNameC", result); getStringBuilderPack(wmsActionStepType, result); - return result.toString(); + return result; } /** @@ -1176,15 +1197,15 @@ public class WmsHqlPack { * @param wmsActionStep * @return */ - public static String packHqlWmsActionStep(WmsActionStep wmsActionStep) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStep(WmsActionStep wmsActionStep) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); + DdlPreparedPack.getStringEqualPack(wmsActionStep.getAsNameC(), "asNameC", result); getStringBuilderPack(wmsActionStep, result); - return result.toString(); + return result; } /** @@ -1193,15 +1214,14 @@ public class WmsHqlPack { * @param wmsActionModuleParam * @return */ - public static String packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionModuleParam(WmsActionModuleParam wmsActionModuleParam) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); - HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); + DdlPreparedPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result); + DdlPreparedPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result); getStringBuilderPack(wmsActionModuleParam, result); - - return result.toString(); + return result; } /** @@ -1210,49 +1230,51 @@ public class WmsHqlPack { * @param wmsActionModule * @return */ - public static String packHqlWmsActionModule(WmsActionModule wmsActionModule) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); - HqlPack.getNumEqualPack(wmsActionModule.getId(), "id", result); - HqlPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); + DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); getStringBuilderPack(wmsActionModule, result); - return result.toString(); + return result; } /** * 作业流程分页查询 * @return */ - public static String packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 agDescC;agNameC - HqlPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); - HqlPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); + DdlPreparedPack.getStringLikerPack(wmsActionGroup.getAgNameC(), "agNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionGroup.getAgDescC(), "agDescC", result); getStringBuilderPack(wmsActionGroup, result); - return result.toString(); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"createDatetime"}, result); + + return result; } /** * 作业流程明细分页查询 * @return */ - public static String packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); + DdlPreparedPack.getNumEqualPack(wmsActionGroupDetails.getAgId(), "agId", result); getStringBuilderPack(wmsActionGroupDetails, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /** @@ -1261,13 +1283,13 @@ public class WmsHqlPack { * @param wmsActionLogData * @return */ - public static String packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLogData(WmsActionLogData wmsActionLogData) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogData.getAldId(), "aldId", result); getStringBuilderPack(wmsActionLogData, result); - return result.toString(); + return result; } /** @@ -1276,15 +1298,15 @@ public class WmsHqlPack { * @param wmsActionStepCallParam * @return */ - public static String packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionStepCallParam(WmsActionStepCallParam wmsActionStepCallParam) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); - HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getAmId(), "amId", result); + DdlPreparedPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); getStringBuilderPack(wmsActionStepCallParam, result); - return result.toString(); + return result; } /** @@ -1292,33 +1314,33 @@ public class WmsHqlPack { * @param wmsActionLog * @return */ - public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLog(WmsActionLog wmsActionLog) { + DdlPackBean result = new DdlPackBean(); if (wmsActionLog.getStartTimeStart() != null || wmsActionLog.getStartTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), + DdlPreparedPack.timeBuilder(wmsActionLog.getStartTimeStart(), wmsActionLog.getStartTimeEnd(), "startTime", result, true); } else if (wmsActionLog.getEndTimeStart() != null || wmsActionLog.getEndTimeEnd() != null) { - HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), + DdlPreparedPack.timeBuilder(wmsActionLog.getEndTimeStart(), wmsActionLog.getEndTimeEnd(), "endTime", result, true); } // 作业流程编号 - HqlPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLog.getAgId(), "agId", result); // 作业流程名称 - HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); + DdlPreparedPack.getStringLikerPack(wmsActionLog.getAgNameC(), "agNameC", result); // 单据编号 - HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result); // 设备编号 - HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); + DdlPreparedPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result); // 交易类型代码 - HqlPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result); // 流程状态 - HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); + DdlPreparedPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result); getStringBuilderPack(wmsActionLog, result); - return result.toString(); + return result; } /** @@ -1326,21 +1348,21 @@ public class WmsHqlPack { * @param wmsActionLogDetails * @return */ - public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails) { + DdlPackBean result = new DdlPackBean(); //作业流程id（对应作业记录明细里自增的id） - HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); - HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getAlId(), "alId", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getSeq(), "seq", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result); + DdlPreparedPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result); getStringBuilderPack(wmsActionLogDetails, result); - HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); + DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); - return result.toString(); + return result; } /**