From a3d3ba426c2a5a6015888d5e32e0f9704b4d125c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_建诚恒商贸
---
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