Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

4 years ago · b44e02cdf6
parent 54732f8fd1 2ae59954d7
commit b44e02cdf6
2 changed files with 4 additions and 2 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
@ -2775,7 +2775,8 @@ public class MesEnumUtil {
        FIRST_CHECK(10, "FIRST_CHECK", "首检"),
        ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
        END_CHECK(30, "END_CHECK", "末检"),
-        RC_CHECK(40, "RC_CHECK", "发货检验");
+        RC_CHECK(40, "RC_CHECK", "发货检验"),
+        OUTSOURCE_CHECK(50, "工序外协检");

        private int value;
        private String code;
--- 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
@ -1030,7 +1030,8 @@ public class MesPcnEnumUtil {
        FIRST_CHECK(10, "首检"),
        ON_SITE_CHECK(20, "巡检"),
        END_CHECK(30, "末检"),
-        RC_CHECK(40, "发货检验");
+        RC_CHECK(40, "发货检验"),
+        OUTSOURCE_CHECK(50, "工序外协检");

        private int value;
        private String description;