From 2e5fe8dc8e213e4928013684d930f68fbd86b157 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 二月 2025 13:55:30 +0800
Subject: [PATCH] 流程卡合并标记打印
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 4f960ba..ae654c3 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
@@ -181,19 +181,20 @@
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting/{printMerge}/{printLike}")
+ @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}")
public Result getSelectPrinting(
@PathVariable String printMerge,
@PathVariable String printLike,
+ @PathVariable String merge,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike));
+ return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge));
}
@ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrintProject/{printProject}")
+ @PostMapping("/getSelectPrintProject/{printProject}/{merge}")
public Result getSelectPrintProject(
- @PathVariable String printProject) {
- return Result.seccess(flowCardService.getSelectPrintProject(printProject));
+ @PathVariable String printProject,@PathVariable String merge) {
+ return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
@@ -214,7 +215,7 @@
return Result.seccess(flowCardService.getSelectPrintLabelDetails(object));
}
- @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙ｆ槑缁�")
@PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
public Result getSelectPrintCustomLabel( @PathVariable String type,
@PathVariable Integer lableType,
@@ -223,6 +224,15 @@
}
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel2( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv2(type,lableType,object));
+
+ }
+
@ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
@SaCheckPermission("selectProcessCard.review")
@PostMapping("/updateComposing")
--
Gitblit v1.8.0