From a45c4fb6232faf2f23b7b2ba45416f11a5390d77 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 21 三月 2026 16:50:15 +0800
Subject: [PATCH] feat(purchase): 完善采购退货模块及关联退货数量统计

---
 src/main/resources/mapper/sales/SalesLedgerMapper.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 85f62c0..71ad49f 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -111,14 +111,16 @@
         FROM sales_ledger
         GROUP BY customer_name
     </select>
-    <select id="listSalesLedger" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
-        select * from
+    <select id="listSalesLedgerAndShipped" resultType="com.ruoyi.sales.dto.SalesLedgerDto">
+        select distinct sl.id as 'disId', sl.* from
         sales_ledger sl
-        <where>
+        left join sales_ledger_product slp on sl.id = slp.sales_ledger_id
+        left join shipping_info si on slp.id = si.sales_ledger_product_id
+        where si.status = '宸插彂璐�'
             <if test="ew.customerName != null and ew.customerName != '' ">
             and sl.customer_name like concat('%',#{ew.customerName},'%')
             </if>
-        </where>
+        order by sl.execution_date desc
     </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3