From 74e2d1ea7ce2409b5cf793fa74ba78e4ed77cd6d Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 16 七月 2025 15:27:56 +0800
Subject: [PATCH] 提交 发货管理打印标签

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportController.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 bef6352..4ff5367 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
@@ -289,4 +289,17 @@
         //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
         DownExcel.download(response, TeamOutputDTO.class, reportService.exportTeamOutputSv(dates), "TeamOutput");
     }
+
+    @ApiOperation("鍦ㄥ埗鍝佹眹鎬绘姤琛�")
+    @SaCheckPermission("workInProgress.search")
+    @PostMapping("/workInProgressCombination/{pageNum}/{pageSize}/{selectProcesses}/{optionVal}")
+    public Result workInProgressCombination(
+            @PathVariable Integer pageNum,
+            @PathVariable Integer pageSize,
+            @PathVariable String selectProcesses,
+            @PathVariable String optionVal,
+            @RequestBody WorkInProgressDTO workInProgressDTO) {
+        return Result.seccess(reportService.workInProgressCombinationSv(pageNum, pageSize, selectProcesses,optionVal, workInProgressDTO));
+
+    }
 }

--
Gitblit v1.8.0