diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 30cb2cf..0bd8dae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -502,27 +502,4 @@ public class CommonEnumUtil { } } - /** - * 启用或禁用 - */ - public enum OPEN_CLOSE { - OPEN(1, "启用"), - CLOSE(2, "禁用"); - - private int value; - private String description; - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - OPEN_CLOSE(int value, String description) { - this.value = value; - this.description = description; - } - } } 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 a806b32..520759e 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 @@ -325,8 +325,8 @@ public class WmsHqlPack { public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); return result.toString(); } @@ -392,4 +392,25 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); return result.toString(); } + + /** + * ASN订单分页查询条件 + * @param wmsASNMaster + * @return + */ + public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsASNMaster.getType(),"type",result); + HqlPack.getStringLikerPack(wmsASNMaster.getStatus().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); + + return result.toString(); + } }