From 8e14fa84f6f2dfdda8a739400fca80ac73dca874 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 25 十二月 2025 11:06:21 +0800
Subject: [PATCH] yys 修改项目利润，供应商往来
---
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 15 +++++--
src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml | 52 +++++++------------------
2 files changed, 26 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index 30e838f..0d2e349 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -220,10 +220,10 @@
new QueryWrapper<SalesLedgerProduct>().eq("sales_ledger_id", id).eq("type",2)
).stream())
.collect(Collectors.toList());
- payableAmount = salesLedgerProducts.stream()
- .map(SalesLedgerProduct::getTaxInclusiveTotalPrice)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
+// payableAmount = salesLedgerProducts.stream()
+// .map(SalesLedgerProduct::getTaxInclusiveTotalPrice)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
// 鏉ョエ閲戦璁＄畻
List<TicketRegistration> ticketRegistrations = purchaseLedgers.stream()
@@ -247,6 +247,11 @@
.map(PaymentRegistration::getCurrentPaymentAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ // 鏍稿績杩囨护閫昏緫锛氬綋paymentAmount鍜宨nvoiceAmount鍚屾椂涓�0鏃讹紝璺宠繃璇ヨ褰�
+ if (BigDecimal.ZERO.compareTo(paymentAmount) == 0 && BigDecimal.ZERO.compareTo(invoiceAmount) == 0) {
+ continue; // 璺宠繃褰撳墠渚涘簲鍟嗭紝涓嶅姞鍏ョ粨鏋滈泦
+ }
// 璇︽儏鍒嗛〉澶勭悊
detailPageNum = detailPageNum != null ? detailPageNum : 1;
@@ -301,6 +306,8 @@
result.add(res);
}
+ // 淇鎬绘潯鏁帮細杩囨护鍚庨渶瑕侀噸鏂拌绠楁�绘潯鏁�
+ resultPage.setTotal(result.size());
resultPage.setRecords(result);
return resultPage;
}
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index 79310e8..b5baf13 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -7,49 +7,27 @@
<select id="selectPurchaseReport" resultType="com.ruoyi.purchase.dto.InvoicePurchaseReportDto">
SELECT
- A.*,
- FORMAT(A.sales_tax_amount - A.purchase_tax_amount, 2) AS balance_amount
- FROM (
- SELECT
- sl.sales_contract_no as customerContractNo,
- sl.id,
- pl.id AS pl_id,
+ sl.sales_contract_no AS customerContractNo,
sl.customer_name,
- sl.project_name,
- slp.tax_inclusive_total_price - slp.tax_exclusive_total_price AS contract_amount,
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS purchase_amount,
- (slp.tax_exclusive_total_price) / COUNT(slp.id) AS sale_tax_exclusive_total_price,
- SUM(slp1.tax_exclusive_total_price) AS tax_exclusive_total_price,
- (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) -
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS balance,
- CONCAT(
- FORMAT(
- ((slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) -
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price)) /
- (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) * 100,
- 2),
- '%'
- ) AS balance_ratio,
- (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) AS sales_tax_amount,
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS purchase_tax_amount
+ sl.contract_amount AS contract_amount,
+ SUM( pl.contract_amount ) AS purchase_amount,
+ (
+ sl.contract_amount - SUM( pl.contract_amount )) AS balance,
+ CONCAT( ROUND( ( sl.contract_amount - SUM( pl.contract_amount )) / sl.contract_amount * 100, 1 ), '%' ) AS balance_ratio
FROM
- purchase_ledger pl
- LEFT JOIN
- sales_ledger sl ON pl.sales_ledger_id = sl.id
- LEFT JOIN
- sales_ledger_product slp ON slp.sales_ledger_id = sl.id AND slp.type = 1
- LEFT JOIN
- sales_ledger_product slp1 ON slp1.sales_ledger_id = pl.id AND slp1.type = 2
- GROUP BY
- pl.id
- HAVING
- customerContractNo IS NOT NULL
- ) A
+ sales_ledger sl
+ INNER JOIN purchase_ledger pl ON sl.sales_contract_no = pl.sales_contract_no
<where>
<if test="c.customerName != null and c.customerName != ''">
- AND A.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
+ AND sl.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
</if>
</where>
+ GROUP BY
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.contract_amount
+ ORDER BY
+ sl.sales_contract_no;
</select>
<select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
select *
--
Gitblit v1.9.3