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 a76b0fc..87050ca 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
@@ -990,6 +990,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
+        SCRAP(70,"报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -4707,4 +4708,40 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 计划拉动明细表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VENDOR_TYPE {
+        VENDOR(10, "供应商"), CARRIERS(20, "承运商");
+
+        private int value;
+        private String description;
+
+        VENDOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
new file mode 100644
index 0000000..dc572b6
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java
@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 盘点批量操作
+ * @author qianhs
+ */
+@Data
+public class WmsCSOrderMasterModel implements Serializable {
+
+    private static final long serialVersionUID = -5490167040159056107L;
+
+    @ApiParam("盘点订单主表")
+    public List<WmsCSOrderMaster> wmsCSOrderMasterList;
+
+    @ApiParam("工厂代码")
+    public String  organizeCode;
+}
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
new file mode 100644
index 0000000..48e8954
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 条码FIFO推荐
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-12-17 20:41
+ * @Modify:
+ **/
+@Data
+public class WmsStockFifoModel {
+
+    @ApiParam(value = "工厂代码")
+    String organizeCode;
+
+    @ApiParam(value = "物料集合")
+    List<String> partNos;
+
+    @ApiParam(value = "存储区集合")
+    List<String> zoneNos;
+
+    @ApiParam(value = "物料对应的存储区")
+    Map<String, String> partToZoneMap;
+
+    @ApiParam(value = "单据号")
+    String orderNo;
+
+    @ApiParam(value = "物料对应的存储区集合")
+    Map<String,List<String>> partToZonesMap;
+}
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 6711728..312209b 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
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.Objects;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -258,4 +259,17 @@ public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "IS_SN")
     @ApiParam(value = "条码生成状态", example = "20")
     public Integer isSn;
+
+
+    public WmsDocMovementDetails () {
+
+    }
+
+    public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {
+        this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+    }
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java
index b04a9ad..c0cbe93 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java
@@ -109,6 +109,10 @@ public class WmsTmsShippingExt extends BaseBean {
     @ApiParam("关联单号")
     private String refOrderNo;
 
+    @Column(name="PATH_URL")
+    @ApiParam("回执单地址")
+    private String pathUrl;
+
     @Transient
     @ApiParam("打印模板列表")
     private List<WmsTmsShipModel> shipModels;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java
index 7f62f02..388e6a7 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java
@@ -23,4 +23,10 @@ public class WmsTmsShipModel {
     private Double recQty;
     @ApiParam("单位")
     private String unit;
+
+    @ApiParam("序号")
+    private Integer item;
+
+    @ApiParam("装车时间")
+    private String modifyDatetime;
 }