Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -885,15 +885,15 @@ public class MesEnumUtil {
      * pcn 是否是关键件
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_IS_KEY {
+    public enum MES_IS_BIND_KEY {
 
-        IS_KEY(10, "是"),
-        NO_KEY(20, "否");
+        IS_BIND_KEY(1, "是"),
+        NO_BIND_KEY(2, "否");
 
         private int value;
         private String description;
 
-        MES_IS_KEY(int value, String description) {
+        MES_IS_BIND_KEY(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -907,8 +907,8 @@ public class MesEnumUtil {
         }
 
         // 根据value返回枚举类型,主要在switch中使用
-        public static MES_IS_KEY getByValue(int value) {
-            for (MES_IS_KEY mesInsertExcel : values()) {
+        public static MES_IS_BIND_KEY getByValue(int value) {
+            for (MES_IS_BIND_KEY mesInsertExcel : values()) {
                 if (mesInsertExcel.getValue() == value) {
                     return mesInsertExcel;
                 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java

@@ -83,10 +83,6 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否绑定关键件")
     private Integer isBindKey;
 
-    @Column(name = "IS_KEY")
-    @ApiParam(value = "是否关键件")
-    private Integer isKey;
-
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java

@@ -85,9 +85,9 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "结果")
     private String result;
 
-    @Column(name = "IS_KEY")
-    @ApiParam(value = "是否关键件")
-    private Integer isKey;
+    @Column(name = "is_BIND_KEY")
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
 
     @Column(name = "ACTION_TYPE")
     @ApiParam(value = "动作类型")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :设备维修作业记录
@@ -65,4 +66,24 @@ public class MesEquTaskRepairRecord extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("故障现象")
+    private String fpName;
+
+    @Transient
+    @ApiParam("故障原因")
+    private String fcName;
+
+    @Transient
+    @ApiParam("处理方法")
+    private String fmName;
+
+    @Transient
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+    @Transient
+    @ApiParam("整体结果")
+    private String finalResultName;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java

@@ -74,4 +74,16 @@ public class MesEquTaskStandardRecord extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Transient
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+    @Transient
+    @ApiParam("整体结果")
+    private String finalResultName;
+
+    @Transient
+    @ApiParam("判定结果")
+    private String checkResultName;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java

@@ -87,10 +87,6 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否绑定关键件")
     private Integer isBindKey;
 
-    @Column(name = "IS_KEY")
-    @ApiParam(value = "是否关键件")
-    private Integer isKey;
-
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java

@@ -86,9 +86,9 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "结果")
     private String result;
 
-    @Column(name = "IS_KEY")
-    @ApiParam(value = "是否关键件")
-    private String isKey;
+    @Column(name = "is_BIND_KEY")
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
 
     @Column(name = "ACTION_TYPE")
     @ApiParam(value = "动作类型")