From a1a7bb5093d30397078ce42ef025cd07378d1e1c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 15:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

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

diff --git a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
index 70f638e..2096b6d 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -11,13 +11,13 @@
 import com.ruoyi.stock.dto.StockInventoryDto;
 import com.ruoyi.stock.execl.StockInventoryExportData;
 import com.ruoyi.stock.service.StockInventoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+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;
 
@@ -31,21 +31,28 @@
  */
 @RestController
 @RequestMapping("/stockInventory")
-@Api(tags = "搴撳瓨琛�")
+@Tag(name = "搴撳瓨琛�")
+@AllArgsConstructor
 public class StockInventoryController {
 
-    @Autowired
     private StockInventoryService stockInventoryService;
 
     @GetMapping("/pagestockInventory")
-    @ApiOperation("鍒嗛〉鏌ヨ搴撳瓨")
+    @Operation(summary = "鍒嗛〉鏌ヨ搴撳瓨")
     public R pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
         IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pagestockInventory(page, stockInventoryDto);
         return R.ok(stockInventoryDtoIPage);
     }
 
+    @GetMapping("/pageListCombinedStockInventory")
+    @Operation(summary = "鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
+    public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
+        IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
+        return R.ok(stockInventoryDtoIPage);
+    }
+
     @PostMapping("/addstockInventory")
-    @ApiOperation("鏂板搴撳瓨")
+    @Operation(summary = "鏂板搴撳瓨")
     public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
         stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
         stockInventoryDto.setRecordId(0L);
@@ -54,16 +61,32 @@
 
 
     @PostMapping("/subtractStockInventory")
-    @ApiOperation("鎵ｅ噺搴撳瓨")
+    @Operation(summary = "鎵ｅ噺搴撳瓨")
     public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
         stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
         stockInventoryDto.setRecordId(0L);
         return R.ok(stockInventoryService.subtractStockInventory(stockInventoryDto));
     }
 
+    @PostMapping("/addStockInRecordOnly")
+    @Operation(summary = "鏂板鍏ュ簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+    public R addStockInRecordOnly(@RequestBody StockInventoryDto stockInventoryDto) {
+        stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
+        stockInventoryDto.setRecordId(0L);
+        return R.ok(stockInventoryService.addStockInRecordOnly(stockInventoryDto));
+    }
+
+    @PostMapping("/addStockOutRecordOnly")
+    @Operation(summary = "鏂板鍑哄簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+    public R addStockOutRecordOnly(@RequestBody StockInventoryDto stockInventoryDto) {
+        stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
+        stockInventoryDto.setRecordId(0L);
+        return R.ok(stockInventoryService.addStockOutRecordOnly(stockInventoryDto));
+    }
+
 
     @PostMapping("importStockInventory")
-    @ApiOperation("瀵煎叆搴撳瓨")
+    @Operation(summary = "瀵煎叆搴撳瓨")
     public R importStockInventory(MultipartFile file) {
         return stockInventoryService.importStockInventory(file);
     }
@@ -77,31 +100,31 @@
     }
 
     @PostMapping("/exportStockInventory")
-    @ApiOperation("瀵煎嚭搴撳瓨")
+    @Operation(summary = "瀵煎嚭搴撳瓨")
     public void exportStockInventory(HttpServletResponse response, StockInventoryDto stockInventoryDto) {
         stockInventoryService.exportStockInventory(response, stockInventoryDto);
     }
 
     @GetMapping("stockInventoryPage")
-    @ApiOperation("搴撳瓨鎶ヨ〃鏌ヨ")
+    @Operation(summary = "搴撳瓨鎶ヨ〃鏌ヨ")
     public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
         return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
     }
 
     @GetMapping("stockInAndOutRecord")
-    @ApiOperation("缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
+    @Operation(summary = "缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
     public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
         return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
     }
 
     @PostMapping("/frozenStock")
-    @ApiOperation("鍐荤粨搴撳瓨")
+    @Operation(summary = "鍐荤粨搴撳瓨")
     public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
         return R.ok(stockInventoryService.frozenStock(stockInventoryDto));
     }
 
     @PostMapping("/thawStock")
-    @ApiOperation("瑙ｅ喕搴撳瓨")
+    @Operation(summary = "瑙ｅ喕搴撳瓨")
     public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
         return R.ok(stockInventoryService.thawStock(stockInventoryDto));
     }

--
Gitblit v1.9.3