From 4f39e676277d7a66e13d172288032ce16bb18e8c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 22 四月 2026 17:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_河南_鹤壁天沐钢化玻璃厂' into dev_河南_鹤壁天沐钢化玻璃厂
---
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 7554ff4..c92aad9 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -82,6 +82,18 @@
return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
}
+ @GetMapping("/stockIn/orderInfo")
+ @ApiOperation(value = "鍏ュ簱瀹℃壒-鍏宠仈璁㈠崟淇℃伅")
+ public AjaxResult getStockInOrderInfo(@RequestParam("approveId") String approveId) {
+ return AjaxResult.success(approveProcessService.getStockInOrderInfo(approveId));
+ }
+
+ @GetMapping("/stockIn/productList")
+ @ApiOperation(value = "鍏ュ簱瀹℃壒-鍏宠仈浜у搧鏄庣粏")
+ public AjaxResult getStockInProductList(@RequestParam("approveId") String approveId) {
+ return AjaxResult.success(approveProcessService.getStockInProductList(approveId));
+ }
+
/**
* 鏇存柊瀹℃壒
* @param approveGetAndUpdateVo
--
Gitblit v1.9.3