From 4fc0f9c12c9510adb0e37acf4d250e3a04b2583b Mon Sep 17 00:00:00 2001
From: yxw <xinwang.yi@estsh.com>
Date: Mon, 27 Nov 2023 17:16:51 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=8138151=2023032=E2=80=94PC=E7=AB=AF?=
 =?UTF-8?q?=E3=80=90=E5=B7=A5=E5=8D=95=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E3=80=91=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=90=8E=EF=BC=8C=E6=9C=AA=E5=AD=98?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=89=A9=E6=96=99=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2、38132 23032—PC端【出货检验项目】界面增加字段“欠点值”，位于“判定基准”之后，新增，编辑，导入都需增加相应字段
---
 .../mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java    |  5 +++
 .../ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java   | 47 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)

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;
+        }
+    }
 }