From ba558d640ea6e3c10e8ecac19ef24b6d6bd45cf6 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Wed, 12 Aug 2020 15:50:00 +0800
Subject: [PATCH] tmp

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java     | 19 +++++++++++++++++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java    |  2 +-
 2 files changed, 20 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 1d26919..3b86867 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
@@ -4673,6 +4673,25 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_BUSI_TYPE {
+        AGV_EMERGENCY_STOP(10, "紧急停止"),
+        AGV_EMERGENCY_RESET(20, "急停复位"),
+        AGV_DELAY_HELP(30, "延时帮助");
+
+        private int value;
+        private String description;
+
+        PLC_BUSI_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+    }
+
     /**
      * mes设备状态
      */
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
index d43d5af..43c3535 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@@ -88,7 +88,7 @@ public class MesPlc extends BaseBean implements Serializable {
 
     @Column(name = "BUSI_TYPE")
     @ApiParam("业务类型")
-    private String busiType;
+    private Integer busiType;
 
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")