From 6ff4a76f832db086690cdc4348f192d96aa9c9b6 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 19 一月 2026 16:35:34 +0800
Subject: [PATCH] feat(procurement): 添加质检关联入库
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 184 +++++++++++++++++++++++++++++++++------------
1 files changed, 135 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index 7e76aa9..1406667 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -21,6 +22,7 @@
import com.ruoyi.purchase.mapper.ProductRecordMapper;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.mapper.TicketRegistrationMapper;
+import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.pojo.TicketRegistration;
@@ -28,6 +30,7 @@
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import lombok.RequiredArgsConstructor;
@@ -47,10 +50,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -134,7 +134,7 @@
BeanUtils.copyProperties(ticketRegistrationDto, ticketRegistration);
ticketRegistration.setPurchaseContractNumber(purchaseLedger.getPurchaseContractNumber());
ticketRegistration.setTenantId(purchaseLedger.getTenantId());
- ticketRegistration.setIssueDate(ticketRegistrationDto.getIssueDate());
+ ticketRegistration.setIssueDate(ticketRegistrationDto.getEntryDate());
ticketRegistration.setContractAmount(purchaseLedger.getContractAmount());
ticketRegistration.setSalesLedgerId(purchaseLedger.getSalesLedgerId());
ticketRegistration.setEnterDate(ticketRegistrationDto.getEnterDate());
@@ -161,14 +161,22 @@
productRecord.setPurchaseLedgerId(ticketRegistrationDto.getPurchaseLedgerId());
productRecord.setCreatedAt(DateUtils.getNowDate());
BeanUtils.copyProperties(salesLedgerProduct, productRecord);
+ //鍚屾鏇存柊鍏朵粬鍓╀綑鏁伴噺鍜岄噾棰�
+ productRecordMapper.update(
+ null,
+ new LambdaUpdateWrapper<ProductRecord>()
+ .eq(ProductRecord::getPurchaseLedgerId, ticketRegistrationDto.getPurchaseLedgerId())
+ .set(ProductRecord::getFutureTickets, salesLedgerProduct.getFutureTickets())
+ .set(ProductRecord::getFutureTicketsAmount, salesLedgerProduct.getFutureTicketsAmount())
+ );
productRecord.setSaleLedgerProjectId(salesLedgerProduct.getId());
productRecord.setId(null);
productRecord.setType("2");
- insert = productRecordMapper.insert(productRecord);
+ insert += productRecordMapper.insert(productRecord);
}
- if (insert <= 0) {
- throw new RuntimeException("浜у搧寮�绁ㄦ暟閮戒负0锛岃妫�鏌�");
- }
+ }
+ if (insert <= 0) {
+ throw new RuntimeException("浜у搧寮�绁ㄦ暟閮戒负0锛岃妫�鏌�");
}
}
// 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
@@ -221,13 +229,10 @@
Path formalFilePath = formalDirPath.resolve(formalFilename);
try {
- // 鎵ц鏂囦欢杩佺Щ锛堜娇鐢ㄥ師瀛愭搷浣滅‘淇濆畨鍏ㄦ�э級
- Files.move(
- Paths.get(tempFile.getTempPath()),
- formalFilePath,
- StandardCopyOption.REPLACE_EXISTING,
- StandardCopyOption.ATOMIC_MOVE
- );
+
+ // 鍘熷瓙绉诲姩澶辫触锛屼娇鐢ㄥ鍒�+鍒犻櫎
+ Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);
+ Files.deleteIfExists(Paths.get(tempFile.getTempPath()));
log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
// 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛�
@@ -250,45 +255,118 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
public int delRegistration(Long[] ids) {
- // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰曞璞�
- LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- productRecordLambdaQueryWrapper.in(ProductRecord::getId, Arrays.asList(ids));
- List<ProductRecord> productRecords = productRecordMapper.selectList(productRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty(productRecords)){
+
+ // 鏌ヨ瑕佸垹闄ょ殑浜у搧鏉ョエ璁板綍
+ LambdaQueryWrapper<ProductRecord> productWrapper = new LambdaQueryWrapper<>();
+ productWrapper.in(ProductRecord::getId, Arrays.asList(ids));
+ List<ProductRecord> productRecords = productRecordMapper.selectList(productWrapper);
+
+ if (CollectionUtils.isEmpty(productRecords)) {
return 0;
}
- LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getId, productRecords.stream().map(ProductRecord::getTicketRegistrationId).collect(Collectors.toList()));
- List<TicketRegistration> ticketRegistrations = ticketRegistrationMapper.selectList(ticketRegistrationLambdaQueryWrapper);
- // 淇敼浜у搧淇℃伅
- for (ProductRecord productRecord : productRecords) {
- BigDecimal subtract = ticketRegistrations.get(0).getInvoiceAmount().subtract(productRecords.get(0).getTicketsAmount());
- // 灏忎簬绛変簬0鍒犻櫎 锛屽ぇ浜�0淇敼
- if(subtract.compareTo(BigDecimal.ZERO) <= 0){
- ticketRegistrationMapper.deleteById(ticketRegistrations.get(0));
- }else if(subtract.compareTo(BigDecimal.ZERO) > 0){
- ticketRegistrations.get(0).setInvoiceAmount(subtract);
- ticketRegistrationMapper.updateById(ticketRegistrations.get(0));
- }
- LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
- salesLedgerProductLambdaQueryWrapper.eq(SalesLedgerProduct::getId, productRecord.getSaleLedgerProjectId())
- .eq(SalesLedgerProduct::getType, 2);
- List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductLambdaQueryWrapper);
- if(!CollectionUtils.isEmpty(salesLedgerProducts)){
- for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
- salesLedgerProduct.setFutureTickets(salesLedgerProduct.getFutureTickets().add(productRecord.getTicketsNum()));
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getFutureTicketsAmount().add(productRecord.getTicketsAmount()));
- salesLedgerProductMapper.updateById(salesLedgerProduct);
+ // 鏀堕泦鍏宠仈ID
+ Set<Long> ticketRegistrationIds = productRecords.stream()
+ .map(ProductRecord::getTicketRegistrationId)
+ .collect(Collectors.toSet());
- }
+ Set<Long> salesLedgerProductIds = productRecords.stream()
+ .map(ProductRecord::getSaleLedgerProjectId)
+ .collect(Collectors.toSet());
+
+ // 鏌ヨ鏉ョエ鐧昏
+ List<TicketRegistration> ticketRegistrations =
+ ticketRegistrationMapper.selectBatchIds(ticketRegistrationIds);
+
+ // 澶勭悊鏉ョエ鐧昏閲戦銆佷粯娆炬祦姘�
+ for (TicketRegistration ticket : ticketRegistrations) {
+
+ // 璇ユ潵绁ㄧ櫥璁颁笅鎵�鏈変骇鍝佽褰�
+ List<ProductRecord> recordsOfTicket = productRecords.stream()
+ .filter(r -> r.getTicketRegistrationId().equals(ticket.getId()))
+ .collect(Collectors.toList());
+
+ // 璁＄畻瑕佸洖閫�鐨勯噾棰�
+ BigDecimal rollbackAmount = recordsOfTicket.stream()
+ .map(ProductRecord::getTicketsAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal remain = ticket.getInvoiceAmount().subtract(rollbackAmount);
+
+ if (remain.compareTo(BigDecimal.ZERO) <= 0) {
+ // 鍒犻櫎鏉ョエ鐧昏
+ ticketRegistrationMapper.deleteById(ticket.getId());
+ // 鍒犻櫎浠樻娴佹按
+ paymentRegistrationMapper.delete(
+ new LambdaQueryWrapper<PaymentRegistration>()
+ .eq(PaymentRegistration::getTicketRegistrationId, ticket.getId())
+ );
+ } else {
+ ticket.setInvoiceAmount(remain);
+ ticketRegistrationMapper.updateById(ticket);
}
}
- // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰�
- productRecordMapper.delete(productRecordLambdaQueryWrapper);
+
+ // 鍥為��閿�鍞彴璐︿骇鍝佺殑鏈潵绁�
+ for (ProductRecord record : productRecords) {
+
+ LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SalesLedgerProduct::getId, record.getSaleLedgerProjectId())
+ .eq(SalesLedgerProduct::getType, 2);
+
+ SalesLedgerProduct product = salesLedgerProductMapper.selectOne(wrapper);
+ if (product != null) {
+ product.setFutureTickets(
+ product.getFutureTickets().add(record.getTicketsNum())
+ );
+ product.setFutureTicketsAmount(
+ product.getFutureTicketsAmount().add(record.getTicketsAmount())
+ );
+ salesLedgerProductMapper.updateById(product);
+ }
+ }
+
+ // 鍒犻櫎浜у搧鏉ョエ璁板綍
+ productRecordMapper.delete(productWrapper);
+
+ // 閲嶆柊璁＄畻 currentInvoiceAmount
+ for (Long productId : salesLedgerProductIds) {
+ refreshCurrentInvoiceAmount(productId);
+ }
+
return 1;
}
+
+ private void refreshCurrentInvoiceAmount(Long salesLedgerProductId) {
+
+ // 鏌ヨ璇ヤ骇鍝佹渶鏂颁竴鏉℃潵绁ㄨ褰�
+ LambdaQueryWrapper<ProductRecord> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductRecord::getSaleLedgerProjectId, salesLedgerProductId)
+ .orderByDesc(ProductRecord::getCreatedAt)
+ .last("limit 1");
+
+ ProductRecord latestRecord = productRecordMapper.selectOne(wrapper);
+
+ SalesLedgerProduct product =
+ salesLedgerProductMapper.selectById(salesLedgerProductId);
+
+ if (product == null) {
+ return;
+ }
+
+ if (latestRecord == null) {
+ // 娌℃湁浠讳綍鏉ョエ璁板綍
+ product.setTicketsAmount(BigDecimal.ZERO);
+ } else {
+ // 姘歌繙鍙栨渶鏂颁竴鏉�
+ product.setTicketsAmount(latestRecord.getTicketsAmount());
+ }
+
+ salesLedgerProductMapper.updateById(product);
+ }
+
@Override
public TicketRegistrationDto getRegistrationById(TicketRegistrationDto ticketRegistrationDto) {
@@ -329,9 +407,13 @@
@Override
public IPage<TicketRegistration> selectTicketRegistrationListPage(Page page, TicketRegistration ticketRegistration) {
LambdaQueryWrapper<TicketRegistration> queryWrapper = new LambdaQueryWrapper<>();
- if (StringUtils.isNotBlank(ticketRegistration.getPurchaseContractNumber())) {
- queryWrapper.like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getPurchaseContractNumber())
- .like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierName());
+ if (StringUtils.isNotBlank(ticketRegistration.getSupplierNameOrContractNo())) {
+ queryWrapper.and(wrapper -> wrapper
+ .like(TicketRegistration::getPurchaseContractNumber, ticketRegistration.getSupplierNameOrContractNo())
+ .or()
+ .like(TicketRegistration::getSupplierName, ticketRegistration.getSupplierNameOrContractNo())
+ .or()
+ .like(TicketRegistration::getSalesContractNo, ticketRegistration.getSupplierNameOrContractNo()));
}
if (!ObjectUtils.isEmpty(ticketRegistration.getIssueDateStart()) && !ObjectUtils.isEmpty(ticketRegistration.getIssueDateEnd())) {
queryWrapper.between(TicketRegistration::getIssueDate, LocalDate.parse(ticketRegistration.getIssueDateStart(), DateTimeFormatter.ofPattern("yyyy-MM-dd")), LocalDate.parse(ticketRegistration.getIssueDateEnd(), DateTimeFormatter.ofPattern("yyyy-MM-dd")));
@@ -362,6 +444,10 @@
ticketRegistrationIPage.setTotal(ticketRegistrationIPage.getRecords().size());
}
}
+ ticketRegistrationIPage.getRecords().forEach(item -> {
+ // 宸蹭粯娆鹃噾棰� == 寰呬粯娆鹃噾棰�
+ item.setStatusName(item.getPaymentAmountTotal().compareTo(item.getInvoiceAmount()) == 0 ? "宸插畬鎴愪粯娆�" : "鏈畬鎴愪粯娆�");
+ });
return ticketRegistrationIPage;
}
--
Gitblit v1.9.3