From 3946d710296cd433660af7a2b7d94a66cf4a10e9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 14:15:52 +0800
Subject: [PATCH] yys 修改发货模块
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceRegistrationServiceImpl.java | 164 +++++++++++++++++++++++++++++-------------------------
1 files changed, 88 insertions(+), 76 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 baaeee9..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,22 +2,22 @@
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.basic.excel.SupplierManageExcelDto;
+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.InvoiceRegistrationMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductRecordMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationRecordMapper;
+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.InvoiceRegistrationProductRecord;
-import com.ruoyi.sales.pojo.InvoiceRegistrationRecord;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.InvoiceRegistrationService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -41,86 +41,98 @@
private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
@Autowired
- private InvoiceRegistrationRecordMapper invoiceRegistrationRecordMapper;
+ private SalesLedgerProductMapper salesLedgerProductMapper;
@Autowired
- private InvoiceRegistrationProductRecordMapper invoiceRegistrationProductRecordMapper;
-
+ private InvoiceLedgerMapper invoiceLedgerMapper;
/**
- * 寮�绁ㄧ櫥璁版柊澧�
- * @param invoiceRegistrationDto
+ * 寮�绁ㄧ櫥璁拌褰曟柊澧�
+ * @param salesLedgerDto
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void invoiceRegistrationSaveOrUpdate(InvoiceRegistrationDto invoiceRegistrationDto) {
- List<InvoiceRegistrationProductDto> productDtoList = invoiceRegistrationDto.getProductDtoList();
- Integer salesLedgerId = invoiceRegistrationDto.getSalesLedgerId();
- if (null == salesLedgerId){
- throw new RuntimeException("鏈叧鑱旈攢鍞悎鍚�");
+ 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.isEmpty(productData)) {
+ return;
}
- QueryWrapper<InvoiceRegistration> inRegWrapper = new QueryWrapper<>();
- inRegWrapper.eq("sales_ledger_id", salesLedgerId);
- InvoiceRegistration invoiceRegistration = invoiceRegistrationMapper.selectOne(inRegWrapper);
- Integer invoiceRegistrationId = null;
- // 鍒ゆ柇鏄惁宸茬粡鍋氳繃鐧昏锛屽鏋滄湁鍚堝苟锛屽鏋滄病鏈夋柊澧�
- if(ObjectUtils.isEmpty(invoiceRegistration)){
- InvoiceRegistration insertInvocieReg = new InvoiceRegistration();
- BeanUtils.copyProperties(invoiceRegistrationDto, insertInvocieReg);
- invoiceRegistrationMapper.insert(insertInvocieReg);
- invoiceRegistrationId = insertInvocieReg.getId();
- }else {
- invoiceRegistrationId = invoiceRegistration.getId();
- }
- // 鏌ヨ浜у搧鏄惁宸茬粡鐧昏
- if(CollectionUtils.isNotEmpty(productDtoList)){
- QueryWrapper<InvoiceRegistrationProduct> inRegProductWrapper = new QueryWrapper<>();
- inRegProductWrapper.eq("invoice_registration_id", invoiceRegistrationId);
- List<InvoiceRegistrationProduct> invoiceRegistrationProductList = invoiceRegistrationProductMapper.selectList(inRegProductWrapper);
- if(CollectionUtils.isNotEmpty(invoiceRegistrationProductList)){
- // 鎵归噺鏇存柊
- for (InvoiceRegistrationProduct invoiceRegistrationProduct : invoiceRegistrationProductList) {
- for (InvoiceRegistrationProductDto invoiceRegistrationProductDto : productDtoList) {
- if( null != invoiceRegistrationProductDto.getId() && null != invoiceRegistrationProduct.getSalesLedgerProductId()
- && invoiceRegistrationProductDto.getId() == invoiceRegistrationProduct.getSalesLedgerProductId().longValue() ){
- // 璁＄畻宸插紑绁ㄦ暟
- invoiceRegistrationProduct.setInvoiceNum(invoiceRegistrationProduct.getInvoiceNum() + invoiceRegistrationProductDto.getInvoiceNum());
- // 璁＄畻宸插紑绁ㄩ噾棰�
- invoiceRegistrationProduct.setInvoiceAmount(invoiceRegistrationProduct.getInvoiceAmount().add(invoiceRegistrationProductDto.getInvoiceAmount()));
-// // 璁＄畻鏈紑绁ㄦ暟
- invoiceRegistrationProduct.setNoInvoiceNum(invoiceRegistrationProductDto.getNoInvoiceNum());
-// // 璁＄畻鏈紑绁ㄩ噾棰� 鍚◣鎬讳环-寮�绁ㄩ噾棰�
- invoiceRegistrationProduct.setNoInvoiceAmount(invoiceRegistrationProductDto.getNoInvoiceAmount());
- invoiceRegistrationProductMapper.updateById(invoiceRegistrationProduct);
- }
- }
- }
- }else {
- // 鎵归噺鎻掑叆
- for (InvoiceRegistrationProductDto invoiceRegistrationProductDto : productDtoList) {
- InvoiceRegistrationProduct invoiceRegistrationProduct = new InvoiceRegistrationProduct();
- BeanUtils.copyProperties(invoiceRegistrationProductDto, invoiceRegistrationProduct);
- invoiceRegistrationProduct.setInvoiceRegistrationId(invoiceRegistrationId);
- invoiceRegistrationProduct.setSalesLedgerProductId(invoiceRegistrationProductDto.getId());
- invoiceRegistrationProduct.setId(null);
- invoiceRegistrationProductMapper.insert(invoiceRegistrationProduct);
- }
+
+ for (SalesLedgerProduct productDatum : productData) {
+ // 鏈寮�绁ㄦ暟 / 閲戦
+ BigDecimal currentInvoiceNum = productDatum.getCurrentInvoiceNum();
+ BigDecimal currentInvoiceAmount = productDatum.getCurrentInvoiceAmount();
+
+ if (currentInvoiceNum == null || BigDecimal.ZERO.compareTo(currentInvoiceNum) == 0) {
+ continue;
}
- }
- // 淇濆瓨鏈寮�绁ㄧ櫥璁拌褰�
- InvoiceRegistrationRecord invoiceRegistrationRecord = new InvoiceRegistrationRecord();
- BeanUtils.copyProperties(invoiceRegistrationDto, invoiceRegistrationRecord);
- invoiceRegistrationRecordMapper.insert(invoiceRegistrationRecord);
- if(CollectionUtils.isNotEmpty(productDtoList)){
- for (InvoiceRegistrationProductDto invoiceRegistrationProductDto : productDtoList) {
- InvoiceRegistrationProductRecord invoiceRegistrationProductRecord = new InvoiceRegistrationProductRecord();
- BeanUtils.copyProperties(invoiceRegistrationProductDto, invoiceRegistrationProductRecord);
- invoiceRegistrationProductRecord.setInvoiceRegistrationRecordId(invoiceRegistrationRecord.getId());
- invoiceRegistrationProductRecord.setSalesLedgerProductId(invoiceRegistrationProductDto.getId());
- invoiceRegistrationProductRecord.setId(null);
- invoiceRegistrationProductRecordMapper.insert(invoiceRegistrationProductRecord);
+
+ 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