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..6191b78 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; } /** @@ -1699,8 +1699,8 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", - WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result); + DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() , + WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);