From e1cd768d5d850af258cb028c04b34a886bdc12d7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 17 七月 2025 16:01:40 +0800
Subject: [PATCH] 报工班组去掉其他参数

---
 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