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 feecd2a..5f37e6a 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
@@ -10,16 +10,150 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class WmsEnumUtil {
+    /**
+     * PO订单明细信息 是否免费
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_FREE {
+        CHARGING(0, "计费"), GRATIS(1, "免费");
+
+        private int value;
+        private String description;
+
+        private IS_FREE(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;
+        }
+    }
 
     /**
+     * PO订单明细信息 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ORDER_DETAILS_STATUS {
+        NORMAL(10, "N", "正常"),
+        ANCEL(20, "C", "行取消");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private ORDER_DETAILS_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;
+        }
+    }
+
+    /**
+     * PO主表信息 单据来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PO_ORDER_SRC {
+        MNU(1, "MNU", "手工"),
+        ERP(2, "ERP", "ERP接口");
+
+        private int value;
+        private String code;
+        private String description;
+
+        private PO_ORDER_SRC(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;
+        }
+    }
+    /**
      * PO主表信息 单据类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PO_ORDER_TYPE {
         REG(1, "REG", "原物料采购"),
-        SUB(2, "SUB", "委外采购"),
-        TAR(3, "TAR", "多角贸易采购"),
-        TAP(4, "TAP", "多角代采购");
+        SUB(10, "SUB", "委外采购"),
+        TAR(20, "TAR", "多角贸易采购"),
+        TAP(30, "TAP", "多角代采购");
 
         private int value;
         private String code;
@@ -68,7 +202,7 @@ public class WmsEnumUtil {
      * PO主表信息 状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum PO_ORDER_STATUS {
+    public enum ORDER_STATUS {
         CREATE(0, "新建"),
         RECEIPT(10, "收货中"),
         RECEIPT_FINISH(20, "收货完成"),
@@ -80,7 +214,7 @@ public class WmsEnumUtil {
         private int value;
         private String description;
 
-        private PO_ORDER_STATUS(int value, String description) {
+        private ORDER_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -117,6 +251,7 @@ public class WmsEnumUtil {
     /**
      * 交易状态
      */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TRANS_STATUS {
         CREATE(1, "创建"), FINISH(2, "完成"),FAIL(3,"失败");
 
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
new file mode 100644
index 0000000..6680d2c
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -0,0 +1,119 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :移库单详情实体(用于转储类业务)
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-13 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
+@Api("移库单详情表")
+public class WmsDocMovementDetails extends BaseBean {
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "单号")
+    private String orderNo;
+
+    @Column(name = "ITEM")
+    @ApiParam(value = "行号", example = "1")
+    private Integer item;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "UNIT")
+    @ApiParam(value = "单位")
+    private String unit;
+
+    @Column(name = "SRC_WH")
+    @ApiParam(value = "发出库仓库")
+    private String srcWh;
+
+
+    @Column(name = "DEST_WH")
+    @ApiParam(value = "接收库仓库")
+    private String destWh;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "需求数量", example = "1")
+    private Double qty;
+
+    @Column(name = "PRINT_QTY")
+    @ApiParam(value = "条码打印数量", example = "1")
+    private Double printQty;
+
+    @Column(name = "FACT_QTY")
+    @ApiParam(value = "操作完成数量", example = "1")
+    private Double factQty;
+
+    @Column(name = "ZDATE")
+    @ApiParam(value = "计划日期")
+    private String zdate;
+
+    @Column(name = "ZTIME")
+    @ApiParam(value = "计划时间")
+    private String ztime;
+
+    @Column(name = "SRC_NO")
+    @ApiParam(value = "源单号")
+    private String srcNo;
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    private Integer itemStatus;
+
+    /**
+     * 是否免费:0=计费,1=免费
+     */
+    @Column(name = "IS_FREE")
+    @ApiParam(value = "是否免费", example = "1")
+    public Integer isFree;
+
+    @Column(name = "REMARK")
+    @ApiParam(value = "操作原因")
+    private String remark;
+
+    @Column(name = "PICK_QTY")
+    @ApiParam(value = "已配数量", example = "1")
+    private Double pickQty;
+
+    @Column(name = "OUT_QTY")
+    @ApiParam(value = "已提交数量", example = "1")
+    private Double outQty;
+
+    @Column(name = "INLINE_QTY")
+    @ApiParam(value = "已上线数量", example = "1")
+    private Double inlineQty;
+
+    @Column(name = "REJECT_QTY")
+    @ApiParam(value = "退料数量", example = "1")
+    private Double rejectQty;
+
+    @Column(name = "REJECT_POST_QTY")
+    @ApiParam(value = "退料提交数量", example = "1")
+    private Double rejectPostQty;
+}
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
new file mode 100644
index 0000000..1a3bc2a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -0,0 +1,102 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :移库单实体(用于转储类业务)
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2018-11-13 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_DOC_MOVEMENT_MASTER")
+@Api("移库单表")
+public class WmsDocMovementMaster extends BaseBean {
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "移库单单号")
+    private String orderNo;
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    public String moveType;
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name = "BUSI_TYPE")
+    @ApiParam(value = "业务类型", example = "1")
+    public Integer busiType;
+
+    /**
+     * 状态:0=新建,10=处理中
+     * ,20=已完成,90=已关闭,91=已取消
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
+
+    @Column(name = "CUSTOMER_NO")
+    @ApiParam(value = "客户编号")
+    private String customerNo;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    @Column(name = "VERSION")
+    @ApiParam(value = "版本", example = "1")
+    private Integer version;
+
+    /**
+     * 单据类型::1=工单配料
+     */
+    @Column(name = "REF_TYPE")
+    @ApiParam(value = "关联单据类型")
+    private String refType;
+
+    @Column(name = "REF_NO")
+    @ApiParam(value = "关联单据")
+    private String refNo;
+
+    @Column(name = "ERP_SRC_NO")
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    /**
+     * 单据类型::1=工单配料
+     */
+    @Column(name = "ORDER_TYPE")
+    @ApiParam(value = "单据类型")
+    private String orderType;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "数量", example = "1")
+    private Double qty;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java
deleted file mode 100644
index a92ffd2..0000000
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : 库存移动单明细信息
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_MOVEMENT_DETAILS")
-@Api("库存移动单明细信息")
-public class WmsMoveMentDetails extends BaseBean {
-
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    @Column(name="ITEM")
-    @ApiParam("行号")
-    public String item;
-
-    @Column(name="PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name="PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-
-    @Column(name="UNIT")
-    @ApiParam("单位")
-    public String unit;
-
-    @Column(name="SRC_WH")
-    @ApiParam("发出库仓库")
-    public String srcWh;
-
-    @Column(name="DEST_WH")
-    @ApiParam("接收库仓库")
-    public String destWh;
-
-    @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
-    public String printQty;
-
-    @Column(name="FACT_QTY")
-    @ApiParam("操作完成数量")
-    public String factQty;
-
-    @Column(name="ZDATE")
-    @ApiParam("计划交货日期")
-    public String zDate;
-
-    @Column(name="ZTIME")
-    @ApiParam("计划交货时间")
-    public String zTime;
-
-    @Column(name="SRC_NO")
-    @ApiParam("源单号")
-    public String srcNo;
-
-    /**
-     * 状态:N=正常,C=行取消
-     */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "1")
-    public Integer status;
-
-    @Column(name="REMARK")
-    @ApiParam("备注")
-    public String reMark;
-
-    /**
-     * 是否免费:0=计费,1=免费
-     */
-    @Column(name="IS_FREE")
-    @ApiParam(value = "是否免费", example = "1")
-    public Integer isFree;
-
-    @Column(name="PICK_QTY")
-    @ApiParam(value = "已配数量", example = "0")
-    public Double pickQty;
-
-    @Column(name="OUT_QTY")
-    @ApiParam(value = "已提交数量", example = "0")
-    public Double outQty;
-
-    @Column(name="INLINE_QTY")
-    @ApiParam(value = "已上线数量", example = "0")
-    public Double inLineQty;
-
-    @Column(name="REJECT_QTY")
-    @ApiParam(value = "退料数量", example = "0")
-    public Double rejectQty;
-
-    @Column(name="REJECT_POST_QTY")
-    @ApiParam(value = "退料提交数量", example = "0")
-    public Double rejectPostQty;
-}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java
deleted file mode 100644
index 92dc1ca..0000000
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.bean;
-
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Description : 库存移动单主表信息(用于转储类业务)
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 15:58
- * @Modify:
- **/
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_MOVEMENT_MASTER")
-@Api("库存移动单主表信息")
-public class WmsMoveMentMaster extends BaseBean {
-
-    @Column(name="ORDER_NO")
-    @ApiParam("单号")
-    public String orderNo;
-
-    /**
-     * 移动类型:IN=入库,OUT=出库,MOVE=移库
-     */
-    @Column(name="MOVE_TYPE")
-    @ApiParam("移动类型")
-    public String moveType;
-
-    /**
-     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
-     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
-     * MI=移库入库,MO=移库出库,SO=发运
-     */
-    @Column(name="TYPE")
-    @ApiParam("业务类型")
-    public String type;
-
-    /**
-     * 状态:0=新建,10=处理中
-     * ,20=已完成,90=已关闭,91=已取消
-     */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer status;
-
-    @Column(name="CUSTOMER_NO")
-    @ApiParam("客户编号")
-    public String customerNo;
-
-    @Column(name="VENDOR_NO")
-    @ApiParam("供应商编号")
-    public String vendorNo;
-
-    @Column(name="VERSION")
-    @ApiParam("版本")
-    public String version;
-
-    @Column(name="SRC")
-    @ApiParam("单据来源")
-    public String src;
-
-    @Column(name="SRC_NO")
-    @ApiParam("关联单据")
-    public String srcNo;
-
-    @Column(name="ERP_ORDERNO")
-    @ApiParam("ERP单号")
-    public String erpOrderNo;
-
-    /**
-     * 单据类型:WO=工单配料
-     */
-    @Column(name="ORDER_TYPE")
-    @ApiParam("单据类型")
-    public String orderType;
-
-    @Column(name="PART_NO")
-    @ApiParam("物料编码")
-    public String partNo;
-
-    @Column(name="PART_NAME_RDD")
-    @ApiParam("物料名称")
-    public String partNameRdd;
-
-    @Column(name="QTY")
-    @ApiParam(value = "需求数量", example = "0")
-    public Double qty;
-}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index 36c2b14..f5a0b69 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -33,20 +33,20 @@ public class WmsPOMaster extends BaseBean {
     public String orderNo;
 
     /**
-     * 单据类型:1 REG=原物料采购,
-     * 2 SUB=委外采购,3 TAR=多角贸易采购,4 TAP=多角代采购
+     * 单据类型:
+     * 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购
      */
-    @Column(name="TYPE")
+    @Column(name="PO_TYPE")
     @ApiParam("单据类型")
-    public String type;
+    public String poType;
 
     /**
-     * 状态:0=新建,10=收货中,20=收货完成,
+     * 状态:1=新建,10=收货中,20=收货完成,
      * 30=入库中,40=入库完成,90=已关闭,91=已取消
      */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    @Column(name="PO_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer poStatus;
 
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编号")
@@ -56,6 +56,9 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam("版本")
     public String version;
 
+    /**
+     * 单据来源：1 MNU=手工,2 ERP=ERP接口
+     */
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index 7ebd1b1..97216a8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -49,20 +49,20 @@ public class WmsPOMasterDetails extends BaseBean {
     public Double qty;
 
     @Column(name="PRINT_QTY")
-    @ApiParam("条码打印数量")
-    public String printQty;
+    @ApiParam(value = "条码打印数量", example = "0")
+    public Double printQty;
 
     @Column(name="RC_QTY")
-    @ApiParam("收货数量")
-    public String rcQty;
+    @ApiParam(value = "收货数量", example = "0")
+    public Double rcQty;
 
     @Column(name="PASS_QTY")
-    @ApiParam("质检合格数量")
-    public String passQty;
+    @ApiParam(value = "质检合格数量", example = "0")
+    public Double passQty;
 
     @Column(name="NG_QTY")
-    @ApiParam("质检不合格数量")
-    public String ngQty;
+    @ApiParam(value = "质检不合格数量", example = "0")
+    public Double ngQty;
 
     @Column(name="UNIT")
     @ApiParam("单位")
@@ -81,11 +81,11 @@ public class WmsPOMasterDetails extends BaseBean {
     public String whNo;
 
     /**
-     * 状态:N=正常,C=行取消
+     * 状态:10 N=正常,20 C=行取消
      */
-    @Column(name="STATUS")
+    @Column(name="ITEM_STATUS")
     @ApiParam("状态")
-    public String status;
+    public String itemStatus;
 
     @Column(name="SNP")
     @ApiParam("标准包装")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java
new file mode 100644
index 0000000..74e804a
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementDetailsRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :库存移动单详情表的方法接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-13 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsDocMovementDetailsRepository extends BaseRepository<WmsDocMovementDetails, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java
new file mode 100644
index 0000000..7dea50e
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocMovementMasterRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+* @Description :库存移动单主表的方法接口
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-13 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsDocMovementMasterRepository extends BaseRepository<WmsDocMovementMaster, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java
deleted file mode 100644
index ef0c9c5..0000000
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentDetailsRepository.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentDetails;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description : 对象持久层仓用方法控制
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 9:47
- * @Modify:
- **/
-@Repository
-public interface WmsMoveMentDetailsRepository extends BaseRepository<WmsMoveMentDetails, Long> {
-}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java
deleted file mode 100644
index 6ea8bc5..0000000
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveMentMasterRepository.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.estsh.i3plus.pojo.wms.repository;
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMentMaster;
-import org.springframework.stereotype.Repository;
-
-/**
- * @Description : 对象持久层仓用方法控制
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-06 9:47
- * @Modify:
- **/
-@Repository
-public interface WmsMoveMentMasterRepository extends BaseRepository<WmsMoveMentMaster, Long> {
-}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index c2e314d..54ff84b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -11,7 +11,60 @@ import cn.estsh.i3plus.pojo.wms.bean.*;
  * @Modify:
  **/
 public class WmsHqlPack {
+    /**
+     * PO订单明细表 分页查询
+     *
+     * @param wmsPOMasterDetails
+     * @return
+     */
+    public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
+        HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result);
+
+        return result.toString();
+    }
+
+    /**
+     * 库存移动单详情查询封装
+     *
+     * @param wmsDocMovementDetails
+     * @return
+     */
+    public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result);
 
+        return result.toString();
+    }
+    /**
+     * 库存移动单查询封装
+     *
+     * @param wmsDocMovementMaster
+     * @return
+     */
+    public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
+        HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result);
+        HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result);
+        HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+        HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result);
+
+        return result.toString();
+    }
     /**
      * PO订单主表信息 分页查询
      *
@@ -23,11 +76,12 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(wmsPOMaster.getType(), "type", result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getStatus(), "status", result);
+        HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result);
+        HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
         HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result);
+        HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result);
 
         return result.toString();
     }