From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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..8781257 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -8,12 +8,15 @@
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.FinishedProductTreeDto;
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 io.swagger.v3.oas.annotations.Operation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -38,13 +41,30 @@
private StockInventoryService stockInventoryService;
@GetMapping("/pagestockInventory")
+ @PreAuthorize("@ss.hasPermi('list:stockInventory')")
@ApiOperation("鍒嗛〉鏌ヨ搴撳瓨")
public R pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pagestockInventory(page, stockInventoryDto);
return R.ok(stockInventoryDtoIPage);
}
+ @GetMapping("/finishedProductList")
+ @ApiOperation("鏌ヨ鎴愬搧搴撳瓨鏍�")
+ public R finishedProductList(StockInventoryDto stockInventoryDto) {
+ List<FinishedProductTreeDto> list = stockInventoryService.finishedProductList(stockInventoryDto);
+ return R.ok(list);
+ }
+
+
+ @GetMapping("/pageListCombinedStockInventory")
+ @Operation(summary = "鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
+ public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
+ IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
+ return R.ok(stockInventoryDtoIPage);
+ }
+
@PostMapping("/addstockInventory")
+ @PreAuthorize("@ss.hasPermi('add:stockInventory')")
@ApiOperation("鏂板搴撳瓨")
public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
@@ -54,6 +74,7 @@
@PostMapping("/subtractStockInventory")
+ @PreAuthorize("@ss.hasPermi('subtract:stockInventory')")
@ApiOperation("鎵ｅ噺搴撳瓨")
public R subtractStockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
stockInventoryDto.setRecordType(String.valueOf(StockOutQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_OUT.getCode()));
--
Gitblit v1.9.3