From a0914318549b357ef3c438d0c2a3714f58ea3487 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 23 一月 2026 14:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 12 +++---------
1 files changed, 3 insertions(+), 9 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 b812cdf..19509a3 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -882,16 +882,10 @@
}
return procurementPageDtoCopyIPage;
}
+
@Override
- public IPage<ProductModel> listPageProductionStock(Page page) {
- ProductModel productModel = new ProductModel();
- IPage<ProductModel> iPage = productModelMapper.listPageProductModel(page, productModel);
- iPage.getRecords().forEach(item -> {
- item.setInboundNum(stockUtils.getStockQuantity(item.getId()).get("inboundNum"));
- item.setOutboundNum(stockUtils.getStockQuantity(item.getId()).get("outboundNum"));
- item.setStockQuantity(stockUtils.getStockQuantity(item.getId()).get("stockQuantity"));
- });
- return iPage;
+ public IPage<ProductModel> listPageProductionStock(Page page, ProcurementPageDto dto) {
+ return productModelMapper.listPageProductionStock(page, dto);
}
@Override
--
Gitblit v1.9.3