From a0914318549b357ef3c438d0c2a3714f58ea3487 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 23 一月 2026 14:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 25 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 bb576cc..d1ec847 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -2,9 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.InvoiceRegistrationDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
@@ -51,39 +54,85 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void invoiceRegistrationSave(SalesLedgerDto salesLedgerDto) {
+ // 鏂板寮�绁ㄧ櫥璁颁富琛�
InvoiceRegistration invoiceRegistration = new InvoiceRegistration();
BeanUtils.copyProperties(salesLedgerDto, invoiceRegistration);
invoiceRegistration.setId(null);
invoiceRegistration.setCustomerId(salesLedgerDto.getCustomerId().intValue());
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 璺宠繃
- 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);
- invoiceRegistrationProduct.setSalesLedgerId(salesLedgerDto.getId().intValue());
- invoiceRegistrationProduct.setInvoiceRegistrationId(invoiceRegistration.getId());
- 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);
+ List<SalesLedgerProduct> productData = salesLedgerDto.getProductData();
+ if (CollectionUtils.isEmpty(productData)) {
+ return;
+ }
+
+ for (SalesLedgerProduct productDatum : productData) {
+ // 鏈寮�绁ㄦ暟 / 閲戦
+ BigDecimal currentInvoiceNum = productDatum.getCurrentInvoiceNum();
+ BigDecimal currentInvoiceAmount = productDatum.getCurrentInvoiceAmount();
+
+ if (currentInvoiceNum == null || BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0) {
+ continue;
}
+
+ LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getId, productDatum.getId())
+ .eq(SalesLedgerProduct::getSalesLedgerId, productDatum.getSalesLedgerId());
+ SalesLedgerProduct dbProduct = salesLedgerProductMapper.selectOne(salesLedgerProductLambdaQueryWrapper);
+
+ if (dbProduct == null) {
+ throw new RuntimeException("閿�鍞彴璐︿骇鍝佷笉瀛樺湪锛孖D锛�" + productDatum.getId());
+ }
+
+ // 璁＄畻绱寮�绁�
+ BigDecimal newInvoiceNum = dbProduct.getInvoiceNum().add(currentInvoiceNum);
+
+ BigDecimal newInvoiceAmount = dbProduct.getInvoiceAmount().add(currentInvoiceAmount);
+
+ // 璁＄畻鏈紑绁�
+ BigDecimal newNoInvoiceNum = dbProduct.getQuantity().subtract(newInvoiceNum);
+
+ BigDecimal newNoInvoiceAmount = dbProduct.getTaxInclusiveTotalPrice().subtract(newInvoiceAmount);
+
+ if (newNoInvoiceNum.compareTo(BigDecimal.ZERO) < 0
+ || newNoInvoiceAmount.compareTo(BigDecimal.ZERO) < 0) {
+ throw new RuntimeException("寮�绁ㄦ暟閲忔垨閲戦瓒呰繃鍚堝悓鎬婚噺");
+ }
+
+ // 鏇存柊 sales_ledger_product
+ salesLedgerProductMapper.update(
+ null,
+ new LambdaUpdateWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getId, dbProduct.getId())
+ .set(SalesLedgerProduct::getInvoiceNum, newInvoiceNum)
+ .set(SalesLedgerProduct::getInvoiceAmount, newInvoiceAmount)
+ .set(SalesLedgerProduct::getNoInvoiceNum, newNoInvoiceNum)
+ .set(SalesLedgerProduct::getNoInvoiceAmount, newNoInvoiceAmount)
+ );
+
+ InvoiceRegistrationProduct invoiceRegistrationProduct = new InvoiceRegistrationProduct();
+ BeanUtils.copyProperties(dbProduct, invoiceRegistrationProduct);
+
+ invoiceRegistrationProduct.setId(null);
+ invoiceRegistrationProduct.setSalesLedgerId(salesLedgerDto.getId().intValue());
+ invoiceRegistrationProduct.setInvoiceRegistrationId(invoiceRegistration.getId());
+ invoiceRegistrationProduct.setSalesLedgerProductId(dbProduct.getId().intValue());
+ invoiceRegistrationProduct.setInvoiceNum(currentInvoiceNum);
+ invoiceRegistrationProduct.setInvoiceAmount(currentInvoiceAmount);
+ invoiceRegistrationProduct.setNoInvoiceAmount(newNoInvoiceAmount);
+
+ invoiceRegistrationProductMapper.insert(invoiceRegistrationProduct);
+
+ InvoiceLedger invoiceLedger = new InvoiceLedger();
+ invoiceLedger.setInvoiceDate(salesLedgerDto.getIssueDate());
+ invoiceLedger.setInvoiceRegistrationProductId(invoiceRegistrationProduct.getId());
+ invoiceLedger.setInvoiceTotal(currentInvoiceAmount);
+ invoiceLedger.setInvoiceNo(salesLedgerDto.getInvoiceNo());
+ invoiceLedger.setCreateUser(SecurityUtils.getUserId().intValue());
+ invoiceLedger.setInvoicePerson(dbProduct.getRegister());
+
+ invoiceLedgerMapper.insert(invoiceLedger);
}
}
--
Gitblit v1.9.3