Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test

5 years ago · 3ff25cc91a
parent 1ab0225f9c 46c22020bd
commit 3ff25cc91a
2 changed files with 4 additions and 0 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -815,6 +815,8 @@ public class MesEnumUtil {
    public enum MES_TYPE_CFG {

        DEFECT("DEFECT", "缺陷"),
+        POLISHING("POLISHING", "抛光"),
+        DISASSEMBLE("DISASSEMBLE", "拆解"),
        DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
        REPAIR("REPAIR", "处理措施"),
        SCRAP("SCRAP", "报废原因"),
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@ -445,6 +445,8 @@ public class MesPcnEnumUtil {
    public enum MES_TYPE_CFG {

        DEFECT("DEFECT", "缺陷"),
+        POLISHING("POLISHING", "抛光"),
+        DISASSEMBLE("DISASSEMBLE", "拆解"),
        DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
        REPAIR("REPAIR", "处理措施"),
        SCRAP("SCRAP", "报废原因"),