From 076c6c1b4fc7510ad59a8b11522b1dea9889d761 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, 21 Jul 2020 16:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E4=BA=8C=E5=90=88=E4=B8=80?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B3=E9=94=AE=E4=BB=B6=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96--=E7=9B=AE=E5=89=8D?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=20=E9=98=9F=E5=88=97=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E9=98=9F=E5=88=97=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=95=A3=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E8=A1=A8?=
 =?UTF-8?q?=E3=80=82=E5=8A=A0=E4=B8=8A=E6=9D=A1=E4=BB=B6=E3=80=90=E4=B8=80?=
 =?UTF-8?q?=E7=99=BE=E4=BD=8D=E6=9D=A1=E7=A0=81=E3=80=91,=E5=B9=B4?=
 =?UTF-8?q?=E5=BA=A6=E5=9E=8B=E7=9B=B8=E5=90=8C=EF=BC=8C=E8=BD=A6=E5=9E=8B?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=20=E5=86=85=E8=81=94=E6=9F=A5=E5=87=BA?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E5=85=B3=E9=94=AE=E4=BB=B6=E9=9B=B6?=
 =?UTF-8?q?=E4=BB=B6=E2=80=94=E2=80=94>=E6=9F=A5=E8=AF=A2=E8=BD=A6?=
 =?UTF-8?q?=E5=9E=8B=E6=95=A3=E4=BB=B6=E9=85=8D=E7=BD=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=9B=B6=E4=BB=B6=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9:=E4=BA=A7=E7=BA=BF=E6=B7=BB=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=8D=E7=9B=91=E6=8E=A7=E6=A8=A1=E5=BC=8F=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E7=A9=BA=E6=88=9610=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=BA20?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E6=9F=A5=E8=AF=A2=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=90=8E=E9=9D=A2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=B8=8D=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 46 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java  |  5 +++
 2 files changed, 51 insertions(+)

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..8d1abad 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
@@ -4492,4 +4492,50 @@ public class MesPcnEnumUtil {
         }
 
     }
+
+    /**
+     * 工作中心 工位监控模式  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/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
index c67110f..a80febf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java
@@ -66,6 +66,11 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("条码生成模式")
     private Integer generateType;
 
+    // 10=工单作业，20=标准作业
+    @Column(name = "MONITOR_TYPE")
+    @ApiParam("工位监控模式")
+    private Integer monitorType;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;