Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

6 years ago · e0ec7bb377
parent 50bf9300ba 828cf66784
commit e0ec7bb377
9 changed files with 93 additions and 26 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/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;
                }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -800,7 +800,8 @@ public class WmsEnumUtil {
        VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"),
        VDA_NC_FREEZE("VDA_NC_FREEZE", "VDA_NC冻结"),
        VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
-        VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻");
+        VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
+        VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错");

        private String value;
        private String description;
@ -3562,7 +3563,8 @@ public class WmsEnumUtil {
    public enum PART_ASSOCIATE_TYPE {
        LINE(10, "LINE", "产线"),
        CUSTOMER(20, "CUSTOMER", "客户"),
-        VENDOR(30, "VENDOR", "供应商");
+        VENDOR(30, "VENDOR", "供应商"),
+        BOXING_ERROR_PROOFING(40, "BOXING_ERROR_PROOFING","装箱防错");

        private int value;
        private String code;
@ -3873,4 +3875,44 @@ public class WmsEnumUtil {
            return tmp;
        }
    }
+
+    /**
+     * 防错类型：
+     * 10=零件装箱防错，20=条码装箱防错，30=BMW标签防错，40=BMW零件防错，50=BMW发运防错，60=单件发运防错
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_BOXING_ERROR_PROOFING_TYPE {
+        PART_NO(10, "零件装箱防错"),
+        SN(20, "条码装箱防错"),
+        BMW_TAG(30, "BMW标签防错"),
+        BMW_PART(40, "BMW零件防错"),
+        BMW_DISPATCH(50, "BMW发运防错"),
+        SINGLE_DISPATCH(60, "单件发运防错");
+
+        private int value;
+        private String description;
+
+        PART_BOXING_ERROR_PROOFING_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
+++ b/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;
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
+++ b/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 = "动作类型")
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java
@ -44,10 +44,6 @@ public class MesProduceCtgyPicture extends BaseBean {
    @ApiParam("图片名称")
    private String pictureName;

-    @Column(name = "FILE_ORIGIN_NAME")
-    @ApiParam("FILE_ORIGIN_NAME")
-    private String fileOriginName;
-
    @Column(name = "FILE_SIZE")
    @ApiParam("FILE_SIZE")
    private String fileSize;
@ -55,4 +51,8 @@ public class MesProduceCtgyPicture extends BaseBean {
    @Column(name = "FILE_TYPE_ID")
    @ApiParam("FILE_TYPE_ID")
    private String fileTypeId;
+
+    @Column(name = "FILE_TYPE_NAME")
+    @ApiParam("FILE_TYPE_NAME")
+    private String fileTypeName;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java
+++ b/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;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java
+++ b/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;
+
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
+++ b/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;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/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 = "动作类型")