diff --git 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
index a0618cf..bf70c6d 100644
--- 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
@@ -300,6 +300,62 @@ public class WmsEnumUtil {
         }
     }
 
+
+    /**
+     * 单据主表状态(ASN,PO,MOVE,QC,SO)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PICKING_MASTER_ORDER_STATUS {
+        CREATE(10, "CREATE", "新建"),
+        RECEIPT(20, "RECEIPT", "已生成"),
+        FAILED(30, "RECEIPT_FINISH", "生成失败");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PICKING_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 getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        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 static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
     /**
      * 收货状态
      */
@@ -8795,4 +8851,80 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+
+    /**
+     * BOM
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BOM_PRODUCTING_LINE {
+        GJ(10, "PIPE", "管件"),
+        JF(20, "JF", "夹方"),
+        JH(30, "JH", "机焊"),
+        SH(40, "SH", "手焊");
+
+        private String code;
+        private String description;
+        int value;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        BOM_PRODUCTING_LINE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        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 static BOM_PRODUCTING_LINE codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 74c110f..85cb2b8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -179,6 +179,11 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("目的库存地代码")
     public String destAreaNo;
 
+
+    @Column(name = "DEST_XB_ZONE_NO")
+    @ApiParam("目的线边存储区代码")
+    public String destXBZoneNo;
+
     @Column(name = "LOT_NO")
     @ApiParam("批次")
     public String lotNo;
@@ -231,6 +236,7 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "父位置号")
     private String seqNo;
 
+
     @Transient
     @ApiParam(value = "客户编号")
     private String custNo;
@@ -385,7 +391,7 @@ public class WmsDocMovementDetails extends BaseBean {
     public String refSrc;
 
     @Transient
-    @ApiParam("工作中心代码")
+    @ApiParam("产线代码")
     private String workCenterCode;
 
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index f20b634..07812e0 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -46,7 +46,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @Column(name = "ORDER_NO")
     @ApiParam(value = "移库单单号")
     private String orderNo;
-    /**
+    /**e
      * 移动类型:IN=入库,OUT=出库,MOVE=移库
      */
     @Column(name = "MOVE_TYPE")
@@ -231,6 +231,15 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "备注1")
     private String remake;
 
+
+    /**
+     * 10=未生成，20=生成成功，30=生成失败
+     */
+    @Column(name = "PICKING_ORDER_STATUS", columnDefinition = "int default 10")
+    @ApiParam(value = "领料单生成状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer pickingOrderStatus;
+
     @Column(name = "SECONDARY_REMAKE")
     @ApiParam(value = "备注2")
     private String secondaryRemake;