From a1454f4b28db363ca4c4a6ea182d3aab95dc9518 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 24 四月 2026 11:17:50 +0800
Subject: [PATCH] fix(sales): 修正新增销售订单下发生产计划
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 104 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 79 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 a21870a..fefe144 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java
@@ -2,44 +2,48 @@
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.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;
import com.ruoyi.sales.dto.SalesLedgerDto;
import com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto;
+import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceRegistration;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.InvoiceRegistrationService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
import java.util.stream.Collectors;
@Service
+@RequiredArgsConstructor
public class InvoiceRegistrationServiceImpl extends ServiceImpl<InvoiceRegistrationMapper, InvoiceRegistration> implements InvoiceRegistrationService {
- @Autowired
- private InvoiceRegistrationMapper invoiceRegistrationMapper;
+ private final InvoiceRegistrationMapper invoiceRegistrationMapper;
- @Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
- @Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private final InvoiceLedgerMapper invoiceLedgerMapper;
/**
* 寮�绁ㄧ櫥璁拌褰曟柊澧�
@@ -49,31 +53,81 @@
@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();
- if(CollectionUtils.isNotEmpty(productData)){
- for (SalesLedgerProduct productDatum : productData) {
- // 濡傛灉寮�绁ㄦ暟涓�0 璺宠繃
- BigDecimal currentInvoiceNum = productDatum.getCurrentInvoiceNum();
- if(null != currentInvoiceNum && BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0){
- continue;
- }
- 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);
+ 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 noInvoiceAmount = dbProduct.getNoInvoiceAmount();
+ BigDecimal noInvoiceNum = dbProduct.getNoInvoiceNum();
+
+ // 鍓╀綑鏈紑绁�
+ BigDecimal newNoInvoiceNum = noInvoiceNum.subtract(currentInvoiceNum);
+ BigDecimal newNoInvoiceAmount = noInvoiceAmount.subtract(currentInvoiceAmount);
+
+
+ if (newNoInvoiceAmount.compareTo(BigDecimal.ZERO) < 0) {
+ throw new RuntimeException("寮�绁ㄦ暟閲忔垨閲戦瓒呰繃鍚堝悓鎬婚噺");
+ }
+
+ // 鏇存柊 sales_ledger_product
+ salesLedgerProductMapper.update(
+ null,
+ new LambdaUpdateWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getId, dbProduct.getId())
+ .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