diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
index dab25e3..140ca40 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -43,3 +43,4 @@ public class SoReceiveCasesData extends SoReceiveCases {
 
 
 
+
diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
index 2484f71..4f6a1a0 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -186,3 +186,4 @@ public class SoReceiveCases {
 
 
 
+
diff --git a/src/main/java/com/gaotao/modules/outboundNotification/service/impl/OutboundNotificationServiceImpl.java b/src/main/java/com/gaotao/modules/outboundNotification/service/impl/OutboundNotificationServiceImpl.java
index ead39da..70bf555 100644
--- a/src/main/java/com/gaotao/modules/outboundNotification/service/impl/OutboundNotificationServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/outboundNotification/service/impl/OutboundNotificationServiceImpl.java
@@ -113,10 +113,10 @@ public class OutboundNotificationServiceImpl implements OutboundNotificationServ
      */
     @Override
     public void issueOutboundNotification(OutboundNotificationHeadVo data) {
-        // 拣货出库单状态改为"待入库" 赋值下达人和下达时间
+        // 拣货出库单状态改为"待出库" 赋值下达人和下达时间
         SysUserEntity sysUserEntity = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
         data.setAssignedBy(sysUserEntity.getUsername());
-        data.setOrderStatus("待入库");
+        data.setOrderStatus("待出库");
         headMapper.issueOutboundNotification(data);
     }
 
diff --git a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
index 1f056ad..2da5358 100644
--- a/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
+++ b/src/main/resources/mapper/outboundNotification/OutboundNotificationDetailMapper.xml
@@ -179,12 +179,12 @@
         a.Part_No,
         a.part_desc as partDesc,
         a.order_qty,
-        b.unit as unit,
-        sum(A.roll_qty) - sum(b.required_qty) as requiredQty -- 可出库数量
+        b.umid as unit,
+        SUM(a.roll_qty) AS requiredQty -- 可出库数量
         FROM po_order_roll_no a
-        LEFT JOIN outbound_notification_detail b ON a.Site = b.site AND a.bu_no = b.bu_no AND a.Order_No = b.order_no AND a.part_no = b.part_no
-        INNER JOIN outbound_notification_head C ON B.site = C.site AND C.bu_no = B.bu_no AND C.order_no = B.order_no
-        where a.site = #{query.site} and a.bu_no = #{query.buNo} and a.hardtag_in_flag <![CDATA[<>]]> '未入库'
+        INNER JOIN part b WITH (NOLOCK) ON a.site = b.site AND a.part_no = b.partno
+        LEFT JOIN inventory_stock c WITH (NOLOCK) ON a.site = c.site AND a.roll_no = c.roll_no AND (c.status IN ('在库', '冻结') OR A.hardtag_in_flag ='未入库')
+        where a.site = #{query.site} and a.bu_no = #{query.buNo}
         and a.Part_No not in
         <foreach collection="query.arr" close=")" open="(" item="item" separator=",">
             #{item}
@@ -198,9 +198,6 @@
         <if test = "query.partDesc != null and query.partDesc != ''">
             AND a.part_desc like '%' + #{query.partDesc} + '%'
         </if>
-        <if test = "query.closeFlag != null and query.closeFlag != ''">
-            AND c.close_flag = #{query.closeFlag}
-        </if>
-        GROUP BY a.Site, a.bu_no, a.Order_No, a.item_no, a.Part_No, a.part_desc, a.order_qty, b.unit
+        GROUP BY a.Site, a.bu_no, a.Order_No, a.item_no, a.Part_No, a.part_desc, a.order_qty, b.umid
     </select>
 </mapper>
diff --git a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
index 12d5e1e..d7a8848 100644
--- a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
+++ b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
@@ -9,14 +9,17 @@
         h.site,
             h.order_no AS returnNo,
             h.bu_no AS buNo,
-            '' AS relatedNo,
-            '' AS relatedLineNo,
-            0 as totalLabels,
-            0 as availableLabels,
-            SUM(CAST(d.required_qty AS float)) as totalQty,
-            0 as availableQty
+<!--            '' AS relatedNo,-->
+<!--            '' AS relatedLineNo,-->
+<!--            0 as totalLabels,-->
+<!--            0 as availableLabels,-->
+<!--            SUM(CAST(d.required_qty AS float)) as totalQty,-->
+<!--            0 as availableQty,-->
+            h.customer_id as customerId,
+            C.CustomerName as customerName
         FROM outbound_notification_head h
         INNER JOIN outbound_notification_detail d ON h.order_no = d.order_no AND h.site = d.site and h.bu_no = d.bu_no
+        INNER JOIN Customer C ON H.site = C.Site AND H.customer_id = C.CustomerID
         WHERE h.site = #{site} and h.bu_no in (select bu_no from AccessBu where username = #{userName})
             AND h.order_type = '采购退货'
             AND h.close_flag = 'N'
@@ -31,7 +34,7 @@
         <if test="searchCode == null or searchCode == ''">
             AND CONVERT(DATE, h.required_outbound_date) = CONVERT(DATE, GETDATE())
         </if>
-        GROUP BY h.site, h.order_no, h.bu_no ,h.required_outbound_date
+        GROUP BY h.site, h.order_no, h.bu_no,h.customer_id,C.CustomerName,required_outbound_date
         ORDER BY h.required_outbound_date DESC
     </select>
 
diff --git a/src/main/resources/mapper/wms/WmsPrintMapper.xml b/src/main/resources/mapper/wms/WmsPrintMapper.xml
index 0f9d00d..786c79a 100644
--- a/src/main/resources/mapper/wms/WmsPrintMapper.xml
+++ b/src/main/resources/mapper/wms/WmsPrintMapper.xml
@@ -61,10 +61,10 @@
                 and c.SupplierName like '%'+ #{query.supplierName} +'%'
             </if>
             <if test="query.poOrderNo != null and query.poOrderNo != ''">
-                and b.po_orderNo like '%'+ #{query.poOrderNo} +'%'
+                and d.related_order_no like '%'+ #{query.poOrderNo} +'%'
             </if>
             <if test="query.poItemNo != null and query.poItemNo != ''">
-                and b.po_itemNo =  #{query.supplierName}
+                and d.related_order_line_no =  #{query.supplierName}
             </if>
         </where>
     </select>