diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 15a11c4..dab72a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -174,6 +174,10 @@ public class WmsStockSn extends BaseBean { @Transient public Boolean isSet = false; + @ApiParam(value = "加减库容标志") + @Transient + public Boolean isAdd; + public WmsStockSn(){} public WmsStockSn(String partNo){ 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 42555f9..d92af1f 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 @@ -79,19 +79,19 @@ public class WmsHqlPack { * @param wmsPOMasterDetails * @return */ - public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); - return result.toString(); + return result; } /** @@ -155,20 +155,20 @@ public class WmsHqlPack { * @param wmsPOMaster * @return */ - public static String packHqlWmsPOMaster(WmsPOMaster wmsPOMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMaster(WmsPOMaster wmsPOMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); - HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); - HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); + DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); + return result; } /** @@ -177,22 +177,22 @@ public class WmsHqlPack { * @param wmsPOMaster * @return */ - public static String packHqlWmsPOMasterPart(WmsPOMaster wmsPOMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMasterPart(WmsPOMaster wmsPOMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", + DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); - HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); + return result; } /** @@ -254,22 +254,22 @@ public class WmsHqlPack { * @param wmsIbCheckPlan * @return */ - public static String packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { - HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); + DdlPreparedPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { - HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); + DdlPreparedPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } - return result.toString(); + return result; } /** @@ -317,20 +317,20 @@ public class WmsHqlPack { * @param basVendor * @return */ - public static String packHqlBasVendor(BasVendor basVendor) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasVendor(BasVendor basVendor) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); - HqlPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result); - HqlPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result); - HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); - HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); - HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); - HqlPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); getStringBuilderPack(basVendor, result); - return result.toString(); + return result; } /** @@ -357,16 +357,16 @@ public class WmsHqlPack { * @param wareHouse * @return */ - public static String packHqlWareHouse(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWareHouse(WareHouse wareHouse) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getCode(), "code", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getName(), "name", result); getStringBuilderPack(wareHouse, result); - return result.toString(); + return result; } /** @@ -393,21 +393,21 @@ public class WmsHqlPack { * @param wmsZones * @return */ - public static String packHqlWmsZones(WmsZones wmsZones) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsZones(WmsZones wmsZones) { + DdlPackBean result = new DdlPackBean(); //仓库代码 - HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); getStringBuilderPack(wmsZones, result); - return result.toString(); + return result; } /** @@ -439,12 +439,12 @@ public class WmsHqlPack { * @param wmsLocate * @return */ - public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsLocatesByType(WmsLocate wmsLocate) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); getStringBuilderPack(wmsLocate, result); - return result.toString(); + return result; } /** @@ -453,17 +453,17 @@ public class WmsHqlPack { * @param wmsLocatePart * @return */ - public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsLocatePart, result); - return result.toString(); + return result; } /** @@ -472,17 +472,17 @@ public class WmsHqlPack { * @param basVendor * @return */ - public static String packHqlBasVendorUnique(BasVendor basVendor) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result); - HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); - HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); + DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); getStringBuilderPack(basVendor, result); - return result.toString(); + return result; } public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { @@ -534,19 +534,19 @@ public class WmsHqlPack { * @param basCustomer * @return */ - public static String packHqlBasCustomer(BasCustomer basCustomer) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasCustomer(BasCustomer basCustomer) { + DdlPackBean result = new DdlPackBean(); //客户编号 - HqlPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); //客户简称 - HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); + DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 - HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); + DdlPreparedPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); getStringBuilderPack(basCustomer, result); - return result.toString(); + return result; } /** @@ -555,19 +555,19 @@ public class WmsHqlPack { * @param wmsShippingFlag * @return */ - public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { + DdlPackBean result = new DdlPackBean(); //供应商编号 - HqlPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); + DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); + DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); + DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); getStringBuilderPack(wmsShippingFlag, result); - return result.toString(); + return result; } /** @@ -576,20 +576,20 @@ public class WmsHqlPack { * @param wmsASNMaster * @return */ - public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); - HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); - HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); - HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); + DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); + DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); getStringBuilderPack(wmsASNMaster, result); - return result.toString(); + return result; } /** @@ -625,49 +625,49 @@ public class WmsHqlPack { * @param wmsCheckFactRecord * @return */ - public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { + DdlPackBean result =new DdlPackBean(); //采购单号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); //ASN单号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); //条码 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result); //物料编码 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); getStringBuilderPack(wmsCheckFactRecord, result); - return result.toString(); + return result; } - public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); + public static DdlPackBean packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { + DdlPackBean result =new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result); + DdlPreparedPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); getStringBuilderPack(wmsASNMasterDetails, result); - return result.toString(); + return result; } /** @@ -676,29 +676,29 @@ public class WmsHqlPack { * @param wmsFGInStock * @return */ - public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(), "qty", result); - HqlPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result); - HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); - HqlPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result); - HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); - HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); - HqlPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getNumEqualPack(wmsFGInStock.getQty(), "qty", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result); + DdlPreparedPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); getStringBuilderPack(wmsFGInStock, result); - return result.toString(); + return result; } /** @@ -707,19 +707,19 @@ public class WmsHqlPack { * @param wmsTaskInfo * @return */ - public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); - HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); + DdlPreparedPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); getStringBuilderPack(wmsTaskInfo, result); - return result.toString(); + return result; } /** @@ -751,15 +751,15 @@ public class WmsHqlPack { * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); getStringBuilderPack(wmsCSLocate, result); - return result.toString(); + return result; } /** @@ -768,17 +768,17 @@ public class WmsHqlPack { * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSPart(WmsCSPart wmsCSPart) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); - HqlPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result); + DdlPreparedPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); - return result.toString(); + return result; } /** @@ -787,15 +787,15 @@ public class WmsHqlPack { * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSZone(WmsCSZone wmsCSZone) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); getStringBuilderPack(wmsCSZone, result); - return result.toString(); + return result; } /** @@ -951,16 +951,16 @@ public class WmsHqlPack { * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsMoveMaster, result); - return result.toString(); + return result; } /** @@ -1023,6 +1023,8 @@ public class WmsHqlPack { 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); getStringBuilderPack(wmsMoveSn, result); return result.toString(); @@ -1154,18 +1156,18 @@ public class WmsHqlPack { * @param wmsCSOrderMaster * @return */ - public static String packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); getStringBuilderPack(wmsCSOrderMaster, result); - return result.toString(); + return result; } /** @@ -1174,15 +1176,15 @@ public class WmsHqlPack { * @param wmsCSOrderDetails * @return */ - public static String packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsCSOrderDetails, result); - return result.toString(); + return result; } /** @@ -1191,16 +1193,16 @@ public class WmsHqlPack { * @param wmsCSFactTrans * @return */ - public static String packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsCSFactTrans, result); - return result.toString(); + return result; } /** @@ -1353,17 +1355,17 @@ public class WmsHqlPack { * @param wmsPoSn * @return */ - public static String packHqlWmsPoSn(WmsPoSn wmsPoSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPoSn(WmsPoSn wmsPoSn) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsPoSn, result); - return result.toString(); + return result; } /** @@ -1668,17 +1670,17 @@ public class WmsHqlPack { * @param wmsCSOrderMaster * @return */ - public static String packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", + DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsCSOrderMaster, result); - return result.toString(); + return result; } }