From fea3d6cbb624a3c9df6e1ae344a10b71110be439 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 26 九月 2025 15:37:03 +0800
Subject: [PATCH] Merge branch 'pim_ywx'
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 200 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
index f561a72..4722ac4 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -5,19 +5,14 @@
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.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.vo.FileVo;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.excel.InvoiceLedgerExcelDto;
-import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
-import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
-import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
-import com.ruoyi.sales.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceLedgerFile;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import com.ruoyi.sales.pojo.ReceiptPayment;
+import com.ruoyi.sales.mapper.*;
+import com.ruoyi.sales.pojo.*;
import com.ruoyi.sales.service.InvoiceLedgerService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -33,7 +28,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
@@ -53,6 +48,14 @@
@Autowired
private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
+ @Autowired
+ private ReceiptPaymentMapper receiptPaymentMapper;
+
+ @Autowired
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+ @Autowired
+ private CommonFileMapper commonFileMapper;
/**
* 寮�绁ㄥ彴璐︽柊澧�
@@ -76,6 +79,27 @@
invoiceLedger.setInvoicePerson(productDto.getInvoicePerson());
result = invoiceLedgerMapper.insert(invoiceLedger);
}else {
+ // 淇敼sale_leger_product
+ InvoiceRegistrationProduct invoiceRegistrationProduct = invoiceRegistrationProductMapper.selectById(productDto.getId());
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(invoiceRegistrationProduct.getSalesLedgerProductId());
+
+ BigDecimal invoiceNum = productDto.getInvoiceTotal().divide(invoiceRegistrationProduct.getTaxInclusiveUnitPrice(), 2, BigDecimal.ROUND_HALF_UP);
+ //璁＄畻 鏈紑绁ㄦ暟/鏈紑绁ㄩ噾棰�
+ BigDecimal noInvoiceAmount = salesLedgerProduct.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount()).subtract(productDto.getInvoiceTotal());
+ BigDecimal noInvoiceNum = salesLedgerProduct.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum()).subtract(invoiceNum);
+ salesLedgerProduct.setNoInvoiceAmount(noInvoiceAmount);
+ salesLedgerProduct.setNoInvoiceNum(noInvoiceNum);
+ salesLedgerProductMapper.updateById(salesLedgerProduct);
+
+ // 淇敼褰撳墠浜у搧寮�绁ㄧ櫥璁拌褰曟暟鎹�
+ BigDecimal currentNoInvoiceNum = invoiceRegistrationProduct.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum()).subtract(invoiceNum);
+ BigDecimal currentNoInvoiceAmount = invoiceRegistrationProduct.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount()).subtract(productDto.getInvoiceTotal());
+ invoiceRegistrationProduct.setInvoiceNum(invoiceNum);
+ invoiceRegistrationProduct.setInvoiceAmount(productDto.getInvoiceTotal());
+ invoiceRegistrationProduct.setNoInvoiceNum(currentNoInvoiceNum);
+ invoiceRegistrationProduct.setNoInvoiceAmount(currentNoInvoiceAmount);
+ invoiceRegistrationProductMapper.updateById(invoiceRegistrationProduct);
+
invoiceLedger.setInvoiceNo(productDto.getInvoiceNo());
invoiceLedger.setInvoiceTotal(productDto.getInvoiceTotal());
invoiceLedger.setInvoiceDate(productDto.getInvoiceDate());
@@ -162,13 +186,13 @@
/**
* 闄勪欢涓嬭浇
* @param response
- * @param invoiceLedgerDto
+ * @param invoiceRegistrationProductDto
* @return
*/
@Override
- public void invoiceLedgerExport(HttpServletResponse response, InvoiceLedgerDto invoiceLedgerDto) {
- List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoiceLedgerList(invoiceLedgerDto);
- List<InvoiceLedgerExcelDto> invoiceLedgerExcelDtoList = invoiceLedgerDtoList.stream().map(item -> {
+ public void invoiceLedgerExport(HttpServletResponse response, InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
+ List<InvoiceRegistrationProductDto> invoiceRegistrationProductList = invoiceRegistrationProductMapper.invoiceRegistrationProductList(invoiceRegistrationProductDto);
+ List<InvoiceLedgerExcelDto> invoiceLedgerExcelDtoList = invoiceRegistrationProductList.stream().map(item -> {
InvoiceLedgerExcelDto invoiceLedgerExcelDto = new InvoiceLedgerExcelDto();
BeanUtils.copyProperties(item, invoiceLedgerExcelDto);
return invoiceLedgerExcelDto;
@@ -214,11 +238,17 @@
if(CollectionUtils.isEmpty(invoiceLedgerDto.getFileList())){
throw new RuntimeException("缂哄皯鏂囦欢淇℃伅");
}
+ QueryWrapper<InvoiceLedger> ledgerQueryWrapper = new QueryWrapper<>();
+ ledgerQueryWrapper.eq("invoice_registration_product_id", invoiceLedgerDto.getId());
+ InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectOne(ledgerQueryWrapper);
+ if(ObjectUtils.isEmpty(invoiceLedger)){
+ throw new RuntimeException("寮�绁ㄥ彴璐︽湭鐧昏");
+ }
List<FileVo> fileList = invoiceLedgerDto.getFileList();
fileList.forEach(fileVo -> {
InvoiceLedgerFile invoiceLedgerFile = new InvoiceLedgerFile();
BeanUtils.copyProperties(fileVo, invoiceLedgerFile);
- invoiceLedgerFile.setInvoiceLedgerId(invoiceLedgerDto.getId());
+ invoiceLedgerFile.setInvoiceLedgerId(invoiceLedger.getId());
invoiceLedgerFileMapper.insert(invoiceLedgerFile);
});
}
@@ -242,20 +272,6 @@
@Override
public IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
IPage<InvoiceLedgerDto> invoiceLedgerDtoIPage = invoiceLedgerMapper.invoiceLedgerSalesAccount(page, invoiceLedgerDto);
-// for (InvoiceLedgerDto record : invoiceLedgerDtoIPage.getRecords()) {
-// QueryWrapper<ReceiptPayment> queryWrapper = new QueryWrapper<>();
-// queryWrapper.eq("customer_id", record.getCustomerId());
-// List<ReceiptPayment> receiptPaymentList = receiptPaymentMapper.selectList(queryWrapper);
-// BigDecimal totalAmount = BigDecimal.ZERO;
-// if(!CollectionUtils.isEmpty(receiptPaymentList)){
-// for (ReceiptPayment receiptPayment : receiptPaymentList) {
-// totalAmount = totalAmount.add(receiptPayment.getInvoiceAmount());
-// }
-// }
-// BigDecimal unReceiptPaymentAmount = record.getInvoiceAmount().subtract(totalAmount);
-// record.setReceiptPaymentAmount(totalAmount);
-// record.setUnReceiptPaymentAmount(unReceiptPaymentAmount);
-// }
return invoiceLedgerDtoIPage;
}
@@ -272,13 +288,12 @@
// 鎵ц鏌ヨ骞惰绠楁�诲拰
List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(queryWrapper);
-// BigDecimal totalContractAmount = invoiceLedgers.stream()
-// .map(InvoiceLedger::getInvoiceAmount)
-// .filter(Objects::nonNull)
-// .reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-// return totalContractAmount;
- return null;
+ BigDecimal totalContractAmount = invoiceLedgers.stream()
+ .map(InvoiceLedger::getInvoiceTotal)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ return totalContractAmount;
}
/**
@@ -289,7 +304,15 @@
*/
@Override
public IPage<InvoiceRegistrationProductDto> registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
- return invoiceRegistrationProductMapper.invoiceRegistrationProductPage(page,registrationProductDto);
+ IPage<InvoiceRegistrationProductDto> invoiceRegistrationProductDtoIPage = invoiceRegistrationProductMapper.invoiceRegistrationProductPage(page, registrationProductDto);
+ if (registrationProductDto.getStatus()) {
+ invoiceRegistrationProductDtoIPage.getRecords().removeIf(invoiceRegistrationProduct -> !StringUtils.isEmpty(invoiceRegistrationProduct.getInvoiceNo()));
+ }
+ invoiceRegistrationProductDtoIPage.getRecords().forEach(invoiceRegistrationProductDto -> {
+ invoiceRegistrationProductDto.setCommonFiles(invoiceLedgerFileMapper.selectList(new QueryWrapper<InvoiceLedgerFile>().lambda()
+ .eq(InvoiceLedgerFile::getInvoiceLedgerId, invoiceRegistrationProductDto.getInvoiceLedgerId())));
+ });
+ return invoiceRegistrationProductDtoIPage;
}
/**
@@ -316,4 +339,145 @@
return invoiceRegistrationProductDto;
}
+ /**
+ * 寮�绁ㄥ彴璐﹀垹闄�
+ * @param invoiceRegistrationProductId
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void delInvoiceLedger(Integer invoiceRegistrationProductId) {
+ // 鍒ゆ柇鏄惁鏈夊洖娆捐褰�
+ List<ReceiptPayment> receiptPaymentList = receiptPaymentMapper.receiptPaymentListByProdRegId(invoiceRegistrationProductId);
+ if(!CollectionUtils.isEmpty(receiptPaymentList)){
+ throw new RuntimeException("璇峰厛鍒犻櫎鍥炴璁板綍");
+ }
+ // 鍒ゆ柇鏄惁鏈夊紑绁ㄧ櫥璁拌褰�
+ InvoiceRegistrationProduct invoiceRegistrationProduct = invoiceRegistrationProductMapper.selectById(invoiceRegistrationProductId);
+ if(ObjectUtils.isEmpty(invoiceRegistrationProduct)){
+ throw new RuntimeException("寮�绁ㄧ櫥璁拌褰曟煡鎵惧け璐�");
+ }
+ // 鍒ゆ柇璇ュ紑绁ㄥ彴璐︽槸鍚︽湭褰撴湀锛屽鏋滀负褰撴湀鐩存帴鍒犻櫎鍚﹀垯鏂板涓�鏉＄浉鍙嶈礋鏁版暟鎹�
+ QueryWrapper<InvoiceLedger> ledgerQueryWrapper = new QueryWrapper<>();
+ ledgerQueryWrapper.eq("invoice_registration_product_id", invoiceRegistrationProductId);
+ InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectOne(ledgerQueryWrapper);
+ if(ObjectUtils.isEmpty(invoiceLedger)){
+ throw new RuntimeException("寮�绁ㄥ彴璐︽煡鎵惧け璐�");
+ }
+ if( invoiceLedger.getInvoiceDate() == null){
+ dealCurrentMonthDel(invoiceRegistrationProductId,invoiceRegistrationProduct);
+ return;
+ }
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate today = LocalDate.now();
+ // 浣跨敤YearMonth姣旇緝骞翠唤鍜屾湀浠芥槸鍚︾浉鍚�
+ boolean equalsFlag = YearMonth.from(invoiceLedger.getInvoiceDate()).equals(YearMonth.from(today));
+ if(equalsFlag){
+ dealCurrentMonthDel(invoiceRegistrationProductId,invoiceRegistrationProduct);
+ }else {
+ dealOtherMonthDel(invoiceRegistrationProduct,invoiceLedger);
+ }
+ }
+
+ /**
+ * 澶勭悊褰撴湀寮�绁ㄥ彴璐﹀垹闄�
+ * @param invoiceRegistrationProductId
+ * @param invoiceRegistrationProduct
+ */
+ private void dealCurrentMonthDel(Integer invoiceRegistrationProductId,InvoiceRegistrationProduct invoiceRegistrationProduct){
+ // 鍒犻櫎寮�绁ㄥ彴璐�
+ QueryWrapper<InvoiceLedger> delMapper = new QueryWrapper<>();
+ delMapper.eq("invoice_registration_product_id", invoiceRegistrationProductId);
+ invoiceLedgerMapper.delete(delMapper);
+ // 鍒犻櫎寮�绁ㄧ櫥璁板苟鍥炴粴
+ QueryWrapper<InvoiceRegistrationProduct> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("sales_ledger_id", invoiceRegistrationProduct.getSalesLedgerId());
+ queryWrapper.eq("sales_ledger_product_id", invoiceRegistrationProduct.getSalesLedgerProductId());
+ queryWrapper.orderByAsc("create_time");
+ List<InvoiceRegistrationProduct> invoiceRegistrationProductList = invoiceRegistrationProductMapper.selectList(queryWrapper);
+// InvoiceRegistrationProduct invoiceRegistrationProduct = invoiceRegistrationProductMapper.selectById(invoiceRegistrationProductId);
+ int index = -1;
+ for (int i = 0; i < invoiceRegistrationProductList.size(); i++) {
+ InvoiceRegistrationProduct currentInvoiceRegProduct = invoiceRegistrationProductList.get(i);
+ if(invoiceRegistrationProduct.getId().equals(currentInvoiceRegProduct.getId())){
+ index = i;
+ }
+ }
+ if(index == -1){
+ return;
+ }
+ for (int i = index + 1; i < invoiceRegistrationProductList.size(); i++) {
+ InvoiceRegistrationProduct currentInvoiceRegProduct = invoiceRegistrationProductList.get(i);
+ // 鍥炴粴鏈紑绁ㄦ暟/鏈紑绁ㄩ噾棰�
+ BigDecimal noInvoiceAmount = currentInvoiceRegProduct.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount());
+ BigDecimal noInvoiceNum = currentInvoiceRegProduct.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum());
+ currentInvoiceRegProduct.setNoInvoiceAmount(noInvoiceAmount);
+ currentInvoiceRegProduct.setNoInvoiceNum(noInvoiceNum);
+ invoiceRegistrationProductMapper.updateById(currentInvoiceRegProduct);
+ }
+ invoiceRegistrationProductMapper.deleteById(invoiceRegistrationProductId);
+ // 淇敼sale_product鏁版嵁
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(invoiceRegistrationProduct.getSalesLedgerProductId());
+ QueryWrapper<InvoiceRegistrationProduct> newQueryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("sales_ledger_id", invoiceRegistrationProduct.getSalesLedgerId());
+ queryWrapper.eq("sales_ledger_product_id", invoiceRegistrationProduct.getSalesLedgerProductId());
+ queryWrapper.orderByAsc("create_time");
+ List<InvoiceRegistrationProduct> newInvoiceRegistrationProductList = invoiceRegistrationProductMapper.selectList(newQueryWrapper);
+ if(CollectionUtils.isEmpty(newInvoiceRegistrationProductList)){
+ salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ }else {
+ salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum()));
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount()));
+ }
+ salesLedgerProductMapper.updateById(salesLedgerProduct);
+ }
+
+ /**
+ * 澶勭悊鍏朵粬鏈堜唤寮�绁ㄥ彴璐﹀垹闄�
+ * @param invoiceRegistrationProduct
+ * @param invoiceLedger
+ */
+ private void dealOtherMonthDel(InvoiceRegistrationProduct invoiceRegistrationProduct,InvoiceLedger invoiceLedger ){
+ InvoiceRegistrationProduct copyRegProduct = new InvoiceRegistrationProduct();
+ BeanUtils.copyProperties(invoiceRegistrationProduct, copyRegProduct);
+ BigDecimal invoiceNum = copyRegProduct.getInvoiceNum().negate();
+ BigDecimal invoiceAmount = copyRegProduct.getInvoiceAmount().negate();
+ // invoice_registration_product
+ // 鍒犻櫎寮�绁ㄧ櫥璁板苟鍥炴粴
+ QueryWrapper<InvoiceRegistrationProduct> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("sales_ledger_id", invoiceRegistrationProduct.getSalesLedgerId());
+ queryWrapper.eq("sales_ledger_product_id", invoiceRegistrationProduct.getSalesLedgerProductId());
+ queryWrapper.orderByAsc("create_time");
+ List<InvoiceRegistrationProduct> invoiceRegistrationProductList = invoiceRegistrationProductMapper.selectList(queryWrapper);
+ InvoiceRegistrationProduct lastInvoiceRegistrationProduct = invoiceRegistrationProductList.get(invoiceRegistrationProductList.size() - 1);
+ BigDecimal noInvoiceNum = lastInvoiceRegistrationProduct.getNoInvoiceNum().subtract(invoiceNum);
+ BigDecimal noInvoiceAmount = lastInvoiceRegistrationProduct.getNoInvoiceAmount().subtract(invoiceAmount);
+ copyRegProduct.setInvoiceNum(invoiceNum);
+ copyRegProduct.setInvoiceAmount(invoiceAmount);
+ copyRegProduct.setNoInvoiceNum(noInvoiceNum);
+ copyRegProduct.setNoInvoiceAmount(noInvoiceAmount);
+ copyRegProduct.setId(null);
+ invoiceRegistrationProductMapper.insert(copyRegProduct);
+ // 澶嶅埗寮�绁ㄥ彴璐�
+ InvoiceLedger invoiceLedgerCopy = new InvoiceLedger();
+ BeanUtils.copyProperties(invoiceLedger, invoiceLedgerCopy);
+ invoiceLedgerCopy.setInvoiceRegistrationProductId(copyRegProduct.getId());
+ BigDecimal invoiceTotal = invoiceLedgerCopy.getInvoiceTotal().negate();
+ invoiceLedgerCopy.setInvoiceTotal(invoiceTotal);
+ invoiceLedgerCopy.setId(null);
+ invoiceLedgerCopy.setInvoiceDate(LocalDate.now());
+ invoiceLedgerMapper.insert(invoiceLedgerCopy);
+ // 鏇存柊sales_leger_product
+ QueryWrapper<SalesLedgerProduct> salesLedgerProductQueryWrapper = new QueryWrapper<>();
+ salesLedgerProductQueryWrapper.eq("id", invoiceRegistrationProduct.getSalesLedgerProductId());
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectOne(salesLedgerProductQueryWrapper);
+ salesLedgerProduct.setNoInvoiceNum(noInvoiceNum);
+ salesLedgerProduct.setNoInvoiceAmount(noInvoiceAmount);
+ BigDecimal newInvoiceNum = salesLedgerProduct.getInvoiceNum().add(invoiceNum);
+ BigDecimal newInvocieAmount = salesLedgerProduct.getInvoiceAmount().add(invoiceAmount);
+ salesLedgerProduct.setInvoiceNum(newInvoiceNum);
+ salesLedgerProduct.setInvoiceAmount(newInvocieAmount);
+ salesLedgerProductMapper.updateById(salesLedgerProduct);
+ }
}
--
Gitblit v1.9.3