From 481399bea1b66312de3c04864c49cedf5f0a6ece Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 23 一月 2026 12:59:55 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 18 ++++++++++++------
1 files changed, 12 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 8447edb..0385bdf 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -10,10 +10,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
/**
* <p>
@@ -40,7 +38,7 @@
@PostMapping("/addstockInventory")
@ApiOperation("鏂板搴撳瓨")
- public R addstockInventory(StockInventoryDto stockInventoryDto) {
+ public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
stockInventoryDto.setRecordType(String.valueOf(StockRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
stockInventoryDto.setRecordId(0L);
return R.ok(stockInventoryService.addstockInventory(stockInventoryDto));
@@ -49,9 +47,17 @@
@PostMapping("/subtractStockInventory")
@ApiOperation("鎵ｅ噺搴撳瓨")
- public R subtractStockInventory(StockInventoryDto stockInventoryDto) {
+ public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
stockInventoryDto.setRecordType(String.valueOf(StockRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
stockInventoryDto.setRecordId(0L);
return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
}
+
+
+ @GetMapping("importStockInventory")
+ @ApiOperation("瀵煎叆搴撳瓨")
+ public R importStockInventory(MultipartFile file) {
+ return R.ok(stockInventoryService.importStockInventory(file));
+
+ }
}
--
Gitblit v1.9.3