From 3223158529009e0317b72bbd5f7844d047fae6b7 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Wed, 29 Jul 2020 17:25:18 +0800
Subject: [PATCH] Fix Bug #10108

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 49 +++++++++++++++++++++-
 .../i3plus/pojo/mes/bean/MesBoardPlanCapacity.java | 24 +++++++++++
 2 files changed, 72 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 f4bba13..1457811 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
@@ -5165,7 +5165,8 @@ public class MesEnumUtil {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
         BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
-        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板");
+        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
+        BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板");
 
         private String code;
         private String description;
@@ -6786,4 +6787,50 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工作中心 工位监控模式  10=工单作业，20=标准作业
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_MONITOR_TYPE {
+
+        ORDER_WORK(10, "工单作业"),
+        STANDARD_WORK(20, "标准作业");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_MONITOR_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;
+        }
+
+        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;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java
index 842f52f..3af83ef 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java
@@ -56,6 +56,30 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
     @ApiParam("计划产量")
     private Integer planCapacity;
 
+    @Column(name = "MONTH_PLAN_CAPACITY")
+    @ApiParam("月计划产量")
+    private Integer monthPlanCapacity;
+
+    @Column(name = "HOUR_CAPACITY")
+    @ApiParam("时段产能")
+    private Integer hourCapacity;
+
+    @Column(name = "STOP_TIME")
+    @ApiParam("停机时间")
+    private Integer stopTime;
+
+    @Column(name = "ACTUAL_CAPACITY")
+    @ApiParam("今日产量")
+    private Integer actualCapacity;
+
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("计划节拍")
+    private Integer planTakt;
+
+    @Column(name = "IS_MANUAL")
+    @ApiParam("是否手工展示")
+    private Integer isManual;
+
     @Transient
     @ApiParam("班次名称")
     private String shiftName;