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 +++++++++++----
1 files changed, 11 insertions(+), 4 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;
}
--
Gitblit v1.9.3