From 66d041ed14b3ed3ed7183a28a5c588e235fc21d0 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 26 五月 2026 11:14:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro
---
src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
index 39401c4..0798cdc 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockUninventoryController.java
@@ -2,17 +2,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockUninventoryDto;
import com.ruoyi.stock.service.StockUninventoryService;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
/**
* <p>
@@ -24,49 +25,72 @@
*/
@RestController
@RequestMapping("/stockUninventory")
+@AllArgsConstructor
public class StockUninventoryController {
- @Autowired
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 = "鏂板搴撳瓨")
+ @Log(title = "鏂板涓嶅悎鏍煎簱瀛�", businessType = BusinessType.INSERT)
public R addstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
- stockUninventoryDto.setRecordType(String.valueOf(StockInUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
+ stockUninventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
stockUninventoryDto.setRecordId(0L);
return R.ok(stockUninventoryService.addStockUninventory(stockUninventoryDto));
}
@PostMapping("/subtractstockUninventory")
- @ApiOperation("鎵ｅ噺搴撳瓨")
+ @Operation(summary = "鎵ｅ噺搴撳瓨")
+ @Log(title = "鎵ｅ噺涓嶅悎鏍煎簱瀛�", businessType = BusinessType.UPDATE)
public R subtractstockUninventory(@RequestBody StockUninventoryDto stockUninventoryDto) {
- stockUninventoryDto.setRecordType(String.valueOf(StockOutUnQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+ stockUninventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
stockUninventoryDto.setRecordId(0L);
return R.ok(stockUninventoryService.subtractStockUninventory(stockUninventoryDto));
}
+ @PostMapping("/addStockInRecordOnly")
+ @Operation(summary = "鏂板鍏ュ簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+ @Log(title = "鏂板涓嶅悎鏍煎簱瀛樺叆搴撹褰�", businessType = BusinessType.INSERT)
+ public R addStockInRecordOnly(@RequestBody StockUninventoryDto stockUninventoryDto) {
+ stockUninventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_IN.getCode()));
+ stockUninventoryDto.setRecordId(0L);
+ return R.ok(stockUninventoryService.addStockInRecordOnly(stockUninventoryDto));
+ }
+
+ @PostMapping("/addStockOutRecordOnly")
+ @Operation(summary = "鏂板鍑哄簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�")
+ @Log(title = "鏂板涓嶅悎鏍煎簱瀛樺嚭搴撹褰�", businessType = BusinessType.INSERT)
+ public R addStockOutRecordOnly(@RequestBody StockUninventoryDto stockUninventoryDto) {
+ stockUninventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_UNSTOCK_OUT.getCode()));
+ stockUninventoryDto.setRecordId(0L);
+ return R.ok(stockUninventoryService.addStockOutRecordOnly(stockUninventoryDto));
+ }
+
@PostMapping("/exportStockUninventory")
- @ApiOperation("瀵煎嚭搴撳瓨")
+ @Operation(summary = "瀵煎嚭搴撳瓨")
+ @Log(title = "瀵煎嚭涓嶅悎鏍煎簱瀛�", businessType = BusinessType.EXPORT)
public void exportStockUninventory(HttpServletResponse response, StockUninventoryDto stockUninventoryDto) {
stockUninventoryService.exportStockUninventory(response,stockUninventoryDto);
}
@PostMapping("/frozenStock")
- @ApiOperation("鍐荤粨搴撳瓨")
+ @Operation(summary = "鍐荤粨搴撳瓨")
+ @Log(title = "鍐荤粨涓嶅悎鏍煎簱瀛�", businessType = BusinessType.UPDATE)
public R frozenStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockUninventoryService.frozenStock(stockInventoryDto));
}
@PostMapping("/thawStock")
- @ApiOperation("瑙ｅ喕搴撳瓨")
+ @Operation(summary = "瑙ｅ喕搴撳瓨")
+ @Log(title = "瑙ｅ喕涓嶅悎鏍煎簱瀛�", businessType = BusinessType.UPDATE)
public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockUninventoryService.thawStock(stockInventoryDto));
}
--
Gitblit v1.9.3