diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java
new file mode 100644
index 0000000..5fc931c
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCgio.java
@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 委外材料发运
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:03
+ * @Modify:
+ **/
+@Data
+@Api(value = "委外材料发运", description = "委外材料发运")
+public class SapCgio extends SapBase{
+
+    @ApiParam(value = "编号")
+    @AnnoOutputColumn
+    private String zinstno;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private String zeile;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "发（退）料库存地点")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "供应商代码")
+    @AnnoOutputColumn
+    private String zlifnr;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "发(退）料数量")
+    @AnnoOutputColumn
+    private String erfmg;
+
+    @ApiParam(value = "计量单位")
+    @AnnoOutputColumn
+    private String erfme;
+
+    @ApiParam(value = "状态")
+    @AnnoOutputColumn
+    private String zzlzt;
+
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn
+    private String zaction;
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java
new file mode 100644
index 0000000..62d117f
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java
@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description :盘点
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:16
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点",description = "盘点")
+public class SapCyco extends SapBase{
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private Integer zeili;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String matnr;
+
+    @ApiParam(value = "计量单位")
+    @AnnoOutputColumn
+    private String meins;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "库存地点")
+    @AnnoOutputColumn
+    private String lgort;
+
+    @ApiParam(value = "库存状态")
+    @AnnoOutputColumn
+    private String zstat;
+
+    @ApiParam(value = "特殊库存标识")
+    @AnnoOutputColumn
+    private String sobkz;
+
+    @ApiParam(value = "项目号")
+    @AnnoOutputColumn
+    private String zxm;
+
+    @ApiParam(value = "库存帐冻结标识")
+    @AnnoOutputColumn
+    private String zdjbs;
+
+    @ApiParam(value = "删除标识")
+    @AnnoOutputColumn
+    private String xloek;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private Integer gjahr;
+
+    public Integer getZeilVal() {
+        return zeili== null ? 0 : this.zeili.intValue();
+    }
+
+    public Integer getGjahrVal() {
+        return gjahr== null ? 0 : this.gjahr.intValue();
+    }
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java
new file mode 100644
index 0000000..ab258ac
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDifo.java
@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 盘点调差
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2019-06-22 10:27
+ * @Modify:
+ **/
+@Data
+@Api(value="盘点调差",description = "盘点调差")
+public class SapDifo extends SapBase{
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String werks;
+
+    @ApiParam(value = "盘点凭证号")
+    @AnnoOutputColumn
+    private String iblnr;
+
+    @ApiParam(value = "行号")
+    @AnnoOutputColumn
+    private String zeili;
+
+    @ApiParam(value = "调整")
+    @AnnoOutputColumn
+    private String ztzbs;
+
+    @ApiParam(value = "年度")
+    @AnnoOutputColumn
+    private String gjahr;
+
+}
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 3695b07..7c8267c 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
@@ -182,6 +182,14 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value ="余数",example = "1")
     private Double restQty;
 
+    @Transient
+    @ApiParam("任务状态")
+    private Integer isTask;
+
+    @Transient
+    @ApiParam("主表单据状态")
+    private Integer orderMasterStatus;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }
@@ -194,6 +202,10 @@ public class WmsDocMovementDetails extends BaseBean {
 
     public Double getActualQty() {return actualQty == null ? 0D : this.actualQty.doubleValue(); }
 
+    public Integer getIsTaskVal() {return isTask == null ? 0 : this.isTask.intValue();}
+
+    public Integer getOrderMasterStatus() { return orderMasterStatus== null ? 0 : this.orderMasterStatus.intValue(); }
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
index 16b0109..68e40c5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 
 /**
  * @Description : 作业任务明细信息
@@ -137,6 +138,10 @@ public class WmsTaskDetails extends BaseBean {
         return this.qty == null ? 0 : this.qty;
     }
 
+    public String getQtyTxt(){
+        return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString();
+    }
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
index 6481548..06e69ff 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
@@ -89,4 +89,11 @@ public class WmsZones extends BaseBean {
     @Transient
     @ApiParam(value ="子存储区列表")
     private List<WmsZones> childList;
+
+    public WmsZones(String zoneNo){
+        this.zoneNo = zoneNo;
+    }
+
+    public WmsZones(){}
+
 }
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 d876980..ead2da2 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
@@ -1998,5 +1998,23 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 根据存储区编号集合、库位类型查询库位信息
+     *
+     * @param zoneNoList
+     *@param wmsZones
+     * @param locateType
+     * @return
+     */
+    public static DdlPackBean packLocateNoByZoneNo(List<String> zoneNoList , WmsZones wmsZones , Integer locateType) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(zoneNoList, "zoneNo", result);
+        DdlPreparedPack.getNumEqualPack(locateType, "locateType", result);
+        getStringBuilderPack(wmsZones, result);
+
+        return result;
+    }
 
 }