From 728b48c6866d2afe3fd7cf1c5822ccac41d32455 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 25 十一月 2025 13:01:52 +0800
Subject: [PATCH] yys 1.取消本次回款金额不能大于待回款金额 2.取消开票数0的限制
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index 5349dab..5f0cea7 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -60,9 +60,9 @@
if (!ObjectUtils.isEmpty(byId.getId())){
receiptPaymentDto1.setNoReceiptAmount(receiptPaymentDto1.getNoReceiptAmount().add(byId.getReceiptPaymentAmount()));
}
- if (receiptPaymentDto1.getNoReceiptAmount().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
- throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
- }
+// if (receiptPaymentDto1.getNoReceiptAmount().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
+// throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
+// }
if(null==receiptPayment.getId()){
return receiptPaymentMapper.insert(receiptPayment);
@@ -164,6 +164,15 @@
if (receiptPaymentDto.getStatus()) {
receiptPaymentDtoIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
}
+ receiptPaymentDtoIPage.getRecords().forEach(item -> {
+ // 姣旇緝鍥炴閲戦 == 寰呭洖娆鹃噾棰�
+ if (item.getInvoiceTotal().compareTo(item.getReceiptPaymentAmountTotal()) == 0) {
+ item.setStatusName("宸插畬鎴愬洖娆�");
+ }else{
+ item.setStatusName("鏈畬鎴愬洖娆�");
+ }
+
+ });
return receiptPaymentDtoIPage;
}
--
Gitblit v1.9.3