条码枚举

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

@@ -1913,6 +1913,35 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 通用条码枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMMON_SN {
+        PO_SN("PO_SN", "PO条码");
+
+        private String code;
+        private String description;
+        int value;
+
+        COMMON_SN(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
      * 可选项类型枚举
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -2191,4 +2220,37 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 包装类型枚举
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PACKAGE_TYPE {
+        BOX(10 , "BOX", "BOX（盒）"),
+        CARTON(20 , "CARTON", "CARTON（箱）"),
+        PALLET(30 , "PALLET", "PALLET（栈板）"),
+        CONTAINER(40 , "PALLET", "PALLET（集装箱）");
+
+        private String code;
+        private String description;
+        int value;
+
+        PACKAGE_TYPE(int value , String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java

@@ -46,7 +46,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="PASS_QTY")
     @ApiParam("合格数量")