字段修改

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

@@ -213,4 +213,124 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * ASN单据类型
+     */
+    public enum ASN_ORDER_TYPE{
+
+        REG("REG","原物料采购"),SUB("SUB","委外采购"),TAR("TAR","多角贸易采购"),TAP("TAP","多角代采购");
+
+        private String value;
+        private String description;
+
+        ASN_ORDER_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * ASN明细表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ASN_MASTER_ORDER_STATUS {
+        NORMAL(1, "N", "正常"),
+        CANCEL(2, "C", "行取消"),
+        RECEIPTED(3, "R", "已收货");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ASN_MASTER_ORDER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 是否已删除
+     */
+    public enum IS_DELETED {
+        DELETED(1, "已删除"), INDELETED(2, "未删除");
+
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        IS_DELETED(int value, String description) {
+            this.value = value;
+            this.description = 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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java

@@ -36,17 +36,17 @@ public class WmsASNMaster extends BaseBean {
      * 单据类型:REG=原物料采购,
      * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购
      */
-    @Column(name="TYPE")
+    @Column(name="ASN_TYPE")
     @ApiParam("单据类型")
-    public String type;
+    public String asnType;
 
     /**
      * 状态:0=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
+    @Column(name="ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    public Integer asnStatus;
 
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")

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

@@ -67,13 +67,13 @@ public class WmsASNMasterDetails extends BaseBean {
     /**
      * 状态:N=正常,C=行取消,R=已收货
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
-    public Integer status;
+    public Integer itemStatus;
 
     @Column(name="PACKAGE")
     @ApiParam("包装名称")
-    public String pageAge;
+    public String packAge;
 
     /**
      * 是否免费:0=计费,1=免费