From 5e55f92fcd4843eb51fc78821321baadf9feba69 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 22 九月 2026 12:35:24 +0800
Subject: [PATCH] fix: 优化供应商交易查询逻辑,修复付款金额和应付金额计算问题
---
src/main/resources/mapper/account/AccountStatementMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/account/AccountStatementMapper.xml b/src/main/resources/mapper/account/AccountStatementMapper.xml
index 324d243..9f99288 100644
--- a/src/main/resources/mapper/account/AccountStatementMapper.xml
+++ b/src/main/resources/mapper/account/AccountStatementMapper.xml
@@ -122,12 +122,12 @@
-- 杩涢」绋庢槑缁嗭紙閲囪喘璁㈠崟锛�
SELECT
pl.purchase_contract_number AS invoiceNo,
- pl.sales_contract_no AS salesContractNo,
- pl.supplier_name AS supplierName,
- NULL AS customerName,
+ pl.purchase_contract_number AS salesContractNo,
+ NULL AS supplierName,
+ pl.supplier_name AS customerName,
'杩涢」' AS orderType,
pl.entry_date AS invoiceDate,
- slp.tax_rate AS taxRate,
+ MAX(slp.tax_rate) AS taxRate,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS jTaxAmount,
0 AS xTaxAmount,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS taxAmount
@@ -148,7 +148,7 @@
sl.customer_name AS customerName,
'閿�椤�' AS orderType,
sl.entry_date AS invoiceDate,
- slp.tax_rate AS taxRate,
+ MAX(slp.tax_rate) AS taxRate,
0 AS jTaxAmount,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS xTaxAmount,
ROUND(SUM(slp.tax_inclusive_total_price - slp.tax_exclusive_total_price), 2) AS taxAmount
--
Gitblit v1.9.3