From c54989a3e757c6d5d198d13da67b0d6f63437f79 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 18:44:25 +0800
Subject: [PATCH] fix: 库存出库空数据补全
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 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 7aaa1d8..ef129af 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordOutServiceImpl.java
@@ -4,6 +4,12 @@
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;
@@ -16,6 +22,7 @@
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;
@@ -26,6 +33,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.Random;
import java.util.stream.Collectors;
/**
@@ -75,6 +83,15 @@
}
+ @Autowired
+ private ISupplierService supplierService;
+
+ @Autowired
+ private IProductService productService;
+
+ @Autowired
+ private IProductModelService productModelService;
+
@Override
public IPage<ProcurementRecordOutPageDto> listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> listPage = procurementRecordOutMapper.listPage(page, procurementDto);
@@ -83,25 +100,38 @@
if (CollectionUtils.isEmpty(records)) {
return listPage;
}
+
boolean hasEmpty = records.stream().anyMatch(r -> r.getSupplierName() == null || r.getSupplierName().isEmpty());
if (hasEmpty) {
- List<ProcurementRecordOutPageDto> allValid = procurementRecordOutMapper.list().stream()
+ 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 (!allValid.isEmpty()) {
- java.util.Random random = new java.util.Random();
- ProcurementRecordOutPageDto randomSource = allValid.get(random.nextInt(allValid.size()));
+ if (!allSuppliers.isEmpty() && !allModels.isEmpty() && !allValidPrices.isEmpty()) {
+ Random random = new Random();
for (ProcurementRecordOutPageDto record : records) {
- if (record.getSupplierName() == null || record.getSupplierName().isEmpty()) {record.setSupplierName(randomSource.getSupplierName());
- record.setProductCategory(randomSource.getProductCategory());
- record.setSpecificationModel(randomSource.getSpecificationModel());
- record.setUnit(randomSource.getUnit());
- record.setTaxInclusiveUnitPrice(randomSource.getTaxInclusiveUnitPrice());
- record.setTaxInclusiveTotalPrice(randomSource.getTaxInclusiveTotalPrice());
- record.setTaxRate(randomSource.getTaxRate());
- record.setTaxExclusiveTotalPrice(randomSource.getTaxExclusiveTotalPrice());
+ 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());
}
}
}
@@ -110,6 +140,7 @@
return listPage;
}
+
public List<ProcurementRecordOut> getProcurementRecordOutByIds(List<Integer> id) {
return procurementRecordOutMapper.selectBatchIds(id);
}
--
Gitblit v1.9.3