From ae8f051f539dfbfbe910feb96434d6d89b53e950 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 19 Apr 2019 18:25:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 201 +++++++++++---------- 1 file changed, 103 insertions(+), 98 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 a1803cd..b6a45ce 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 @@ -33,6 +33,7 @@ public class WmsHqlPack { /** * 封装公用查询参数 + * * @param bean 实体对象 * @param hqlStr 查询语句 * @return 封装完成的查询语句 @@ -136,7 +137,6 @@ public class WmsHqlPack { */ public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) { DdlPackBean packBean = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); //查询参数封装 DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean); @@ -272,62 +272,6 @@ public class WmsHqlPack { } /** - * 库位物料信息 分页查询 - * - * @param wmsLocatePart - * @return - */ - public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { - StringBuffer result = new StringBuffer(); - - //查询参数封装 - HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); - - getStringBuilderPack(wmsLocatePart, result); - - return result.toString(); - } - - /** - * 库位信息 分页查询 - * - * @param wmsLocate - * @return - */ - public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) { - //查询参数封装 - DdlPackBean result = new DdlPackBean(); - - //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); - DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); - DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); - DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); - - getStringBuilderPack(wmsLocate, result); - - return result; - } - - /** - * 根据类型查询库位分页 - * - * @param wmsLocate - * @return - */ - public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { - StringBuffer result = new StringBuffer(); - //查询参数封装 - HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); - getStringBuilderPack(wmsLocate, result); - return result.toString(); - } - - /** * 交易类型信息 分页查询 * * @param wmsTransType @@ -365,23 +309,6 @@ public class WmsHqlPack { return result.toString(); } - /** - * 仓库分页查询条件 - * - * @param wareHouse - * @return - */ - public static String packHqlWareHouse(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); - - getStringBuilderPack(wareHouse, result); - - return result.toString(); - } /** * 供应商分页查询 @@ -424,6 +351,24 @@ public class WmsHqlPack { } /** + * 仓库分页查询条件 + * + * @param wareHouse + * @return + */ + public static String packHqlWareHouse(WareHouse wareHouse) { + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); + HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + + getStringBuilderPack(wareHouse, result); + + return result.toString(); + } + + /** * 仓库唯一性校验查询条件【用于添加和修改】 * * @param wareHouse @@ -442,6 +387,85 @@ public class WmsHqlPack { } /** + * 存储区信息 查询条件封装 + * + * @param wmsZones + * @return + */ + public static String packHqlWmsZones(WmsZones wmsZones) { + StringBuffer result = new StringBuffer(); + + //仓库代码 + HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + //库存地代码 + HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); + //存储区代码 + HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //存储区名称 + HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + + getStringBuilderPack(wmsZones, result); + + return result.toString(); + } + + /** + * 库位信息 分页查询 + * + * @param wmsLocate + * @return + */ + public static DdlPackBean packHqlWmsLocates(WmsLocate wmsLocate) { + //查询参数封装 + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result); + + getStringBuilderPack(wmsLocate, result); + + return result; + } + + /** + * 根据类型查询库位分页 + * + * @param wmsLocate + * @return + */ + public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { + StringBuffer result = new StringBuffer(); + //查询参数封装 + HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + getStringBuilderPack(wmsLocate, result); + return result.toString(); + } + + /** + * 库位物料信息 分页查询 + * + * @param wmsLocatePart + * @return + */ + public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsLocatePart, result); + + return result.toString(); + } + + /** * 供应商唯一性校验查询条件【用于添加和修改】 * * @param basVendor @@ -502,28 +526,6 @@ public class WmsHqlPack { return result.toString(); } - /** - * 存储区信息 查询条件封装 - * - * @param wmsZones - * @return - */ - public static String packHqlWmsZones(WmsZones wmsZones) { - StringBuffer result = new StringBuffer(); - - //仓库代码 - HqlPack.getStringLikerPack(wmsZones.getWhNo(), "whNo", result); - //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); - //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); - //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); - - getStringBuilderPack(wmsZones, result); - - return result.toString(); - } /** * 客户信息 查询条件封装 @@ -1083,8 +1085,8 @@ public class WmsHqlPack { HqlPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "", WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue() + ""), "snStatus", result); //单号 - HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getDateCode(),"dateCode",result); + HqlPack.getStringLeftLikerPack(wmsStockSn.getSn(), "sn", result); + HqlPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); @@ -1272,6 +1274,7 @@ public class WmsHqlPack { /** * 作业流程分页查询 + * * @return */ public static DdlPackBean packHqlWmsActionGroup(WmsActionGroup wmsActionGroup) { @@ -1289,6 +1292,7 @@ public class WmsHqlPack { /** * 作业流程明细分页查询 + * * @return */ public static DdlPackBean packHqlWmsActionGroupDetails(WmsActionGroupDetails wmsActionGroupDetails) { @@ -1621,6 +1625,7 @@ public class WmsHqlPack { /** * 查询脚本持久化 查询条件封装 + * * @return */ public static DdlPackBean packEngineScriptPersistence(EngineScriptPersistence scriptPersistence) {