From 77c7984fb636f81a87208aea2bcffc701f6419e8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 23 十月 2024 16:01:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 06e8deb..3ffe382 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -332,6 +332,14 @@
 
     }
 
+    @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜宸ョ▼鏌ヨ鎺ュ彛")
+    @PostMapping("/getPrintCustomDataProjectNo/{type}/{projectNo}")
+    public Result getPrintCustomDataProjectNo( @PathVariable String type,
+                                                    @PathVariable String projectNo) {
+        return Result.seccess(flowCardService.getPrintCustomDataProjectNo(type,projectNo));
+
+    }
+
     @ApiOperation("鎺掑簭姹囨�绘煡璇㈡帴鍙�")
     @PostMapping("/selectSortTable")
     public Result selectSortTable(
@@ -360,4 +368,20 @@
         return Result.seccess(flowCardService.checkboxDeleteSv(object));
     }
 
+    @ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏌ヨ")
+    @PostMapping("/selectPrintProjectDetails/{projectNo}")
+    public Result selectPrintProjectDetails(
+                                               @PathVariable String projectNo) {
+        return Result.seccess(flowCardService.getPrintProjectDetails(projectNo));
+
+    }
+    @ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏍囩鏌ヨ")
+    @PostMapping("/getPrintCustomDataProjectNoDetail/{type}")
+    public Result getPrintCustomDataProjectNoDetail(
+            @PathVariable String type,
+            @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,object));
+
+    }
+
 }

--
Gitblit v1.8.0