Task1858:电枪枪头更换计数

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;

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;
     }

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;
 }