From 6ed42390d7231b0d26700898ee2922732043effa Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 19 六月 2025 16:20:34 +0800
Subject: [PATCH] 2025-06-19 增值税对比 + 问题修改
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
index 7f8bd60..bb576cc 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -10,9 +10,8 @@
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto;
-import com.ruoyi.sales.mapper.InvoiceRegistrationMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.mapper.*;
+import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceRegistration;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -25,6 +24,7 @@
import org.springframework.util.ObjectUtils;
import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;
@@ -39,6 +39,9 @@
@Autowired
private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ @Autowired
+ private InvoiceLedgerMapper invoiceLedgerMapper;
/**
* 寮�绁ㄧ櫥璁拌褰曟柊澧�
@@ -55,13 +58,15 @@
invoiceRegistration.setSalesLedgerId(salesLedgerDto.getId().intValue());
invoiceRegistrationMapper.insert(invoiceRegistration);
List<SalesLedgerProduct> productData = salesLedgerDto.getProductData();
+ BigDecimal invoiceAmountTotal = BigDecimal.ZERO;
if(CollectionUtils.isNotEmpty(productData)){
for (SalesLedgerProduct productDatum : productData) {
// 濡傛灉寮�绁ㄦ暟涓�0 璺宠繃
- Integer currentInvoiceNum = productDatum.getCurrentInvoiceNum();
- if(null == currentInvoiceNum || currentInvoiceNum == 0){
+ BigDecimal currentInvoiceNum = productDatum.getCurrentInvoiceNum();
+ if(null != currentInvoiceNum && BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
continue;
}
+ invoiceAmountTotal = invoiceAmountTotal.add(currentInvoiceNum);
InvoiceRegistrationProduct invoiceRegistrationProduct = new InvoiceRegistrationProduct();
BeanUtils.copyProperties(productDatum, invoiceRegistrationProduct);
invoiceRegistrationProduct.setId(null);
@@ -70,8 +75,14 @@
invoiceRegistrationProduct.setInvoiceAmount(productDatum.getCurrentInvoiceAmount());
invoiceRegistrationProduct.setInvoiceNum(productDatum.getCurrentInvoiceNum());
invoiceRegistrationProduct.setSalesLedgerProductId(productDatum.getId().intValue());
+
invoiceRegistrationProductMapper.insert(invoiceRegistrationProduct);
salesLedgerProductMapper.updateById(productDatum);
+ // 鏂板涓�鏉″紑绁ㄥ彴璐︽暟鎹�
+ InvoiceLedger invoiceLedger = new InvoiceLedger();
+ invoiceLedger.setInvoiceRegistrationProductId(invoiceRegistrationProduct.getId());
+ invoiceLedger.setInvoiceTotal(invoiceRegistrationProduct.getInvoiceAmount());
+ invoiceLedgerMapper.insert(invoiceLedger);
}
}
}
--
Gitblit v1.9.3