From 73086b1adc3d880634d4d11c35c1c2bb4eefa505 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 16 四月 2026 18:01:45 +0800
Subject: [PATCH] feat:1、工序要加是否质检、是否入库、是否报工 2、生产订单-领料、退料后端开发（关联订单，工序，bom，工艺路线）
---
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java | 7 +++++++
1 files changed, 7 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..c253728 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -44,6 +44,13 @@
return R.ok(stockInventoryDtoIPage);
}
+ @GetMapping("/pageListCombinedStockInventory")
+ @ApiOperation("鍒嗛〉鏌ヨ鑱斿悎搴撳瓨鍒楄〃")
+ public R pageListCombinedStockInventory(Page page, StockInventoryDto stockInventoryDto) {
+ IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pageListCombinedStockInventory(page, stockInventoryDto);
+ return R.ok(stockInventoryDtoIPage);
+ }
+
@PostMapping("/addstockInventory")
@ApiOperation("鏂板搴撳瓨")
public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
--
Gitblit v1.9.3