From a93befc4e35048442041d7280b8c97b3e185ffdf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 03 七月 2026 16:34:05 +0800
Subject: [PATCH] fix:1.客户往来的应收金额、供应商往来的应付金额展示优化 2.客户往来，供应商往来加上退货金额字段
---
src/main/resources/mapper/basic/CustomerMapper.xml | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 8117c66..75327ef 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -22,7 +22,14 @@
from customer_user cu
where cu.customer_id = c.id
and cu.user_id != c.usage_user
- ) as user_ids_str
+ ) as user_ids_str,
+ CASE
+ WHEN EXISTS (SELECT 1 FROM sales_ledger sl WHERE sl.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM sales_quotation sq WHERE sq.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM return_management rm WHERE rm.customer_id = c.id)
+ THEN 1
+ ELSE 0
+ END AS sales_reference_flag
from customer c
left join sys_user u on c.usage_user = u.user_id
<where>
@@ -52,6 +59,7 @@
)
</if>
</where>
+ order by c.id desc
</select>
<select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
@@ -70,7 +78,14 @@
from customer_user cu
where cu.customer_id = c.id
and cu.user_id != c.usage_user
- ) as user_ids_str
+ ) as user_ids_str,
+ CASE
+ WHEN EXISTS (SELECT 1 FROM sales_ledger sl WHERE sl.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM sales_quotation sq WHERE sq.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM return_management rm WHERE rm.customer_id = c.id)
+ THEN 1
+ ELSE 0
+ END AS sales_reference_flag
from customer c
left join sys_user u on c.usage_user = u.user_id
<where>
@@ -106,28 +121,17 @@
)
</if>
</where>
+ order by c.id desc
</select>
<select id="customewTransactions" resultType="com.ruoyi.sales.vo.CustomerTransactionsVo">
select T1.customer_id,
c.customer_name,
- T1.contractAmounts,
+ T1.contractAmounts AS contractAmounts,
IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount
+ T1.contractAmounts - (IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0)) AS receiptableAmount,
+ IFNULL(T4.returnAmount, 0) AS returnAmount
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
- ) T3 on T3.customer_id=T1.customer_id
left join (
select
sl.customer_id,
@@ -144,15 +148,17 @@
AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
</if>
</where>
+ order by T1.customer_id desc
</select>
<select id="customewTransactionsDetails"
resultType="com.ruoyi.sales.vo.CustomerTransactionsDetailsVo">
select sl.id salesLedgerId,
sl.sales_contract_no,
sl.execution_date,
- sl.contract_amount,
+ sl.contract_amount AS contract_amount,
IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount
+ sl.contract_amount - (IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0)) AS receiptableAmount,
+ IFNULL(T3.returnAmount, 0) AS returnAmount
from sales_ledger sl
left join (
select
@@ -167,19 +173,6 @@
group by sl.id
)T1 on T1.id = sl.id
left join (
- SELECT
- sl.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.id
- )T2 on T2.id = sl.id
- left join (
select sl.id,
sum(rm.refund_amount) as returnAmount
from return_management rm
@@ -189,5 +182,6 @@
group by sl.id
)T3 on T3.id = sl.id
where sl.customer_id = #{customerId}
+ order by sl.id desc
</select>
</mapper>
--
Gitblit v1.9.3