From 1b072f4955ed6abb89da353a2224c35f77f7e7df Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 23 四月 2026 15:14:33 +0800
Subject: [PATCH] fix: 供应商往来付款金额修改
---
src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
index 13491b6..5107e91 100644
--- a/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
+++ b/src/main/resources/mapper/purchase/PaymentRegistrationMapper.xml
@@ -187,21 +187,29 @@
SELECT
T1.supplier_id,
T1.supplier_name,
- SUM(T1.contract_amount) AS invoiceAmount,
- SUM(IFNULL(T2.paid_sum, 0)) AS paymentAmount,
- (SUM(T1.contract_amount) - SUM(IFNULL(T2.paid_sum, 0))) AS payableAmount
- FROM purchase_ledger T1
- LEFT JOIN (
- SELECT purchase_ledger_id, SUM(current_payment_amount) AS paid_sum
- FROM payment_registration
- GROUP BY purchase_ledger_id
- ) T2 ON T1.id = T2.purchase_ledger_id
+ T1.invoiceAmount,
+ IFNULL(T2.paymentAmount, 0) AS paymentAmount,
+ (T1.invoiceAmount - IFNULL(T2.paymentAmount, 0)) AS payableAmount
+ FROM (
+ SELECT
+ supplier_id,
+ supplier_name,
+ SUM(contract_amount) AS invoiceAmount
+ FROM purchase_ledger
<where>
<if test="req.supplierName != null and req.supplierName != '' ">
- AND T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
+ AND supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
</if>
</where>
- GROUP BY T1.supplier_id, T1.supplier_name
+ GROUP BY supplier_id, supplier_name
+ ) T1
+ LEFT JOIN (
+ SELECT
+ supplier_id,
+ SUM(current_payment_amount) AS paymentAmount
+ FROM payment_registration
+ GROUP BY supplier_id
+ ) T2 ON T1.supplier_id = T2.supplier_id
</select>
<select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
--
Gitblit v1.9.3