Merge branch 'dev' into test

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

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