From 1c8757f865bd5a0c80fa1d44ec4b62dfc6e24e39 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 12 十月 2026 16:55:31 +0800
Subject: [PATCH] fix: 优化客户往来查询逻辑，修复应收金额计算及批号显示问题
---
src/main/resources/mapper/basic/CustomerMapper.xml | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 2957c7e..fbe1a7a 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -9,7 +9,7 @@
<select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
select
c.*,
- u.user_name usage_user_name,
+ u.nick_name usage_user_name,
(
select group_concat(u2.user_name separator ', ')
from customer_user cu
@@ -109,26 +109,40 @@
</where>
order by c.id desc
</select>
+ <!--
+ 瀹㈡埛寰�鏉ワ紙鍥炴鍙拌处涓昏〃锛夛細
+ 搴旀敹閲戦 = 宸插嚭搴撻噾棰� 鈭� 宸查��璐ф 鈭� 宸插洖娆鹃噾棰濓紙涓嶅皬浜� 0锛�
+ 鍗炽�屽洖娆鹃噾棰濄�嶆槸绱鍥炴锛屻�屽簲鏀堕噾棰濄�嶆槸杩樻病鏀跺洖鏉ョ殑閮ㄥ垎銆�
+ 娉ㄦ剰 T3 鎸� (shipping_info, 浜у搧琛�) 鍏堣仛鍚堝啀姹傚拰锛岄伩鍏嶅悓涓�鍙戣揣鍗曞鎵瑰彿鍑哄簱鏃堕噸澶嶈鏁般��
+ -->
<select id="customewTransactions" resultType="com.ruoyi.sales.vo.CustomerTransactionsVo">
select T1.customer_id,
c.customer_name,
T1.contractAmounts,
IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount
+ GREATEST(
+ IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0)
+ - IFNULL(T2.receiptPaymentAmount, 0),
+ 0) AS receiptableAmount
from (select customer_id, sum(contract_amount) as contractAmounts from sales_ledger group by customer_id) T1
left join (select customer_id, sum(collection_amount) as receiptPaymentAmount from account_sales_collection group by customer_id) T2 on T1.customer_id = T2.customer_id
left join (
- SELECT
- sl.customer_id,
- sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
- FROM stock_out_record sor
- LEFT join shipping_info s on sor.record_id = s.id
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
- WHERE sor.record_type='13'
- and sor.approval_status=1
- and slp.type = 1
- group by sl.customer_id
+ SELECT customer_id, sum(shipped_amount) as outboundAmount from (
+ SELECT
+ sl.customer_id,
+ s.id AS shipping_id,
+ s.sales_ledger_product_id,
+ sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as shipped_amount
+ FROM stock_out_record sor
+ LEFT join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ and slp.type = 1
+ group by sl.customer_id, s.id, s.sales_ledger_product_id
+ ) g
+ group by customer_id
) T3 on T3.customer_id=T1.customer_id
left join (
select
@@ -148,6 +162,11 @@
</where>
order by T1.customer_id desc
</select>
+ <!--
+ 瀹㈡埛寰�鏉ユ槑缁嗭紙鎸夐攢鍞彴璐︼級锛氬簲鏀堕噾棰� = 璇ュ彴璐﹀凡鍑哄簱 鈭� 宸查��璐� 鈭� 宸插洖娆俱��
+ 鍗曟潯鍥炴鍙粺璁′竴娆★細鍚屼竴鍥炴鍙兘鍚屾椂鍛戒腑璇ュ彴璐︾殑澶氭潯鍑哄簱璁板綍锛�
+ 鍏堢敤 GROUP BY ascc.id, sl.id 鍘婚噸锛屽啀鎸夊彴璐︽眰鍜屻��
+ -->
<select id="customewTransactionsDetails"
resultType="com.ruoyi.sales.vo.CustomerTransactionsDetailsVo">
select sl.id salesLedgerId,
@@ -155,19 +174,28 @@
sl.execution_date,
sl.contract_amount,
IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount
+ GREATEST(
+ IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0)
+ - IFNULL(T1.receiptPaymentAmount, 0),
+ 0) AS receiptableAmount
from sales_ledger sl
left join (
select
sl.id,
- sum(ascc.collection_amount) as receiptPaymentAmount
- from account_sales_collection ascc
- left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
- left join shipping_info s on sor.record_id = s.id
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- WHERE sor.record_type='13'
- and sor.approval_status=1
- group by sl.id
+ sum(t.collection_amount) as receiptPaymentAmount
+ from (
+ select
+ ascc.collection_amount,
+ s.sales_ledger_id
+ from account_sales_collection ascc
+ left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
+ left join shipping_info s on sor.record_id = s.id
+ where sor.record_type='13'
+ and sor.approval_status=1
+ group by ascc.id, s.sales_ledger_id
+ ) t
+ left join sales_ledger sl on t.sales_ledger_id = sl.id
+ group by sl.id
)T1 on T1.id = sl.id
left join (
SELECT
--
Gitblit v1.9.3