From c2a5a17379080cca7b9d5fceacc73dd06e98d9af 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: Thu, 28 May 2020 15:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E6=AD=A5=E5=BC=B9=E6=A1=86=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=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/MesPcnEnumUtil.java  | 38 +++++++++++++++++++++-
 .../i3plus/pojo/mes/model/StationRequestBean.java  |  3 ++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git 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
index 204d4ce..bbfc0e5 100644
--- 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
@@ -2552,7 +2552,8 @@ public class MesPcnEnumUtil {
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
         CUSTOM("custom", "定制页面"),
-        FORM("form", "文本按钮");
+        FORM("form", "文本按钮"),
+        SPEC_TEXT("spec_text", "工步弹框文本");
 
         private String value;
         private String description;
@@ -3790,4 +3791,39 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 界面类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WINDOW_TYPE {
+        BUTTON_CFG(10, "按钮组件"),
+        BOARD_BASE_WINDOW(20, "看板基础页面"),
+        STEP_WINDOW(30, "工步界面");
+
+        private int value;
+        private String description;
+
+        WINDOW_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;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
index 78826ad..b7260b1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
@@ -132,6 +132,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("客户工厂代码")
     private String customerFactoryCode;
 
+    @ApiParam("工步弹框参数")
+    private String stepDialogParam;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +