From 3ba1c8ee626c752b6f7dc308a3aba5055358bd82 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Wed, 22 Jul 2020 12:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java   | 8 ++++++--
 .../java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java   | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

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 ef26467..1dfbeb4 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
@@ -20,7 +20,8 @@ public class MesPcnEnumUtil {
         MONITOR_MODULE(10, "监听组件"),
         REVEAL_MODULE(20, "展示组件"),
         BUTTON_MODULE(30, "按钮组件"),
-        TIMING_MODULE(40, "定时组件");
+        TIMING_MODULE(40, "定时组件"),
+        PCS_BACK_MODULE(50, "工序后台组件");
 
         private int value;
         private String description;
@@ -2921,7 +2922,9 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_CELL_MONITOR_TYPE {
         MONITOR(10, "监听组件"),
-        SHOW(20, "展示组件");
+        SHOW(20, "展示组件"),
+        BUTTON(30, "按钮组件"),
+        PROCESS_MONITOR(40, "工序监听组件");
 
         private int value;
         private String description;
@@ -4492,4 +4495,5 @@ public class MesPcnEnumUtil {
         }
 
     }
+
 }
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 f1b6153..8ebfcbe 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
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -147,6 +148,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工位剩余时间")
     private Long remainWorkTime;
 
+    @ApiParam("停机类型")
+    private MesPcnEnumUtil.STOP_MACHINE_TYPE stopMachineType;
+
     @ApiParam("提醒时间点")
     private Integer remindTime;