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
index 62d117f..6864439 100644
--- 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
@@ -52,7 +52,7 @@ public class SapCyco extends SapBase{
     @AnnoOutputColumn
     private String zxm;
 
-    @ApiParam(value = "库存帐冻结标识")
+    @ApiParam(value = "库存账冻结标志")
     @AnnoOutputColumn
     private String zdjbs;
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
index 5e904b2..920e62f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -42,9 +43,21 @@ public class WmsActionResponseBean<Obj> implements Serializable {
 
     @ApiParam("列表信息")
     public List<String> informations;
+    public void setInformation(List<String> list){
+        if(list == null){
+            list = new ArrayList<>();
+        }
+        informations = list;
+    }
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
+    public void setOptions(List<WmsOptionModel> opt){
+        if(opt == null){
+            opt = new ArrayList<>();
+        }
+        options = opt;
+    }
 
     @ApiParam("选中的明细数据")
     public Obj details;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 767edb5..dd5eee0 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Description : 库存条码信息
@@ -210,6 +211,14 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "条码数量总和")
     public Long snCount;
 
+    @Transient
+    @ApiParam(value = "物料编码集合")
+    public List<String> partNoList;
+
+    @Transient
+    @ApiParam(value = "ERP库存地集合")
+    public List<String> erpZoneNoList;
+
     public WmsStockSn(){}
 
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomRepository.java
new file mode 100644
index 0000000..4ea9b21
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomRepository.java
@@ -0,0 +1,12 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by Administrator on 2019/6/22.
+ */
+@Repository
+public interface WmsBomRepository  extends BaseRepository<WmsBom, Long> {
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java
index 80ccc6e..2bb7afa 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java
@@ -30,7 +30,7 @@ public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
      */
     @Query(value = "from WmsStockSn " +
             "where organizeCode=?1 " +
-            "and zoneNo=?2 and partNo=?3 and isValid=?4 and isDeleted=?5 " +
+            "and zoneNo=?2 and partNo=?3 and isValid=?4 and isDeleted=?5 and snStatus=40 " +
             "order by fixLotNo, dateCode, lotNo")
     List<WmsStockSn> findByFifoSNByZoneNo(String organizeCode, String zoneNo, String partNo, int isValid, int isDeleted);
 }
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 6788507..633f2ad 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
@@ -1108,6 +1108,34 @@ public class WmsHqlPack {
     }
 
     /**
+     * 条码状态查询报表查询条件
+     * @param wmsStockSn
+     * @return
+     */
+    public static DdlPackBean packHqlWmsStockSnReportByPager(WmsStockSn wmsStockSn) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
+
+        // 物料编码支持多选
+        DdlPreparedPack.getInPackList(wmsStockSn.getPartNoList(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getWhNo(), "whNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
+
+        getStringBuilderPack(wmsStockSn, result);
+
+        return result;
+    }
+
+    /**
      * 质检单明细信息 查询条件封装
      *
      * @param wmsQCDetails