From e595c86c223563a178b9bb0d0dcb8b0c3c3771c0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 16 一月 2026 16:20:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 147 insertions(+), 32 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 2d1bdf7..614fc20 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -5,6 +5,7 @@
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;
@@ -53,6 +54,8 @@
@Autowired
private SalesLedgerProductMapper salesLedgerProductMapper;
+ @Autowired
+ private CommonFileMapper commonFileMapper;
/**
* 寮�绁ㄥ彴璐︽柊澧�
@@ -80,7 +83,7 @@
InvoiceRegistrationProduct invoiceRegistrationProduct = invoiceRegistrationProductMapper.selectById(productDto.getId());
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(invoiceRegistrationProduct.getSalesLedgerProductId());
- BigDecimal invoiceNum = productDto.getInvoiceTotal().divide(invoiceRegistrationProduct.getTaxInclusiveTotalPrice(), 2, BigDecimal.ROUND_HALF_UP);
+ 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);
@@ -92,7 +95,7 @@
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.getInvoiceAmount());
+ invoiceRegistrationProduct.setInvoiceAmount(productDto.getInvoiceTotal());
invoiceRegistrationProduct.setNoInvoiceNum(currentNoInvoiceNum);
invoiceRegistrationProduct.setNoInvoiceAmount(currentNoInvoiceAmount);
invoiceRegistrationProductMapper.updateById(invoiceRegistrationProduct);
@@ -301,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;
}
/**
@@ -341,57 +352,161 @@
if(!CollectionUtils.isEmpty(receiptPaymentList)){
throw new RuntimeException("璇峰厛鍒犻櫎鍥炴璁板綍");
}
- // 鍒ゆ柇鏄惁鏈夊紑绁ㄥ彴璐�
+ // 鍒ゆ柇鏄惁鏈夊紑绁ㄧ櫥璁拌褰�
InvoiceRegistrationProduct invoiceRegistrationProduct = invoiceRegistrationProductMapper.selectById(invoiceRegistrationProductId);
if(ObjectUtils.isEmpty(invoiceRegistrationProduct)){
- throw new RuntimeException("寮�绁ㄥ彴璐︽煡鎵惧け璐�");
+ 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<InvoiceLedger> delLedgerWrapper = new QueryWrapper<>();
+ delLedgerWrapper.eq("invoice_registration_product_id", invoiceRegistrationProductId);
+ invoiceLedgerMapper.delete(delLedgerWrapper);
+
+ // 鏌ヨ褰撳墠浜у搧涓嬬殑鎵�鏈夊紑绁ㄧ櫥璁�
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);
- int index = -1;
- for (int i = 0; i < invoiceRegistrationProductList.size(); i++) {
- InvoiceRegistrationProduct currentInvoiceRegProduct = invoiceRegistrationProductList.get(i);
- if(invoiceRegistrationProduct.getId() == currentInvoiceRegProduct.getId()){
+ List<InvoiceRegistrationProduct> allList = invoiceRegistrationProductMapper.selectList(queryWrapper);
+
+ int index = -1;
+ for (int i = 0; i < allList.size(); i++) {
+ if (invoiceRegistrationProductId.equals(allList.get(i).getId())) {
index = i;
+ break;
}
}
- if(index == -1){
+ 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);
+
+ for (int i = index + 1; i < allList.size(); i++) {
+ InvoiceRegistrationProduct current = allList.get(i);
+
+ current.setNoInvoiceNum(current.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum()));
+ current.setNoInvoiceAmount(current.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount()));
+
+ invoiceRegistrationProductMapper.updateById(current);
}
+
+ // 鍒犻櫎褰撳墠寮�绁ㄧ櫥璁�
invoiceRegistrationProductMapper.deleteById(invoiceRegistrationProductId);
- // 淇敼sale_product鏁版嵁
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(invoiceRegistrationProduct.getSalesLedgerProductId());
+
+ // 鏌ヨ鍒犻櫎鍚庣殑鍓╀綑寮�绁ㄧ櫥璁�
QueryWrapper<InvoiceRegistrationProduct> newQueryWrapper = new QueryWrapper<>();
+ newQueryWrapper.eq("sales_ledger_id", invoiceRegistrationProduct.getSalesLedgerId());
+ newQueryWrapper.eq("sales_ledger_product_id", invoiceRegistrationProduct.getSalesLedgerProductId());
+ newQueryWrapper.orderByAsc("create_time");
+ List<InvoiceRegistrationProduct> remainList = invoiceRegistrationProductMapper.selectList(newQueryWrapper);
+
+ // 鏌ヨ閿�鍞彴璐︿骇鍝�
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(invoiceRegistrationProduct.getSalesLedgerProductId());
+
+ if (CollectionUtils.isEmpty(remainList)) {
+ // 娌℃湁浠讳綍寮�绁ㄨ褰曪紝鎭㈠鍒濆鐘舵��
+ salesLedgerProduct.setInvoiceNum(BigDecimal.ZERO);
+ salesLedgerProduct.setInvoiceAmount(BigDecimal.ZERO);
+ salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ } else {
+ salesLedgerProduct.setInvoiceNum(salesLedgerProduct.getInvoiceNum().subtract(invoiceRegistrationProduct.getInvoiceNum()));
+ salesLedgerProduct.setInvoiceAmount(salesLedgerProduct.getInvoiceAmount().subtract(invoiceRegistrationProduct.getInvoiceAmount()));
+ 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) {
+ //鏌ヨ鍘嗗彶寮�绁ㄧ櫥璁�
+ 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> newInvoiceRegistrationProductList = invoiceRegistrationProductMapper.selectList(newQueryWrapper);
- if(CollectionUtils.isEmpty(newInvoiceRegistrationProductList)){
- salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
- salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
- }else {
- salesLedgerProduct.setNoInvoiceNum(newInvoiceRegistrationProductList.get(newInvoiceRegistrationProductList.size()-1).getNoInvoiceNum());
- salesLedgerProduct.setNoInvoiceAmount(newInvoiceRegistrationProductList.get(newInvoiceRegistrationProductList.size()-1).getNoInvoiceAmount());
+ List<InvoiceRegistrationProduct> list = invoiceRegistrationProductMapper.selectList(queryWrapper);
+
+ if (CollectionUtils.isEmpty(list)) {
+ return;
}
+
+ InvoiceRegistrationProduct last = list.get(list.size() - 1);
+
+ BigDecimal negateInvoiceNum = invoiceRegistrationProduct.getInvoiceNum().negate();
+ BigDecimal negateInvoiceAmount = invoiceRegistrationProduct.getInvoiceAmount().negate();
+
+ InvoiceRegistrationProduct copy = new InvoiceRegistrationProduct();
+ BeanUtils.copyProperties(invoiceRegistrationProduct, copy);
+
+ copy.setId(null);
+ copy.setInvoiceNum(negateInvoiceNum);
+ copy.setInvoiceAmount(negateInvoiceAmount);
+
+ // 鏈紑绁� = 涓婁竴鏉� + 鏈鍐插洖鐨勬暟閲�
+ copy.setNoInvoiceNum(last.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum()));
+ copy.setNoInvoiceAmount(last.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount()));
+
+ invoiceRegistrationProductMapper.insert(copy);
+
+ // 澶嶅埗寮�绁ㄥ彴璐�
+ InvoiceLedger ledgerCopy = new InvoiceLedger();
+ BeanUtils.copyProperties(invoiceLedger, ledgerCopy);
+
+ ledgerCopy.setId(null);
+ ledgerCopy.setInvoiceRegistrationProductId(copy.getId());
+ ledgerCopy.setInvoiceTotal(invoiceLedger.getInvoiceTotal().negate());
+ ledgerCopy.setInvoiceDate(LocalDate.now());
+
+ invoiceLedgerMapper.insert(ledgerCopy);
+
+ // 鍥炴粴 sales_ledger_product
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(invoiceRegistrationProduct.getSalesLedgerProductId());
+
+ // 宸插紑绁�
+ salesLedgerProduct.setInvoiceNum(salesLedgerProduct.getInvoiceNum().add(negateInvoiceNum));
+ salesLedgerProduct.setInvoiceAmount(salesLedgerProduct.getInvoiceAmount().add(negateInvoiceAmount));
+
+ // 鏈紑绁�
+ salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getNoInvoiceNum().add(invoiceRegistrationProduct.getInvoiceNum()));
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getNoInvoiceAmount().add(invoiceRegistrationProduct.getInvoiceAmount()));
+
salesLedgerProductMapper.updateById(salesLedgerProduct);
}
+
}
--
Gitblit v1.9.3