From 08b03c9eb8ffcbf79ef08b8cadc4a5f954726787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= <sliter.yuan@estsh.com>
Date: Wed, 20 May 2020 09:32:11 +0800
Subject: [PATCH] =?UTF-8?q?Task1858:=E7=94=B5=E6=9E=AA=E6=9E=AA=E5=A4=B4?=
 =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java   |  4 +++-
 .../cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java   | 12 ++++++++++++
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java  | 11 ++++++++++-
 3 files changed, 25 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 498cdfb..71cc67b 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
@@ -2544,10 +2544,11 @@ public class MesPcnEnumUtil {
         TABLE("table", "表格"),
         TEXT("text", "正常文本"),
         EXP_TEXT("exp_text", "异常文本"),
-        FILE("file", "定制内容文件"),
+        FILE("file", "打印模板文件"),
         IMAGE("image", "图片"),
         BUTTON("button", "按钮"),
         TABLES("tables", "多个表格"),
+        CUSTOM("custom", "定制页面"),
         FORM("form", "文本按钮");
 
         private String value;
@@ -3246,6 +3247,7 @@ public class MesPcnEnumUtil {
     public enum TABLE_COLOR {
 
         GREEN("green", "绿色"),
+        RED("red", "红色"),
         YELLOW("Yellow", "黄色");
 
         private String code;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java
index 9353299..23cb9bf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java
@@ -63,10 +63,22 @@ public class MesEquipmentTooling extends BaseBean implements Serializable {
     @ApiParam("更换结束时间")
     private String endTime;
 
+    @Column(name = "REMIND_COUNT")
+    @ApiParam("提醒次数")
+    private Integer remindCount;
+
     @Transient
     @ApiParam("最大次数")
     private Integer useCountMax;
 
+    @Transient
+    @ApiParam("按钮名称")
+    private String btnName;
+
+    @Transient
+    @ApiParam("按钮颜色")
+    private String btnColor;
+
     public Integer getToolingType() {
         return this.toolingType == null ? 0 : this.toolingType;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java
index cf099ca..e436ea3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -30,7 +31,7 @@ import java.io.Serializable;
 public class MesTooling extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5033127912658757665L;
 
-    @Column(name = "TOOLING_CODE ")
+    @Column(name = "TOOLING_CODE")
     @ApiParam("工装代码")
     private String toolingCode ;
 
@@ -49,4 +50,12 @@ public class MesTooling extends BaseBean implements Serializable {
     @Column(name = "USE_TIME_MAX")
     @ApiParam("最大使用时间")
     private String useTimeMax;
+
+    @Column(name = "REMIND_COUNT")
+    @ApiParam("提醒次数")
+    private Integer remindCount;
+
+    @Transient
+    @ApiParam("使用次数")
+    private Integer useCount;
 }