From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index 71f1a81..c99458b 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -4,17 +4,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.service.StockOutRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -25,7 +24,7 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2026-01-21 05:27:04
*/
-@Api(tags = "鍑哄簱")
+@Tag(name = "鍑哄簱")
@RestController
@RequestMapping("/stockOutRecord")
@AllArgsConstructor
@@ -34,37 +33,58 @@
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
- @ApiOperation(value = "鍑哄簱绠＄悊鍒楄〃")
- public AjaxResult listPage(Page page, StockOutRecordDto stockOutRecordDto) {
+ @Operation(summary = "鍑哄簱绠＄悊鍒楄〃")
+ public R listPage(Page page, StockOutRecordDto stockOutRecordDto) {
IPage<StockOutRecordDto> result = stockOutRecordService.listPage(page, stockOutRecordDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("")
@Log(title = "鍑哄簱绠＄悊-鏂板鍑哄簱", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody StockOutRecordDto stockOutRecordDto) {
- return AjaxResult.success(stockOutRecordService.add(stockOutRecordDto));
+ public R add(@RequestBody StockOutRecordDto stockOutRecordDto) {
+ return R.ok(stockOutRecordService.add(stockOutRecordDto));
}
@PutMapping("/{id}")
@Log(title = "鍑哄簱绠＄悊-鏇存柊鍑哄簱", businessType = BusinessType.UPDATE)
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StockOutRecordDto stockOutRecordDto) {
- return AjaxResult.success(stockOutRecordService.update(id, stockOutRecordDto));
+ public R update(@PathVariable("id") Long id, @RequestBody StockOutRecordDto stockOutRecordDto) {
+ return R.ok(stockOutRecordService.update(id, stockOutRecordDto));
}
@DeleteMapping("")
@Log(title = "鍑哄簱绠＄悊-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(stockOutRecordService.batchDelete(ids));
+ return R.ok(stockOutRecordService.batchDelete(ids));
+ }
+
+ @DeleteMapping("/pending")
+ @Log(title = "鍑哄簱绠＄悊-鍒犻櫎寰呭鎵瑰嚭搴�", businessType = BusinessType.DELETE)
+ @Operation(summary = "鍒犻櫎寰呭鎵圭殑鍑哄簱璁板綍")
+ public R deletePending(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)){
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ return R.ok(stockOutRecordService.batchDeletePending(ids));
}
@PostMapping("/exportStockOutRecord")
- @ApiOperation("瀵煎嚭鍑哄簱璁板綍")
+ @Operation(summary = "瀵煎嚭鍑哄簱璁板綍")
public void exportStockOutRecord(HttpServletResponse response, StockOutRecordDto stockOutRecordDto) {
stockOutRecordService.exportStockOutRecord(response,stockOutRecordDto);
}
+ @PostMapping("/approve")
+ @Log(title = "鍑哄簱绠＄悊-瀹℃壒鍑哄簱", businessType = BusinessType.UPDATE)
+ @Operation(summary = "鎵归噺瀹℃壒鍑哄簱璁板綍")
+ public R approve(@RequestBody StockOutRecordDto approveDto) {
+ if(CollectionUtils.isEmpty(approveDto.getIds())){
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ stockOutRecordService.batchApprove(approveDto.getIds(), approveDto.getApprovalStatus());
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.3