From 716f0ac1f9c0d1c87fa070eb61ae99fb9891597d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Tue, 7 Jul 2020 21:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=BB=93=E6=9E=84=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=92=8C=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=A1=BA=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 45 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java   |  8 ++++
 2 files changed, 53 insertions(+)

diff --git 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
index 4eaace4..c4605d7 100644
--- 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
@@ -991,6 +991,51 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * Mes  对象结构是否展示
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OBJECT_CFG_IS_SHOW {
+
+        SHOW(1, "是"),
+        NO_SHOW(2, "否");
+
+        private int value;
+        private String description;
+
+        OBJECT_CFG_IS_SHOW(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;
+        }
+    }
 
     /**
      * Mes  客户订单来源
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
index 9f25f06..a63724c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
@@ -58,6 +58,14 @@ public class MesObjectCfg extends BaseBean implements Serializable {
     @ApiParam("是否保存 1存 2不存")
     private Integer isSave;
 
+    @Column(name = "SHOW_SEQ")
+    @ApiParam("显示顺序")
+    private Integer showSeq;
+
+    @Column(name = "IS_SHOW")
+    @ApiParam("是否显示")
+    private Integer isShow;
+
     @Transient
     @ApiParam("是否存储名")
     private String isSaveName;