From 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 17:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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..f4bd009 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
@@ -62,17 +61,47 @@
}
- @GetMapping("importStockInventory")
+ @PostMapping("importStockInventory")
@ApiOperation("瀵煎叆搴撳瓨")
- public R importStockInventory(MultipartFile file) {
+ public R importStockInventory(MultipartFile file) {
return stockInventoryService.importStockInventory(file);
}
@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);
+ }
+
+ @GetMapping("stockInventoryPage")
+ @ApiOperation("搴撳瓨鎶ヨ〃鏌ヨ")
+ public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
+ return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
+ }
+
+ @GetMapping("stockInAndOutRecord")
+ @ApiOperation("缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
+ public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
+ return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
+ }
+
+ @PostMapping("/frozenStock")
+ @ApiOperation("鍐荤粨搴撳瓨")
+ public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
+ return R.ok(stockInventoryService.frozenStock(stockInventoryDto));
+ }
+
+ @PostMapping("/thawStock")
+ @ApiOperation("瑙ｅ喕搴撳瓨")
+ public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
+ return R.ok(stockInventoryService.thawStock(stockInventoryDto));
}
}
--
Gitblit v1.9.3