diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index db2f24e..30f9b61 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -291,7 +291,7 @@ public class WmsEnumUtil { public enum QUEUE_NAME{ SUCCESS_QUEUE(1,"success_queue","成功消息队列"), - FAIL_QUEUE(1,"fail_queue","成功消息队列"); + FAIL_QUEUE(2,"fail_queue","成功消息队列"); private int value; private String name; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 2c27950..00ed6cd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -48,6 +48,13 @@ public class SysFile extends BaseBean { } } + @Column(name="DFS_GROUP_NAME") + @ApiParam(value ="FastDfs Group 名称(后台使用)") + private String dfsGroupName; + + @Column(name="DFS_FILE_NAME") + @ApiParam(value ="FastDfs 文件名称(后台使用)") + private String dfsFileName; @Column(name="FILE_PATH") @ApiParam(value ="文件路径") 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 909efab..6676ae7 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,9 +1,11 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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.*; +import org.apache.commons.lang3.StringUtils; /** * @Description : 仓库管理对象封装 @@ -13,6 +15,28 @@ import cn.estsh.i3plus.pojo.wms.bean.*; * @Modify: **/ public class WmsHqlPack { + + /** + * 封装公用查询参数 + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { + + if (hqlStr != null && hqlStr.toString().trim().length() > 0) { + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); + } else if (bean.getIsValid() > 0) { + hqlStr.append(" and model.isValid = " + bean.getIsValid()); + } + + hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + } + + return hqlStr.toString(); + } + /** * PO订单明细表 分页查询 * @@ -30,7 +54,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsDeleted(), "isDeleted", result); HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrganizeCode(), "organizeCode", result); return result.toString(); @@ -47,10 +71,13 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } + /** * 库存移动单查询封装 * @@ -62,14 +89,17 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(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); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); + HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } + /** * PO订单主表信息 分页查询 * @@ -85,52 +115,31 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); - HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); - HqlPack.getStringEqualPack(wmsPOMaster.getOrganizeCode(), "organizeCode", result); +// HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); +// HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result); - return result.toString(); - } + getStringBuilderPack(wmsPOMaster, result); - /** - * 物流路线明细查询条件封装 - * - * @param wmsRoutingDetail - * @return - */ - public static String packHqlWmsRoutingDetail(WmsRoutingDetail wmsRoutingDetail) { - StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingDetail.getRoutingCode(), "routingCode", result); - HqlPack.getStringLikerPack(wmsRoutingDetail.getOpStep(), "opStep", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getOkSeq(), "okSeq", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getNgSeq(), "ngSeq", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getSeq(), "seq", result); - HqlPack.getNumEqualPack(wmsRoutingDetail.getParentSeq(), "parentSeq", result); - HqlPack.timeBuilder(wmsRoutingDetail.getCreateDateTimeStart(), wmsRoutingDetail.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getNumEqualPack(wmsRoutingDetail.getIsValid(), "isValid", result); - HqlPack.getStringEqualPack(wmsRoutingDetail.getOrganizeCode(), "organizeCode", result); return result.toString(); } /** - * 物流路线分配查询条件封装 + * 物流路线子表查询条件封装 * - * @param wmsRoutingAssign + * @param routingCode * @return */ - public static String packHqlWmsRoutingAssign(WmsRoutingAssign wmsRoutingAssign) { + public static String packHqlWmsRoutingChildren(String routingCode) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsRoutingAssign.getWhNo(), "whNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getZoneNo(), "zoneNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getVendorNo(), "vendorNo", result); - HqlPack.getStringLikerPack(wmsRoutingAssign.getRoutingCode(), "routingCode", result); - HqlPack.timeBuilder(wmsRoutingAssign.getCreateDateTimeStart(), wmsRoutingAssign.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getStringEqualPack(wmsRoutingAssign.getOrganizeCode(), "organizeCode", result); + HqlPack.getStringLikerPack(routingCode, "routingCode", result); + + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } + /** * 物流路线主表查询条件封装 * @@ -141,10 +150,11 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingCode(), "routingCode", result); HqlPack.getStringLikerPack(wmsRoutingMaster.getRoutingName(), "routingName", result); - HqlPack.getNumEqualPack(wmsRoutingMaster.getSeq(), "seq", result); - HqlPack.timeBuilder(wmsRoutingMaster.getCreateDateTimeStart(), wmsRoutingMaster.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } @@ -156,14 +166,18 @@ public class WmsHqlPack { */ public static String packHqlWmsPart(WmsPart wmsPart) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsPart.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.timeBuilder(wmsPart.getCreateDateTimeStart(), wmsPart.getCreateDateTimeEnd(), "createDatetime", result, true); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); - HqlPack.getStringLikerPack(wmsPart.getAbc(), "abc", result); - HqlPack.getNumEqualPack(wmsPart.getIqc(), "iqc", result); - HqlPack.getStringLikerPack(wmsPart.getPartGroup(), "partGroup", result); + HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); + return result.toString(); } @@ -346,7 +360,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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -370,7 +384,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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -384,13 +398,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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -405,7 +419,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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -423,7 +437,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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -431,7 +445,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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -443,6 +457,7 @@ public class WmsHqlPack { */ public static String packHqlWmsZones(WmsZones wmsZones) { StringBuffer result = new StringBuffer(); + //有效性 HqlPack.getNumEqualPack(wmsZones.getIsValid(), "isValid", result); //仓库代码 @@ -451,6 +466,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + //删除标记 + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result.toString(); } @@ -462,14 +480,18 @@ public class WmsHqlPack { */ public static String packHqlBasCustomer(BasCustomer basCustomer) { StringBuffer result = new StringBuffer(); - //有效性 - HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); + //客户编号 HqlPack.getStringLikerPack(basCustomer.getCustNo(), "custNo", result); - //聯係人 - HqlPack.getStringLikerPack(basCustomer.getCustOwner(), "custOwner", result); - //電話號碼 - HqlPack.getStringLikerPack(basCustomer.getCustTel(), "custTel", result); + //客户简称 + HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); + //客户全称 + HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); + + HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } @@ -481,8 +503,10 @@ public class WmsHqlPack { */ public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); - //有效性 + + //有效性,删除标记 HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); //供应商编号 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 @@ -494,22 +518,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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -527,16 +552,20 @@ public class WmsHqlPack { //发运单号 HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); //客户编码 - HqlPack.getStringLikerPack(wmsShopping.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(wmsShopping.getCustNo(), "custNo", result); //条码 - HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result); + HqlPack.getStringLikerPack(wmsShopping.getSn(), "sn", result); //发运状态 - HqlPack.getStringEqualPack(wmsShopping.getOrderStatus().toString(), "orderStatus", result); + HqlPack.getNumEqualPack(wmsShopping.getOrderStatus(), "orderStatus", result); + //是否删除 + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + //工厂 + HqlPack.getStringEqualPack(wmsShopping.getOrganizeCode(),"organizeCode",result); return result.toString(); } /** - * 产品发运信息 查询条件封装 + * 抽点记录信息 查询条件封装 * * @param wmsCheckFactRecord * @return @@ -555,22 +584,27 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + //是否删除 + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result); + //工厂 + HqlPack.getStringEqualPack(wmsCheckFactRecord.getOrganizeCode(),"organizeCode",result); return result.toString(); } /** * 明细表唯一性查询 + * * @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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.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); @@ -593,52 +627,55 @@ public class WmsHqlPack { //有效性 HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "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(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } }