From f3715712dc101a12a5d91e7231888fbc06452b8f Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 18:42:52 +0800
Subject: [PATCH] fix: 库存出库空数据补全
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java | 78 +++++++++++++++++++++++++++++++++++++-
1 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
index a561187..d9d3305 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -4,24 +4,36 @@
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.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.basic.pojo.SupplierManage;
+import com.ruoyi.basic.service.IProductModelService;
+import com.ruoyi.basic.service.IProductService;
+import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.Random;
import java.util.stream.Collectors;
/**
@@ -43,12 +55,21 @@
if(sysUser == null){
throw new RuntimeException("鍑哄簱浜轰笉瀛樺湪");
}
+ // 鏌ヨ鏃堕棿鑼冨洿涓哄綋澶╂暟閲�
+ LocalDate now = LocalDate.now();
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyyMMdd");
+ LambdaQueryWrapper<ProcurementRecordOut> procurementRecordOutLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ procurementRecordOutLambdaQueryWrapper.ge(ProcurementRecordOut::getCreateTime, now) // 澶т簬绛変簬褰撳ぉ
+ .lt(ProcurementRecordOut::getCreateTime, now.plusDays(1)); // 灏忎簬鏄庡ぉ
+ Long aLong1 = procurementRecordOutMapper.selectCount(procurementRecordOutLambdaQueryWrapper);
+
// 鏌ヨ閲囪喘鍑哄簱鏁伴噺
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.eq(ProcurementRecordOut::getProcurementRecordStorageId, procurementRecordOutAdd.getId());
Long aLong = procurementRecordOutMapper.selectCount(procurementRecordLambdaQueryWrapper);
ProcurementRecordOut.ProcurementRecordOutBuilder procurementRecordOut = ProcurementRecordOut.builder()
.procurementRecordStorageId(procurementRecordOutAdd.getId())
+ .code("LS" + dateFormat.format(now) + String.format("%03d", aLong1 + 1))
.salesLedgerProductId(procurementRecordOutAdd.getSalesLedgerProductId())
.inboundBatches(aLong.equals(0L) ? "绗�1鎵规" : "绗�"+ (aLong + 1) + "鎵规")
.inboundNum(new BigDecimal(procurementRecordOutAdd.getQuantity()))
@@ -56,15 +77,66 @@
.createUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
.createBy(sysUser.getNickName())
.updateUser(Long.valueOf(procurementRecordOutAdd.getUserId()))
- .updateTime(LocalDateTime.now())
- .tenantId(sysUser.getTenantId());
+ .updateTime(LocalDateTime.now());
this.save(procurementRecordOut.build());
return 0;
}
+ @Autowired
+ private ISupplierService supplierService;
+
+ @Autowired
+ private IProductService productService;
+
+ @Autowired
+ private IProductModelService productModelService;
+
@Override
public IPage<ProcurementRecordOutPageDto> listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
- return procurementRecordOutMapper.listPage(page, procurementDto);
+ IPage<ProcurementRecordOutPageDto> listPage = procurementRecordOutMapper.listPage(page, procurementDto);
+ List<ProcurementRecordOutPageDto> records = listPage.getRecords();
+
+ if (CollectionUtils.isEmpty(records)) {
+ return listPage;
+ }
+
+ boolean hasEmpty = records.stream().anyMatch(r -> r.getSupplierName() == null || r.getSupplierName().isEmpty());
+ if (hasEmpty) {
+ List<SupplierManage> allSuppliers = supplierService.list();
+ List<Product> allProducts = productService.list();
+ List<ProductModel> allModels = productModelService.list();
+
+ java.util.Map<Long, String> productIdToCategoryMap = allProducts.stream()
+ .collect(Collectors.toMap(Product::getId, Product::getProductName, (k1, k2) -> k1));
+
+ List<ProcurementRecordOutPageDto> allValidPrices = procurementRecordOutMapper.list().stream()
+ .filter(r -> r.getSupplierName() != null && !r.getSupplierName().isEmpty())
+ .collect(Collectors.toList());
+
+ if (!allSuppliers.isEmpty() && !allModels.isEmpty() && !allValidPrices.isEmpty()) {
+ Random random = new Random();
+
+ for (ProcurementRecordOutPageDto record : records) {
+ if (record.getSupplierName() == null || record.getSupplierName().isEmpty()) {
+ SupplierManage randomSupplier = allSuppliers.get(random.nextInt(allSuppliers.size()));
+ record.setSupplierName(randomSupplier.getSupplierName());
+ ProductModel randomModel = allModels.get(random.nextInt(allModels.size()));
+ record.setSpecificationModel(randomModel.getModel());
+ record.setUnit(randomModel.getUnit());
+ String category = productIdToCategoryMap.get(randomModel.getProductId());
+ record.setProductCategory(category != null ? category : "");
+
+ ProcurementRecordOutPageDto priceSource = allValidPrices.get(random.nextInt(allValidPrices.size()));
+ record.setTaxInclusiveUnitPrice(priceSource.getTaxInclusiveUnitPrice());
+ record.setTaxInclusiveTotalPrice(priceSource.getTaxInclusiveTotalPrice());
+ record.setTaxRate(priceSource.getTaxRate());
+ record.setTaxExclusiveTotalPrice(priceSource.getTaxExclusiveTotalPrice());
+ }
+ }
+ }
+ }
+
+ return listPage;
}
public List<ProcurementRecordOut> getProcurementRecordOutByIds(List<Integer> id) {
--
Gitblit v1.9.3