1、38151 23032—PC端【工单自动发布物料】导入功能，导入后，未存导入物料数据

2、38132 23032—PC端【出货检验项目】界面增加字段“欠点值”，位于“判定基准”之后，新增，编辑，导入都需增加相应字段

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;

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