From 02047d917004c8f7dc44627c847583e54c297226 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 29 五月 2026 15:16:18 +0800
Subject: [PATCH] 入库管理的审批，支持修改入库数量
---
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index f26bc5f..774a95c 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -4,8 +4,7 @@
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.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.service.StockInRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,37 +20,37 @@
@Tag(name = "鍏ュ簱")
@RequestMapping("/stockInRecord")
@RequiredArgsConstructor
-public class StockInRecordController extends BaseController {
+public class StockInRecordController {
private final StockInRecordService stockInRecordService;
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱绠＄悊鍒楄〃")
- public R<?> listPage(Page page, StockInRecordDto stockInRecordDto) {
+ public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {
IPage<StockInRecordDto> result = stockInRecordService.listPage(page, stockInRecordDto);
- return R.ok(result);
+ return AjaxResult.success(result);
}
@DeleteMapping("")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
- public R<?> delete(@RequestBody List<Long> ids) {
+ public AjaxResult delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(stockInRecordService.batchDelete(ids));
+ return AjaxResult.success(stockInRecordService.batchDelete(ids));
}
@DeleteMapping("/pending")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎寰呭鎵瑰叆搴�", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎寰呭鎵圭殑鍏ュ簱璁板綍")
- public R<?> deletePending(@RequestBody List<Long> ids) {
+ public AjaxResult deletePending(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return R.ok(stockInRecordService.batchDeletePending(ids));
+ return AjaxResult.success(stockInRecordService.batchDeletePending(ids));
}
@PostMapping("/exportStockInRecord")
@@ -62,13 +61,24 @@
@PostMapping("/approve")
@Log(title = "鍏ュ簱绠＄悊-瀹℃壒鍏ュ簱", businessType = BusinessType.UPDATE)
- @Operation(summary = "鎵归噺瀹℃壒鍏ュ簱璁板綍")
- public R<?> approve(@RequestBody StockInRecordDto approveDto) {
- if(CollectionUtils.isEmpty(approveDto.getIds())){
- return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ @Operation(summary = "鎵归噺瀹℃壒鍏ュ簱璁板綍锛堟敮鎸佷慨鏀瑰叆搴撴暟閲忥級")
+ public AjaxResult approve(@RequestBody StockInRecordDto approveDto) {
+ if(CollectionUtils.isEmpty(approveDto.getItems())){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- stockInRecordService.batchApprove(approveDto.getIds(), approveDto.getApprovalStatus());
- return R.ok();
+ stockInRecordService.batchApprove(approveDto.getApprovalStatus(), approveDto.getItems());
+ return AjaxResult.success();
+ }
+
+ @PostMapping("/reAudit")
+ @Log(title = "鍏ュ簱绠＄悊-鍙嶅鍏ュ簱", businessType = BusinessType.UPDATE)
+ @Operation(summary = "鎵归噺鍙嶅鍏ュ簱璁板綍")
+ public AjaxResult reAudit(@RequestBody StockInRecordDto approveDto) {
+ if(CollectionUtils.isEmpty(approveDto.getIds())){
+ return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ }
+ stockInRecordService.batchReAudit(approveDto.getIds());
+ return AjaxResult.success();
}
}
--
Gitblit v1.9.3