From 8e2390f4708613052cb50d944ed5c8de039a16b1 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 19 一月 2026 17:10:04 +0800
Subject: [PATCH] 实时统计首页库存数据
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 58b6c06..fecd4d1 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.common.utils.SecurityUtils;
@@ -24,6 +26,7 @@
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
@@ -114,7 +117,10 @@
private ProductionProductMainMapper productionProductMainMapper;
@Autowired
private ProductWorkOrderMapper productWorkOrderMapper;
-
+ @Autowired
+ private ProductModelMapper productModelMapper;
+ @Autowired
+ private StockUtils stockUtils;
@Override
public HomeBusinessDto business() {
// 鏋勫缓缁撴灉
@@ -167,23 +173,35 @@
homeBusinessDto.setMonthPurchaseHaveMoney(unReceiptPaymentAmount.setScale(2, RoundingMode.HALF_UP).toString());
}
// 缁熻搴撳瓨
- List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordStorageMapper.selectList(null);
- BigDecimal stockAmount = procurementRecordStorages.stream()
- .map(ProcurementRecordStorage::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- // 鑷畾涔夊簱瀛�
- List<CustomStorage> customStorages = customStorageMapper.selectList(null);
- BigDecimal customStockAmount = customStorages.stream()
- .map(CustomStorage::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(null);
- BigDecimal outboundAmount = procurementRecordOuts.stream()
- .map(ProcurementRecordOut::getInboundNum)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal stock = stockAmount.add(customStockAmount).subtract(outboundAmount);
+// List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordStorageMapper.selectList(null);
+// BigDecimal stockAmount = procurementRecordStorages.stream()
+// .map(ProcurementRecordStorage::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// // 鑷畾涔夊簱瀛�
+// List<CustomStorage> customStorages = customStorageMapper.selectList(null);
+// BigDecimal customStockAmount = customStorages.stream()
+// .map(CustomStorage::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(null);
+// BigDecimal outboundAmount = procurementRecordOuts.stream()
+// .map(ProcurementRecordOut::getInboundNum)
+// .filter(Objects::nonNull)
+// .reduce(BigDecimal.ZERO, BigDecimal::add);
+// BigDecimal stock = stockAmount.add(customStockAmount).subtract(outboundAmount);
+ IPage<ProductModel> productModelIPage = productModelMapper.listPageProductModel(new Page<>(1, -1), new ProductModel());
+ if(!CollectionUtils.isEmpty(productModelIPage.getRecords())){
+ //鑾峰彇瑙勬牸id
+ List<Long> modelIds = productModelIPage.getRecords().stream().map(ProductModel::getId).collect(Collectors.toList());
+ BigDecimal stockQuantityTotal = modelIds.stream()
+ .map(stockUtils::getStockQuantity)
+ .map(map -> map.get("stockQuantity"))
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ homeBusinessDto.setInventoryNum(stockQuantityTotal.setScale(2, RoundingMode.HALF_UP).toString());
+ }
+
// 鑾峰彇褰撳ぉ鍏ュ簱鏁伴噺
LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordStorageLambdaQueryWrapper.ge(ProcurementRecordStorage::getCreateTime, now) // 澶т簬绛変簬褰撳ぉ
@@ -193,7 +211,7 @@
.map(ProcurementRecordStorage::getInboundNum)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- homeBusinessDto.setInventoryNum(stock.setScale(2, RoundingMode.HALF_UP).toString());
+// homeBusinessDto.setInventoryNum(stock.setScale(2, RoundingMode.HALF_UP).toString());
homeBusinessDto.setTodayInventoryNum(stockAmount1.setScale(2, RoundingMode.HALF_UP).toString());
return homeBusinessDto;
}
@@ -514,9 +532,9 @@
List<ProductOrderDto> productOrderDtoList = new ArrayList<>();
productOrderList.forEach(productOrder -> {
ProductOrderDto productOrderDto = productOrderMapper.productMainByOrderId(productOrder);
- if (productOrderDto != null && productOrderDto.getPlanQuantity() != null && productOrderDto.getQuantity() != null) {
- productOrderDto.setCompletionStatus(BigDecimal.valueOf(productOrderDto.getPlanQuantity()-productOrderDto.getQuantity()).divide(BigDecimal.valueOf(productOrderDto.getPlanQuantity()), 2, RoundingMode.HALF_UP));
- }
+// if (productOrderDto != null && productOrderDto.getPlanQuantity() != null && productOrderDto.getQuantity() != null) {
+// productOrderDto.setCompletionStatus((productOrderDto.getPlanQuantity().subtract(productOrderDto.getQuantity())).divide(productOrderDto.getPlanQuantity(), 2, RoundingMode.HALF_UP));
+// }
productOrderDtoList.add(productOrderDto);
});
productionProgressDto.setCompletedOrderDetails(productOrderDtoList);
@@ -525,7 +543,7 @@
// 2. 鍒濆鍖栨眹鎬绘暟鎹�
int totalCount = productOrderDtoIPage.getRecords().size();
- int completedCount = (int) productOrderDtoIPage.getRecords().stream().map(productOrderDto -> productOrderMapper.productMainByOrderId(productOrderDto)).filter(productOrderDto1 -> productOrderDto1.getQuantity() != null && productOrderDto1.getQuantity() == 0).count();
+ int completedCount = (int) productOrderDtoIPage.getRecords().stream().map(productOrderDto -> productOrderMapper.productMainByOrderId(productOrderDto)).filter(productOrderDto1 -> productOrderDto1.getQuantity() != null && productOrderDto1.getQuantity().compareTo(BigDecimal.ZERO) == 0).count();
// 6. 璧嬪�兼眹鎬绘暟鎹�
productionProgressDto.setTotalOrderCount(totalCount);
--
Gitblit v1.9.3