From c67f38b68366fd30eb3b8512f49e68045d58b6d5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:33 +0800
Subject: [PATCH] 修改

---
 north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 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 f0b6be4..8038379 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
@@ -184,9 +184,17 @@
     }
 
     @ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
-    @PostMapping("/getSelectPrintLabel")
-    public Result getSelectPrintLabel(@RequestBody Map<String, Object> object) {
-        return Result.seccess(flowCardService.getSelectPrintLabelSv(object));
+    @PostMapping("/getSelectPrintLabel/{projectNo}")
+    public Result getSelectPrintLabel(@PathVariable String projectNo) {
+        return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
+    }
+
+    @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+    @PostMapping("/getSelectPrintCustomLabel/{type}")
+    public Result getSelectPrintCustomLabel( @PathVariable String type,
+                                             @RequestBody Map<String, Object> object) {
+        return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,object));
+
     }
 
     @ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
@@ -217,4 +225,24 @@
 
         }
     }
+
+    @ApiOperation("鑷畾涔夋爣绛炬墦鍗版槑缁嗘帴鍙�")
+    @PostMapping("/getCustomLabelDetail/{name}/{form}/{id}")
+    public Result getCustomLabelDetail(
+            @PathVariable String name,
+            @PathVariable String form,
+            @PathVariable String id,
+            @RequestBody FlowCard flowCard) {
+        return Result.seccess(flowCardService.getCustomLabelDetailSv(name,form,id, flowCard));
+
+    }
+
+    @ApiOperation("宸ョ▼鎵撳嵃鏌ヨ鎺ュ彛")
+    @SaCheckPermission("SelectPrintFlowCard.search")
+    @PostMapping("/selectPrintPrintProject/{selectTime1}/{selectTime2}")
+    public Result selectPrintFlowCard(
+            @PathVariable Date selectTime1,
+            @PathVariable Date selectTime2) {
+        return Result.seccess(flowCardService.selectPrintFlowCard(selectTime1, selectTime2));
+    }
 }

--
Gitblit v1.8.0