From efd19d385d177bfcc8d9747148ae2357e9f6aedc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 14 七月 2025 16:19:27 +0800
Subject: [PATCH] 修改销售管理-回款登记，金额不许超过发票金额
---
src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 3 +++
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 0 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 135d3b0..5349dab 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -10,8 +10,10 @@
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentExeclDto;
+import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ReceiptPaymentService;
@@ -35,6 +37,8 @@
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private InvoiceLedgerMapper invoiceLedgerMapper;
/**
* 鍥炴鐧昏鏂板
@@ -43,9 +47,27 @@
*/
@Override
public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
+ ReceiptPayment byId = receiptPayment;
+ if (!ObjectUtils.isEmpty(receiptPayment.getId())){
+ byId = this.getById(receiptPayment.getId());
+ }
+ InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectById(byId.getInvoiceLedgerId());
+ Page<ReceiptPaymentDto> objectPage = new Page<>();
+ ReceiptPaymentDto receiptPaymentDto = new ReceiptPaymentDto();
+ receiptPaymentDto.setInvoiceLedgerId(invoiceLedger.getId());
+ IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(objectPage, receiptPaymentDto);
+ ReceiptPaymentDto receiptPaymentDto1 = receiptPaymentDtoIPage.getRecords().get(0);
+ if (!ObjectUtils.isEmpty(byId.getId())){
+ receiptPaymentDto1.setNoReceiptAmount(receiptPaymentDto1.getNoReceiptAmount().add(byId.getReceiptPaymentAmount()));
+ }
+ if (receiptPaymentDto1.getNoReceiptAmount().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
+ throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
+ }
if(null==receiptPayment.getId()){
+
return receiptPaymentMapper.insert(receiptPayment);
}else {
+
return receiptPaymentMapper.updateById(receiptPayment);
}
}
diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
index 26ef5f8..df06df6 100644
--- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
+++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml
@@ -98,6 +98,9 @@
<if test="c.customerName != null and c.customerName !=''">
AND T3.customer_name LIKE CONCAT('%',#{c.customerName},'%')
</if>
+ <if test="c.invoiceLedgerId != null">
+ AND T1.id = #{c.invoiceLedgerId}
+ </if>
<if test="c.customerContractNo != null and c.customerContractNo !=''">
AND T3.customer_contract_no LIKE CONCAT('%',#{c.customerContractNo},'%')
</if>
--
Gitblit v1.9.3