From dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 17:56:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 8d5db33..7807de1 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -69,10 +69,16 @@
}
@Log(title = "涓嬭浇搴撳瓨瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
- @PostMapping("/exportStockInventory")
- public void exportStockInventory(HttpServletResponse response) {
+ @PostMapping("/downloadStockInventory")
+ public void downloadStockInventory(HttpServletResponse response) {
List<StockInventoryExportData> list = new ArrayList<>();
ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
- util.exportExcel(response, list, "涓嬭浇钖祫绠＄悊鍒楄〃妯℃澘");
+ util.exportExcel(response, list, "搴撳瓨妯℃澘");
+ }
+
+ @PostMapping("/exportStockInventory")
+ @ApiOperation("瀵煎嚭搴撳瓨")
+ public void exportStockInventory(HttpServletResponse response,StockInventoryDto stockInventoryDto) {
+ stockInventoryService.exportStockInventory(response,stockInventoryDto);
}
}
--
Gitblit v1.9.3