From d4af1d13fd1a3e1dd343d6460b6ff6392cf51e4e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 02 七月 2026 10:42:03 +0800
Subject: [PATCH] 销售退货：查询列表新增入库审批状态字段
---
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index b39b720..1b8ebdf 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -115,12 +115,14 @@
GROUP BY si.sales_ledger_product_id
) t5 ON t5.sales_ledger_product_id = T1.id
LEFT JOIN (
- SELECT si.sales_ledger_product_id, IFNULL(SUM(rsp.num), 0) AS return_quantity
- FROM return_management rm
- INNER JOIN return_sale_product rsp ON rm.id = rsp.return_management_id
- INNER JOIN shipping_info si ON rm.shipping_id = si.id
- WHERE rm.status = 1
- GROUP BY si.sales_ledger_product_id
+ SELECT
+ si.sales_ledger_product_id,
+ SUM( CASE WHEN rsp.STATUS = 1 AND sir.approval_status = 1 THEN rsp.num ELSE 0 END ) AS return_quantity
+ FROM shipping_info si
+ left join return_management rm on rm.shipping_id = si.id
+ left join return_sale_product rsp on rm.id = rsp.return_management_id
+ left join stock_in_record sir on rsp.id = sir.record_id
+ GROUP BY si.sales_ledger_product_id
) t6 ON t6.sales_ledger_product_id = T1.id
left join product_model pm ON T1.product_model_id = pm.id
left join product p ON pm.product_id = p.id
--
Gitblit v1.9.3