From 1342f568f4b6470efdfc69be7bb153e2b12762f9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 31 三月 2026 17:00:57 +0800
Subject: [PATCH] feat:1.销售，采购，库存，质检模块产品添加批号，供应商 2.销售产品关联批号，供应商递归查询
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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..ed2092f 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -62,7 +63,7 @@
}
- @PostMapping("importStockInventory")
+ @PostMapping("/importStockInventory")
@ApiOperation("瀵煎叆搴撳瓨")
public R importStockInventory(MultipartFile file) {
return stockInventoryService.importStockInventory(file);
@@ -82,13 +83,13 @@
stockInventoryService.exportStockInventory(response, stockInventoryDto);
}
- @GetMapping("stockInventoryPage")
+ @GetMapping("/stockInventoryPage")
@ApiOperation("搴撳瓨鎶ヨ〃鏌ヨ")
public R stockInventoryPage(Page page, StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.stockInventoryPage(stockInventoryDto,page));
}
- @GetMapping("stockInAndOutRecord")
+ @GetMapping("/stockInAndOutRecord")
@ApiOperation("缁熻鍚勪釜浜у搧鐨勫叆搴撳拰鍑哄簱璁板綍")
public R stockInAndOutRecord(StockInventoryDto stockInventoryDto,Page page) {
return R.ok(stockInventoryService.stockInAndOutRecord(stockInventoryDto,page));
@@ -105,4 +106,16 @@
public R thawStock(@RequestBody StockInventoryDto stockInventoryDto) {
return R.ok(stockInventoryService.thawStock(stockInventoryDto));
}
+
+ @ApiOperation("鏌ヨ搴撳瓨鍘熸潗鏂�")
+ @GetMapping("/getMaterials")
+ public R getMaterials(StockInventoryDto stockInventoryDto) {
+ return R.ok(stockInventoryService.getMaterials(stockInventoryDto));
+ }
+
+ @ApiOperation("鏌ヨ搴撳瓨浜у搧")
+ @GetMapping("/getStockInventoryAll")
+ public R getStockInventoryAll(ProductDto productDto) {
+ return R.ok(stockInventoryService.getStockInventoryAll(productDto));
+ }
}
--
Gitblit v1.9.3