diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java index d49fe8c..06be67c 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java @@ -99,6 +99,11 @@ public class MesOqcRuleNoteDetail extends BaseBean implements Serializable { @AnnoOutputColumn(refClass = MesPcnExtEnumUtil.OQC_CHECK_TYPE.class, refForeignKey = "value", value = "description", hidden = true) private Integer oqcNoType; + @Column(name = "DEFECT_VALUE") + @ApiParam("欠点值") + @AnnoOutputColumn(refClass = MesPcnExtEnumUtil.OQC_DEFECT_TYPE.class, refForeignKey = "value", value = "description", hidden = true) + private Integer defectValue; + @Column(name = "MODIFY_REMARK") @ApiParam("修改备注") private String modifyRemark; diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java index e0992b9..75f31d0 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java @@ -4098,4 +4098,51 @@ public class MesPcnExtEnumUtil { return descOf(desc); } } + + /** + * 欠点值 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OQC_DEFECT_TYPE { + + MILD(10, "轻"), + MODERATE(20, "中"), + SERIOUS(30, "重"); + + private int value; + private String description; + + OQC_DEFECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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 Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } }