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 0d49de6..64be3f6 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 @@ -963,4 +963,112 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 质检业务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_INFO_TYPE { + FEED(1, "进料检验"), ONLINE(10, "在线检验"), EMDPRODUCT(30, "成品检验,"), SHIPMENTS(40, "出货检验,"); + + private int value; + private String description; + + QC_INFO_TYPE(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 QC_INFO_STATUS { + CREATE(1, "新建"), + FINISH(5, "待处理"), + FAIL(10, "已完成,"), + CLOSE(90, "已关闭,"), + CANCEL(91, "已取消,"); + + private int value; + private String description; + + QC_INFO_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 QC_ITEM_STATUS { + NORMAL(1, "正常"), + CANCELLATION(10, "行取消"); + + private int value; + private String description; + + QC_ITEM_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; + } + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 3d250b5..b986ff5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -37,8 +37,8 @@ public class WmsQCMaster extends BaseBean { * FQC=成品检验,OQC=出货检验 */ @Column(name="ORDER_TYPE") - @ApiParam("业务类型") - public String orderType; + @ApiParam(value = "业务类型", example = "0") + public Integer orderType; /** * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消 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 bb276e4..ae6a500 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 @@ -889,7 +889,7 @@ public class WmsHqlPack { //单号 HqlPack.getStringLikerPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 - HqlPack.getStringEqualPack(wmsQCMaster.getOrderType(), "orderType", result); + HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); //采购单号 HqlPack.getStringLikerPack(wmsQCMaster.getPoNo(), "poNo", result); //ASN单号