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 d92af1f..56b4e51 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 @@ -598,25 +598,25 @@ public class WmsHqlPack { * @param wmsShopping * @return */ - public static String packHqlWmsShipping(WmsShopping wmsShopping) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsShipping(WmsShopping wmsShopping) { + DdlPackBean result = new DdlPackBean(); //发运单号 - HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 - HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //物料编码 - HqlPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getPartNo(), "partNo", result); //条码 - HqlPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getSn(), "sn", result); //发运状态 - HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); //特殊发货标志 - HqlPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(wmsShopping.getShippingFlag(), "shippingFlag", result); getStringBuilderPack(wmsShopping, result); - return result.toString(); + return result; } /** @@ -728,21 +728,21 @@ public class WmsHqlPack { * @param wmsSnPrint 打印机队列信息 * @return 打印机队列信息 */ - public static String packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) { + DdlPackBean result = new DdlPackBean(); // 来源单据类型 - HqlPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefType(), "refType", result); // 来源单据号 - HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result); // 打印机 - HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result); // 打印机状态 - HqlPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); + DdlPreparedPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result); getStringBuilderPack(wmsSnPrint, result); - return result.toString(); + return result; } /** @@ -826,25 +826,23 @@ public class WmsHqlPack { } /** - * 根据条件查询责任区分配信息封装类 - * - * @param wmsTempOrderLock 责任区分配信息 - * @return 责任区分配信息 + * 根据条件查询单据锁定封装类 + * @return 单据锁定信息 */ - public static String packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) { + DdlPackBean result = new DdlPackBean(); // 订单号 - HqlPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsTempOrderLock.getOrderNo(), "orderNo", result); // 业务类型 - HqlPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); + DdlPreparedPack.getNumEqualPack(wmsTempOrderLock.getBizType(), "bizType", result); // 物料代码 - HqlPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTempOrderLock.getPartNo(), "partNo", result); getStringBuilderPack(wmsTempOrderLock, result); - return result.toString(); + return result; } /** @@ -895,14 +893,14 @@ public class WmsHqlPack { * @param tranNo * @return */ - public static String packWmsTransSn(String tranNo) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsTransSn(String tranNo) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(tranNo, "transNo", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + DdlPreparedPack.getStringEqualPack(tranNo, "transNo", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - return result.toString(); + return result; } /** @@ -911,19 +909,19 @@ public class WmsHqlPack { * @param wmsTransQuan * @return */ - public static String packWmsTransQuan(WmsTransQuan wmsTransQuan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsTransQuan(WmsTransQuan wmsTransQuan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsTransQuan, result); - return result.toString(); + return result; } /** @@ -932,17 +930,17 @@ public class WmsHqlPack { * @param wmsPackage * @return */ - public static String packWmsPackAge(WmsPackage wmsPackage) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsPackAge(WmsPackage wmsPackage) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); - HqlPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); - HqlPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); + DdlPreparedPack.getStringEqualPack(wmsPackage.getPackageNo(), "packageNo", result); + DdlPreparedPack.getStringEqualPack(wmsPackage.getParentPackageNo(), "parentPackageNo", result); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPackTypeId(), "packTypeId", result); getStringBuilderPack(wmsPackage, result); - return result.toString(); + return result; } /** @@ -1015,19 +1013,19 @@ public class WmsHqlPack { * @param wmsMoveSn * @return */ - public static String packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsMoveSn(WmsMoveSn wmsMoveSn) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); - HqlPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result); - HqlPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result); + DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result); getStringBuilderPack(wmsMoveSn, result); - return result.toString(); + return result; } /** @@ -1058,21 +1056,21 @@ public class WmsHqlPack { * @param wmsQCMaster * @return */ - public static String packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCMaster(WmsQCMaster wmsQCMaster) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 - HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //关联单据类型 - HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); //关联单据号 - HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); + DdlPreparedPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); getStringBuilderPack(wmsQCMaster, result); - return result.toString(); + return result; } /** @@ -1121,15 +1119,15 @@ public class WmsHqlPack { * @param wmsQCDetails * @return */ - public static String packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCDetails(WmsQCDetails wmsQCDetails) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsQCDetails, result); - return result.toString(); + return result; } /** @@ -1138,16 +1136,16 @@ public class WmsHqlPack { * @param wmsQCTrans * @return */ - public static String packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsQCTrans(WmsQCTrans wmsQCTrans) { + DdlPackBean result = new DdlPackBean(); //单号 - HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result); //物料 - HqlPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsQCTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsQCTrans, result); - return result.toString(); + return result; } /** @@ -1390,20 +1388,20 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); - HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); - HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); - HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); - HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); + public static DdlPackBean packHqlWmsStockSn(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); - return result.toString(); + return result; } /** @@ -1412,15 +1410,15 @@ public class WmsHqlPack { * @param wmsSnPrintRcd * @return */ - public static String packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); + public static DdlPackBean packHqlWmsSnPrintRcd(WmsSnPrintRcd wmsSnPrintRcd) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsSnPrintRcd.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsSnPrintRcd, result); - return result.toString(); + return result; } /** @@ -1429,12 +1427,12 @@ public class WmsHqlPack { * @param wmsStockSn * @return */ - public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); - return result.toString(); + public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); + return result; } /** @@ -1443,12 +1441,12 @@ public class WmsHqlPack { * @param wmsStockQuan * @return */ - public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + public static DdlPackBean packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); getStringBuilderPack(wmsStockQuan, result); - return result.toString(); + return result; } /**