From db8e8696742492106005dab238d2a4a000a3553a Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 14 Nov 2018 10:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 112 ++++++++++++--------- 1 file changed, 62 insertions(+), 50 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 e151350..f7e9fbd 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,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; @@ -47,6 +48,7 @@ public class WmsHqlPack { return result.toString(); } + /** * 库存移动单查询封装 * @@ -58,7 +60,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getStringEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result); HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result); HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true); @@ -66,6 +68,7 @@ public class WmsHqlPack { return result.toString(); } + /** * PO订单主表信息 分页查询 * @@ -151,6 +154,7 @@ public class WmsHqlPack { */ public static String packHqlWmsPart(WmsPart wmsPart) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); @@ -159,6 +163,10 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); + + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + "isDeleted", result); + return result.toString(); } @@ -327,7 +335,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -351,7 +359,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } HqlPack.getNumEqualPack(basVendor.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -365,13 +373,13 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); - if(wmsOpType.getSeq()!= null){ + if (wmsOpType.getSeq() != null) { HqlPack.getStringLikerPack(wmsOpType.getSeq().toString(), "seq", result); } HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -386,7 +394,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -404,7 +412,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -412,7 +420,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } @@ -475,22 +483,23 @@ public class WmsHqlPack { /** * ASN订单分页查询条件 + * * @param wmsASNMaster * @return */ - public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster){ + public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result); - HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(),"type",result); - HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(),"status",result); - HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result); - HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result); - HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result); - HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result); + HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "type", result); + HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result); + HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(), "vendorNo", result); + HqlPack.getStringLikerPack(wmsASNMaster.getVersion(), "version", result); + HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); + HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(), "poNo", result); //有效性 HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -541,17 +550,18 @@ public class WmsHqlPack { /** * 明细表唯一性查询 + * * @return */ - public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails){ + public static String packHqlwmsASNMasterDetailsUnique(WmsASNMasterDetails wmsASNMasterDetails) { StringBuffer result = new StringBuffer(); //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } - public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails){ + public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsASNMasterDetails.getItem(), "item", result); @@ -574,52 +584,54 @@ public class WmsHqlPack { //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(), "isDeleted", result); return result.toString(); } /** * 产品入库信息 条件封装 + * * @param wmsFGInStock * @return */ - public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock){ - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(),"orderNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(),"woNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(),"partNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(),"partNameRdd",result); - HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(),"qty",result); - HqlPack.getStringLikerPack(wmsFGInStock.getUnit(),"unit",result); - HqlPack.getStringLikerPack(wmsFGInStock.getSn(),"sn",result); - HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(),"orderStatus",result); - HqlPack.getStringLikerPack(wmsFGInStock.getReMark(),"reMark",result); - HqlPack.getStringLikerPack(wmsFGInStock.getSrc(),"src",result); - HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(),"erpWhno",result); - HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(),"lineNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(),"whNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(),"custNo",result); - HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(),"shippingFlag",result); - HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(),"mfgLogNo",result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(),"isValid",result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(),"isDeleted",result); + public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(), "woNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); + HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(), "qty", result); + HqlPack.getStringLikerPack(wmsFGInStock.getUnit(), "unit", result); + HqlPack.getStringLikerPack(wmsFGInStock.getSn(), "sn", result); + HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); + HqlPack.getStringLikerPack(wmsFGInStock.getReMark(), "reMark", result); + HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); + HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(), "erpWhno", result); + HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(), "lineNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(), "whNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); + HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); + HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(), "isDeleted", result); return result.toString(); } /** * 作业任务信息条件封装 + * * @param wmsTaskInfo * @return */ - public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo){ - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(),"moveNo",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); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(),"isValid",result); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(),"isDeleted",result); + public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", 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); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(), "isDeleted", result); return result.toString(); } }