From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
index 2bb09cd..477a68d 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
@@ -8,7 +8,7 @@
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockUninventoryDto;
import com.ruoyi.stock.service.StockUninventoryService;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -28,14 +28,14 @@
private StockUninventoryService stockUninventoryService;
@GetMapping("/pagestockUninventory")
- @ApiOperation("鍒嗛〉鏌ヨ搴撳瓨")
+ @Operation(summary = "鍒嗛〉鏌ヨ搴撳瓨")
public R pagestockUninventory(Page page, StockUninventoryDto stockUninventoryDto) {
IPage<StockUninventoryDto> stockUninventoryDtoIPage = stockUninventoryService.pageStockUninventory(page, stockUninventoryDto);
return R.ok(stockUninventoryDtoIPage);
}
@PostMapping("/addstockUninventory")
- @ApiOperation("鏂板搴撳瓨")
+ @Operation(summary = "鏂板搴撳瓨")
public R addstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
stockUninventoryDto.setRecordType(String.valueOf(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
stockUninventoryDto.setRecordId(0L);
@@ -44,28 +44,44 @@
@PostMapping("/subtractstockUninventory")
- @ApiOperation("鎵ｅ噺搴撳瓨")
+ @Operation(summary = "鎵ｅ噺搴撳瓨")
public R subtractstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
stockUninventoryDto.setRecordType(String.valueOf(StockOutUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
stockUninventoryDto.setRecordId(0L);
return R.ok(stockUninventoryService.subtractStockUninventory(stockUninventoryDto));
}
+ @PostMapping("/addStockInRecordOnly")
+ @Operation(summary = "鏂板鍏ュ簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+ public R addStockInRecordOnly(@RequestBody StockUninventoryDto stockUninventoryDto) {
+ stockUninventoryDto.setRecordType(String.valueOf(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
+ stockUninventoryDto.setRecordId(0L);
+ return R.ok(stockUninventoryService.addStockInRecordOnly(stockUninventoryDto));
+ }
+
+ @PostMapping("/addStockOutRecordOnly")
+ @Operation(summary = "鏂板鍑哄簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+ public R addStockOutRecordOnly(@RequestBody StockUninventoryDto stockUninventoryDto) {
+ stockUninventoryDto.setRecordType(String.valueOf(StockOutUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+ stockUninventoryDto.setRecordId(0L);
+ return R.ok(stockUninventoryService.addStockOutRecordOnly(stockUninventoryDto));
+ }
+
@PostMapping("/exportStockUninventory")
- @ApiOperation("瀵煎嚭搴撳瓨")
+ @Operation(summary = "瀵煎嚭搴撳瓨")
public void exportStockUninventory(HttpServletResponse response, StockUninventoryDto stockUninventoryDto) {
stockUninventoryService.exportStockUninventory(response,stockUninventoryDto);
}
@PostMapping("/frozenStock")
- @ApiOperation("鍐荤粨搴撳瓨")
+ @Operation(summary = "鍐荤粨搴撳瓨")
public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockUninventoryService.frozenStock(stockInventoryDto));
}
@PostMapping("/thawStock")
- @ApiOperation("瑙ｅ喕搴撳瓨")
+ @Operation(summary = "瑙ｅ喕搴撳瓨")
public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockUninventoryService.thawStock(stockInventoryDto));
}
--
Gitblit v1.9.3