From 83383b2b94d34c1986769d20c8cdd6149e46739c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 10 六月 2025 11:39:34 +0800
Subject: [PATCH] 开票登记编辑功能开发
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 204 insertions(+), 20 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 298f44a..2d1bdf7 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -5,15 +5,13 @@
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.dto.SupplierManageDto;
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.pojo.InvoiceLedger;
-import com.ruoyi.sales.pojo.InvoiceLedgerFile;
+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;
@@ -26,8 +24,12 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
-import java.util.Collections;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.util.Comparator;
import java.util.List;
+import java.util.Objects;
import java.util.UUID;
import java.util.stream.Collectors;
@@ -43,34 +45,76 @@
@Autowired
private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
+ @Autowired
+ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+
+ @Autowired
+ private ReceiptPaymentMapper receiptPaymentMapper;
+
+ @Autowired
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
/**
* 寮�绁ㄥ彴璐︽柊澧�
- * @param invoiceLedgerDto
+ * @param productDto
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public int invoiceLedgerSaveOrUpdate(InvoiceLedgerDto invoiceLedgerDto) {
- InvoiceLedger invoiceLedger = new InvoiceLedger();
- BeanUtils.copyProperties(invoiceLedgerDto, invoiceLedger);
+ public int invoiceLedgerSaveOrUpdate(InvoiceRegistrationProductDto productDto) {
+ // 鍒ゆ柇鏄惁宸茬粡鏂板寮�绁ㄥ彴璐�
+ QueryWrapper<InvoiceLedger> ledgerQueryWrapper = new QueryWrapper<>();
+ ledgerQueryWrapper.eq("invoice_registration_product_id", productDto.getId());
+ InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectOne(ledgerQueryWrapper);
int result;
- if(invoiceLedgerDto.getId() == null){
+ if(ObjectUtils.isEmpty(invoiceLedger)){
+ invoiceLedger = new InvoiceLedger();
+ invoiceLedger.setInvoiceRegistrationProductId(productDto.getId());
+ invoiceLedger.setInvoiceNo(productDto.getInvoiceNo());
+ invoiceLedger.setInvoiceTotal(productDto.getInvoiceTotal());
+ invoiceLedger.setInvoiceDate(productDto.getInvoiceDate());
+ 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.getTaxInclusiveTotalPrice(), 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.getInvoiceAmount());
+ invoiceRegistrationProduct.setNoInvoiceNum(currentNoInvoiceNum);
+ invoiceRegistrationProduct.setNoInvoiceAmount(currentNoInvoiceAmount);
+ invoiceRegistrationProductMapper.updateById(invoiceRegistrationProduct);
+
+ invoiceLedger.setInvoiceNo(productDto.getInvoiceNo());
+ invoiceLedger.setInvoiceTotal(productDto.getInvoiceTotal());
+ invoiceLedger.setInvoiceDate(productDto.getInvoiceDate());
+ invoiceLedger.setInvoicePerson(productDto.getInvoicePerson());
result = invoiceLedgerMapper.updateById(invoiceLedger);
//鍒犻櫎鎵�鏈夐檮浠跺叧鑱�
LambdaQueryWrapper<InvoiceLedgerFile> delWrapper = new LambdaQueryWrapper<>();
- delWrapper.eq(InvoiceLedgerFile::getInvoiceLedgerId, invoiceLedgerDto.getId());
+ delWrapper.eq(InvoiceLedgerFile::getInvoiceLedgerId, invoiceLedger.getId());
invoiceLedgerFileMapper.delete(delWrapper);
}
- List<FileVo> fileList = invoiceLedgerDto.getFileList();
+ List<FileVo> fileList = productDto.getFileList();
if(CollectionUtils.isNotEmpty(fileList)){
- fileList.forEach(fileVo -> {
+ for (FileVo fileVo : fileList) {
InvoiceLedgerFile invoiceLedgerFile = new InvoiceLedgerFile();
BeanUtils.copyProperties(fileVo, invoiceLedgerFile);
invoiceLedgerFile.setInvoiceLedgerId(invoiceLedger.getId());
invoiceLedgerFileMapper.insert(invoiceLedgerFile);
- });
+ }
}
return result;
}
@@ -139,13 +183,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;
@@ -191,11 +235,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);
});
}
@@ -210,4 +260,138 @@
return invoiceLedgerMapper.invoiceLedgerList(invoiceLedgerDto);
}
+ /**
+ * 瀹㈡埛閿�鍞褰�
+ * @param page
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @Override
+ public IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ IPage<InvoiceLedgerDto> invoiceLedgerDtoIPage = invoiceLedgerMapper.invoiceLedgerSalesAccount(page, invoiceLedgerDto);
+ return invoiceLedgerDtoIPage;
+ }
+
+ @Override
+ public BigDecimal getInvoiceAmount() {
+ LocalDate now = LocalDate.now();
+ YearMonth currentMonth = YearMonth.from(now);
+
+ // 鍒涘缓LambdaQueryWrapper
+ LambdaQueryWrapper<InvoiceLedger> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.ge(InvoiceLedger::getInvoiceDate, currentMonth.atDay(1).atStartOfDay()) // 澶т簬绛変簬鏈湀绗竴澶�
+ .lt(InvoiceLedger::getInvoiceDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 灏忎簬涓嬫湀绗竴澶�
+
+ // 鎵ц鏌ヨ骞惰绠楁�诲拰
+ List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(queryWrapper);
+
+ BigDecimal totalContractAmount = invoiceLedgers.stream()
+ .map(InvoiceLedger::getInvoiceTotal)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ return totalContractAmount;
+ }
+
+ /**
+ * 寮�绁ㄧ櫥璁颁骇鍝佸垎椤垫煡璇�
+ * @param page
+ * @param registrationProductDto
+ * @return
+ */
+ @Override
+ public IPage<InvoiceRegistrationProductDto> registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
+ return invoiceRegistrationProductMapper.invoiceRegistrationProductPage(page,registrationProductDto);
+ }
+
+ /**
+ * 浜у搧寮�绁ㄥ彴璐﹁鎯�
+ * @param id
+ * @return
+ */
+ @Override
+ public InvoiceRegistrationProductDto invoiceLedgerProductDetail(Integer id) {
+ InvoiceRegistrationProductDto invoiceRegistrationProductDto = invoiceLedgerMapper.invoiceLedgerProductInfo(id);
+ if(ObjectUtils.isEmpty(invoiceRegistrationProductDto)){
+ throw new RuntimeException("浜у搧寮�绁ㄥ彴璐︽煡鎵惧け璐�");
+ }
+ // 鏌ヨ闄勪欢
+ QueryWrapper<InvoiceLedgerFile> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("invoice_ledger_id", invoiceRegistrationProductDto.getInvoiceLedgerId());
+ List<InvoiceLedgerFile> invoiceLedgerFileList = invoiceLedgerFileMapper.selectList(queryWrapper);
+ List<FileVo> fileList = invoiceLedgerFileList.stream().map(item -> {
+ FileVo fileVo = new FileVo();
+ BeanUtils.copyProperties(item, fileVo);
+ return fileVo;
+ }).collect(Collectors.toList());
+ invoiceRegistrationProductDto.setFileList(fileList);
+ 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> 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);
+ int index = -1;
+ for (int i = 0; i < invoiceRegistrationProductList.size(); i++) {
+ InvoiceRegistrationProduct currentInvoiceRegProduct = invoiceRegistrationProductList.get(i);
+ if(invoiceRegistrationProduct.getId() == 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(newInvoiceRegistrationProductList.get(newInvoiceRegistrationProductList.size()-1).getNoInvoiceNum());
+ salesLedgerProduct.setNoInvoiceAmount(newInvoiceRegistrationProductList.get(newInvoiceRegistrationProductList.size()-1).getNoInvoiceAmount());
+ }
+ salesLedgerProductMapper.updateById(salesLedgerProduct);
+ }
}
--
Gitblit v1.9.3