From 74749d3762e28c24a1adadc3b1902d083ccb8056 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 3 Nov 2025 11:22:38 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-03=20pda=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseReturn/PurchaseReturnMapper.xml   | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
index b3a017a..7581ab8 100644
--- a/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
+++ b/src/main/resources/mapper/purchaseReturn/PurchaseReturnMapper.xml
@@ -41,21 +41,35 @@
     <!-- 获取采购退货单详情 -->
     <select id="getReturnDetails" resultType="java.util.Map">
         SELECT
+<!--            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-->
+
+
             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
+            h.customer_id as customerId,
+            C.CustomerName as customerName,
+            D.related_order_no AS relatedNo,
+            D.related_order_line_no AS relatedLineNo,
+            D.part_no,
+            D.part_desc,
+            SUM(D.required_qty) AS totalQty,
+            SUM(D.actual_out_qty) AS availableQty
         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 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.order_no = #{returnNo}
             AND h.site = #{site}
             AND h.bu_no = #{buNo}
-        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 ,D.related_order_no ,D.related_order_line_no  ,D.part_no,D.part_desc
     </select>
 
     <!-- 验证标签与采购退货单是否匹配 -->