From 5fb7eecee078f3602c237e39f82393e1b29e2ddf Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Fri, 8 May 2020 20:36:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1752=20oee=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++-
 .../src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java      | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 ddb7f2e..156b353 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
@@ -5077,7 +5077,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_TYPE {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
-        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)");
+        BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
+        BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
 
         private String code;
         private String description;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java
index d1dd2da..a115e99 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquDetail;
 import cn.estsh.i3plus.pojo.mes.bean.MesBoardEquStatus;
 import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity;
+import cn.estsh.i3plus.pojo.mes.bean.MesOee;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -48,4 +49,7 @@ public class BoardModel {
 
     @ApiParam("看板设备明细")
     private List<MesBoardEquDetail> boardEquDetailList;
+
+    @ApiParam("oee")
+    private List<MesOee> oeeList;
 }