diff --git a/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java b/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java
index baa1d7d..3df64d7 100644
--- a/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java
+++ b/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java
@@ -25,6 +25,7 @@ public class IssueNotifyReportData {
     private String spec;
     private String workCenterNo;
     private java.util.List<String> workCenterNoList;
+    private java.util.List<String> warehouseIdList;
     
     // 列表数据
     private String notifyDate;
@@ -35,6 +36,16 @@ public class IssueNotifyReportData {
     private BigDecimal qtyToIssue;
     private BigDecimal actualOutQty;
     private String outBatchNo;
+    private String warehouseName;
+    private String warehouseId;
+
+    public String getWarehouseId() {
+        return warehouseId;
+    }
+
+    public void setWarehouseId(String warehouseId) {
+        this.warehouseId = warehouseId;
+    }
 
     public String getOutBatchNo() {
         return outBatchNo;
@@ -219,5 +230,21 @@ public class IssueNotifyReportData {
     public void setActualOutQty(BigDecimal actualOutQty) {
         this.actualOutQty = actualOutQty;
     }
+
+    public java.util.List<String> getWarehouseIdList() {
+        return warehouseIdList;
+    }
+
+    public void setWarehouseIdList(java.util.List<String> warehouseIdList) {
+        this.warehouseIdList = warehouseIdList;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
 }
 
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index 077f489..9bb6d46 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -678,13 +678,16 @@
             C.QtyToIssue AS qtyToIssue,
             ISNULL(C.actual_out_qty, 0) AS actualOutQty,
             A.work_center_no AS workCenterNo,
-            so.out_batchNo as outBatchNo
+            so.out_batchNo AS outBatchNo,
+            W.WareHouseName AS warehouseName,
+            C.warehouse_id
         FROM SOIssueNotifyHeader A
         INNER JOIN SOIssueNotifyOrderList B ON A.Site = B.Site AND A.NotifyNo = B.NotifyNo
-        left join ShopOrder as so on B.site = so.site and B.SOOrderNo = so.OrderNo
+        LEFT JOIN ShopOrder so ON B.Site = so.Site AND B.SOOrderNo = so.OrderNo
         INNER JOIN SOIssueNotifyOrderMaterialList C ON B.Site = C.Site AND B.NotifyNo = C.NotifyNo AND B.ItemNo = C.ItemNo
         INNER JOIN Part P ON C.Site = P.Site AND C.ComponentPartNo = P.PartNo
         INNER JOIN UM U ON U.Site = P.Site AND U.UMID = P.UMID
+        LEFT JOIN WareHouse W ON C.Site = W.Site AND C.warehouse_id = W.WareHouseID
         <where>
             A.site IN (SELECT site FROM AccessSite WHERE userID = #{query.userName})
             <if test="query.notifyNo != null and query.notifyNo != ''">
@@ -720,6 +723,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="query.warehouseIdList != null and query.warehouseIdList.size() > 0">
+                AND C.warehouse_id IN
+                <foreach collection="query.warehouseIdList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         ORDER BY A.NotifyNo, B.SOOrderNo, C.BOMItemNo
     </select>