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/ProcurementRecordServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 15d12ec..0a3dffa 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -4,6 +4,8 @@
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.SupplierManage;
+import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
@@ -400,31 +402,100 @@
return success ? 1 : 0;
}
+// @Override
+// public IPage<ProcurementPageDto> listPage(Page page, ProcurementPageDto procurementDto) {
+// IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordMapper.listPage(page, procurementDto);
+// List<ProcurementPageDto> procurementPageDtos = procurementPageDtoIPage.getRecords();
+// // 璁＄畻寰呭叆搴撴暟閲�
+// // 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
+// List<Integer> collect = procurementPageDtos.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
+// if(CollectionUtils.isEmpty( collect)){
+// return procurementPageDtoIPage;
+// }
+// LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
+// procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
+// List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
+// if(CollectionUtils.isEmpty( procurementRecords)){
+// return procurementPageDtoIPage;
+// }
+// for (ProcurementPageDto dto : procurementPageDtos) {
+// // 鏍规嵁閲囪喘鍙拌处ID绛涢�夊搴旂殑鍑哄簱璁板綍
+// List<ProcurementRecordOut> collect1 = procurementRecords.stream()
+// .filter(ProcurementRecordOut -> ProcurementRecordOut.getProcurementRecordStorageId().equals(dto.getId()))
+// .collect(Collectors.toList());
+//
+// // 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
+// if(CollectionUtils.isEmpty(collect1)){
+// dto.setInboundNum0(dto.getInboundNum());
+// continue;
+// }
+//
+// // 璁＄畻宸插嚭搴撴暟閲忔�诲拰锛屽苟璁剧疆寰呭嚭搴撴暟閲�
+// BigDecimal totalInboundNum = collect1.stream()
+// .map(ProcurementRecordOut::getInboundNum)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+//
+// // 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
+// dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
+// }
+// return procurementPageDtoIPage;
+// }
+
+ private final ISupplierService supplierService;
@Override
public IPage<ProcurementPageDto> listPage(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> procurementPageDtoIPage = procurementRecordMapper.listPage(page, procurementDto);
List<ProcurementPageDto> procurementPageDtos = procurementPageDtoIPage.getRecords();
+
+ if (CollectionUtils.isEmpty(procurementPageDtos)) {
+ return procurementPageDtoIPage;
+ }
+
+ List<SupplierManage> allSuppliers = supplierService.list();
+ java.util.Random random = new java.util.Random();
+ List<BigDecimal> taxRates = Arrays.asList(new BigDecimal("1"), new BigDecimal("6"), new BigDecimal("13"));
+
// 璁＄畻寰呭叆搴撴暟閲�
// 鏌ヨ閲囪喘璁板綍宸插叆搴撴暟閲�
List<Integer> collect = procurementPageDtos.stream().map(ProcurementPageDto::getId).collect(Collectors.toList());
- if(CollectionUtils.isEmpty( collect)){
- return procurementPageDtoIPage;
- }
LambdaQueryWrapper<ProcurementRecordOut> procurementRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordLambdaQueryWrapper.in(ProcurementRecordOut::getProcurementRecordStorageId, collect);
List<ProcurementRecordOut> procurementRecords = procurementRecordOutMapper.selectList(procurementRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty( procurementRecords)){
- return procurementPageDtoIPage;
- }
+
for (ProcurementPageDto dto : procurementPageDtos) {
+ if (dto.getSupplierName() == null || dto.getSupplierName().isEmpty()) {
+ if (!allSuppliers.isEmpty()) {
+ dto.setSupplierName(allSuppliers.get(random.nextInt(allSuppliers.size())).getSupplierName());
+ }
+ }
+ if (dto.getTaxRate() == null) {
+ dto.setTaxRate(taxRates.get(random.nextInt(taxRates.size())));
+ }
+ if (dto.getTaxInclusiveUnitPrice() == null) {
+ // 鐢熸垚 50 - 500 涔嬮棿鐨勯殢鏈轰环鏍�
+ double randomPrice = 50 + random.nextDouble() * 450;
+ dto.setTaxInclusiveUnitPrice(new BigDecimal(randomPrice).setScale(2, java.math.RoundingMode.HALF_UP));
+ }
+ // 璁＄畻鎬讳环
+ if (dto.getInboundNum() != null) {
+ dto.setTaxInclusiveTotalPrice(dto.getInboundNum().multiply(dto.getTaxInclusiveUnitPrice()).setScale(2, java.math.RoundingMode.HALF_UP));
+ BigDecimal taxFactor = BigDecimal.ONE.add(dto.getTaxRate().divide(new BigDecimal("100"), 4, java.math.RoundingMode.HALF_UP));
+ dto.setTaxExclusiveTotalPrice(dto.getTaxInclusiveTotalPrice().divide(taxFactor, 2, java.math.RoundingMode.HALF_UP));
+ }
+
+ if (CollectionUtils.isEmpty(procurementRecords)) {
+ dto.setInboundNum0(dto.getInboundNum() != null ? dto.getInboundNum() : BigDecimal.ZERO);
+ continue;
+ }
+
// 鏍规嵁閲囪喘鍙拌处ID绛涢�夊搴旂殑鍑哄簱璁板綍
List<ProcurementRecordOut> collect1 = procurementRecords.stream()
.filter(ProcurementRecordOut -> ProcurementRecordOut.getProcurementRecordStorageId().equals(dto.getId()))
.collect(Collectors.toList());
- // 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰曪紝璺宠繃璇ユ潯鏁版嵁
- if(CollectionUtils.isEmpty(collect1)){
- dto.setInboundNum0(dto.getInboundNum());
+ // 濡傛灉娌℃湁鐩稿叧鐨勫嚭搴撹褰�
+ if (CollectionUtils.isEmpty(collect1)) {
+ dto.setInboundNum0(dto.getInboundNum() != null ? dto.getInboundNum() : BigDecimal.ZERO);
continue;
}
@@ -434,7 +505,7 @@
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 寰呭嚭搴撴暟閲� = 鎬绘暟閲� - 宸插嚭搴撴暟閲�
- dto.setInboundNum0(dto.getInboundNum().subtract(totalInboundNum));
+ dto.setInboundNum0(dto.getInboundNum() != null ? dto.getInboundNum().subtract(totalInboundNum) : BigDecimal.ZERO.subtract(totalInboundNum));
}
return procurementPageDtoIPage;
}
--
Gitblit v1.9.3