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 2867507..ce8d025 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 @@ -1911,6 +1911,84 @@ public class WmsEnumUtil { } /** + * PO 单据质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_QC_STATUS { + INQUALITY(10, "INQUALITY", "质检中"), + NORMAL(20, "NORMAL", "合格"), + ABNORMAL(30, "ABNORMAL", "不合格"); + private int value; + private String code; + private String description; + + private PO_QC_STATUS(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 String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static PO_QC_STATUS codeOfs(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + + 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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** * 质检业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) 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 020e7e3..9003e5f 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 @@ -56,11 +56,20 @@ public class WmsQCMaster extends BaseBean { * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消 */ @Column(name = "ORDER_STATUS") - @ApiParam(value = "状态", example = "1") + @ApiParam(value = "单据状态", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_STATUS") public Integer orderStatus; + /** + * 状态:10=质检中,20=合格,30=不合格 + */ + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PO_QC_STATUS") + public Integer qcStatus; + @Column(name = "REMARK") @ApiParam("备注") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)