From 73e1fe9e92ccd8665ec72803856ab02b17b35a08 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 07 四月 2026 16:28:05 +0800
Subject: [PATCH] Merge branch 'dev_长治_健齿齿科器材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 13 +++++++++++++
1 files changed, 13 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 f878bdb..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;
@@ -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