From fa3428b4bb32179a42d5618357c22fe2695716ae Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:58:23 +0800
Subject: [PATCH] 修改全局的注入方式

---
 src/main/java/com/ruoyi/stock/controller/StockInventoryController.java |   53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 7807de1..3c67ab1 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -2,9 +2,9 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
 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;
@@ -13,11 +13,11 @@
 import com.ruoyi.stock.service.StockInventoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,9 +32,9 @@
 @RestController
 @RequestMapping("/stockInventory")
 @Api(tags = "搴撳瓨琛�")
+@AllArgsConstructor
 public class StockInventoryController {
 
-    @Autowired
     private StockInventoryService stockInventoryService;
 
     @GetMapping("/pagestockInventory")
@@ -44,10 +44,17 @@
         return R.ok(stockInventoryDtoIPage);
     }
 
+    @GetMapping("/pageListCombinedStockInventory")
+    @ApiOperation("鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
+    public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
+        IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
+        return R.ok(stockInventoryDtoIPage);
+    }
+
     @PostMapping("/addstockInventory")
     @ApiOperation("鏂板搴撳瓨")
     public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
-        stockInventoryDto.setRecordType(String.valueOf(StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
+        stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
         stockInventoryDto.setRecordId(0L);
         return R.ok(stockInventoryService.addstockInventory(stockInventoryDto));
     }
@@ -56,15 +63,15 @@
     @PostMapping("/subtractStockInventory")
     @ApiOperation("鎵ｅ噺搴撳瓨")
     public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
-        stockInventoryDto.setRecordType(String.valueOf(StockQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
+        stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
         stockInventoryDto.setRecordId(0L);
         return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
     }
 
 
-    @GetMapping("importStockInventory")
+    @PostMapping("importStockInventory")
     @ApiOperation("瀵煎叆搴撳瓨")
-    public R importStockInventory(MultipartFile  file) {
+    public R importStockInventory(MultipartFile file) {
         return stockInventoryService.importStockInventory(file);
     }
 
@@ -78,7 +85,31 @@
 
     @PostMapping("/exportStockInventory")
     @ApiOperation("瀵煎嚭搴撳瓨")
-    public void exportStockInventory(HttpServletResponse response,StockInventoryDto stockInventoryDto) {
-         stockInventoryService.exportStockInventory(response,stockInventoryDto);
+    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