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 c1670af..5cded9b 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 @@ -348,4 +348,93 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 产品入库的产品状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_INSTOCK_STATUS { + CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错"); + + private int value; + private String description; + + PRODUCT_INSTOCK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 库位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_TYPE { + COLLECT_LOCATE(10, "I", "收货库"), + BASICS_LOCATE(20, "P", "基础库"), + maneuver_LOCATE(30, "R", "机动库"), + COMBINATION_LOCATE(40, "D", "组合库"), + LINE_LOCATE(50, "L", "线边库"), + NC_LOCATE(60, "N", "NC库"); + + private int value; + private String code; + private String description; + + LOCATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } 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 7d57076..6e63f84 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 @@ -190,6 +190,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true); + HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result); @@ -229,7 +231,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); - HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result); + HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); @@ -485,10 +487,7 @@ public class WmsHqlPack { //客户全称 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); + getStringBuilderPack(basCustomer, result); return result.toString(); } @@ -501,15 +500,14 @@ 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); //供应商简称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); + getStringBuilderPack(wmsShippingFlag, result); + return result.toString(); } @@ -524,7 +522,9 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "type", result); - HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result); + if (wmsASNMaster.getAsnStatus() != null) { + 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); @@ -533,6 +533,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); +// getStringBuilderPack(wmsASNMaster,result); return result.toString(); } @@ -653,8 +654,8 @@ public class WmsHqlPack { 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); + getStringBuilderPack(wmsFGInStock, result); + return result.toString(); } @@ -666,13 +667,14 @@ public class WmsHqlPack { */ 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); + getStringBuilderPack(wmsTaskInfo, result); + return result.toString(); } }