From 520a715610bd67a6401e989ada8b1c43a312163b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 11 九月 2026 08:09:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/main/java/com/ruoyi/stock/service/StockInventoryService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
index e06b751..7bb1a24 100644
--- a/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
+++ b/src/main/java/com/ruoyi/stock/service/StockInventoryService.java
@@ -40,6 +40,7 @@
void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto);
IPage<StockInRecordDto> stockInventoryPage(StockInventoryDto stockInventoryDto,Page page);
+ void exportStockInventoryPage(HttpServletResponse response, StockInventoryDto stockInventoryDto);
IPage<StockInventoryDto> stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page);
@@ -47,7 +48,7 @@
Boolean thawStock(StockInventoryDto stockInventoryDto);
- List<StockInventory> getByModelId(Long modelId);
+ List<StockInventoryDto> getByModelId(Long modelId);
IPage<StockInventoryDto> getBatchNoQty(Page page, StockInventoryDto stockInventoryDto);
}
--
Gitblit v1.9.3