From 684e4306a08feeae188070f264148e6765da8dcf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 20 九月 2026 19:25:15 +0800
Subject: [PATCH] feat(account): 更新往来付款回款流水表及接口
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 776447e..c504265 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -19,8 +19,6 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.List;
/**
* <p>
@@ -43,6 +41,13 @@
public R pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pagestockInventory(page, stockInventoryDto);
return R.ok(stockInventoryDtoIPage);
+ }
+
+ @GetMapping("/pageScrapStock")
+ @Operation(summary = "鎶ュ簾鍝侀�夋枡鍒嗛〉锛堝彧璇伙紝甯︽壒鍙凤級")
+ public R pageScrapStock(Page page, StockInventoryDto stockInventoryDto) {
+ IPage<StockInventoryDto> result = stockInventoryService.pageScrapStock(page, stockInventoryDto);
+ return R.ok(result);
}
@GetMapping("/pageListCombinedStockInventory")
@@ -116,9 +121,8 @@
@Log(title = "涓嬭浇搴撳瓨瀵煎叆妯℃澘", businessType = BusinessType.EXPORT)
@PostMapping("/downloadStockInventory")
public void downloadStockInventory(HttpServletResponse response) {
- List<StockInventoryExportData> list = new ArrayList<>();
ExcelUtil<StockInventoryExportData> util = new ExcelUtil<>(StockInventoryExportData.class);
- util.exportExcel(response, list, "搴撳瓨妯℃澘");
+ util.importTemplateExcel(response, "搴撳瓨妯℃澘");
}
@PostMapping("/exportStockInventory")
--
Gitblit v1.9.3