From f268121e9fe9116c19f84412b3ea992d68acf542 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 18 七月 2025 14:05:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
index 4ff5367..726aaf8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java
@@ -292,14 +292,16 @@
@ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
@SaCheckPermission("workInProgress.search")
- @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{selectProcesses}/{optionVal}")
+ @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{orderId}/{inputProject}/{selectProcesses}/{optionVal}")
public Result workInProgressCombination(
@PathVariable Integer pageNum,
@PathVariable Integer pageSize,
+ @PathVariable String orderId,
+ @PathVariable String inputProject,
@PathVariable String selectProcesses,
@PathVariable String optionVal,
@RequestBody WorkInProgressDTO workInProgressDTO) {
- return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, selectProcesses,optionVal, workInProgressDTO));
+ return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, orderId, inputProject,selectProcesses,optionVal, workInProgressDTO));
}
}
--
Gitblit v1.8.0