From 3def2ae30b07bb1f9ed8627de90b821481e5e2d5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 25 七月 2025 14:00:43 +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 | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 c933786..e9d2fba 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
@@ -187,21 +187,23 @@
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}/{flashback}")
+ @PostMapping("/getSelectPrinting/{printMerge}/{printLike}/{merge}/{flashback}/{compound}/{landingSequence}")
public Result getSelectPrinting(
@PathVariable String printMerge,
@PathVariable String printLike,
@PathVariable String merge,
@PathVariable String flashback,
+ @PathVariable String compound,
+ @PathVariable String landingSequence,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback));
+ return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge,printLike,merge,flashback,compound,landingSequence));
}
@ApiOperation("宸ョ▼鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}")
+ @PostMapping("/getSelectPrintProject/{printProject}/{merge}/{flashback}/{landingSequence}")
public Result getSelectPrintProject(
- @PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback) {
- return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback));
+ @PathVariable String printProject,@PathVariable String merge,@PathVariable String flashback,@PathVariable String landingSequence) {
+ return Result.seccess(flowCardService.getSelectPrintProject(printProject,merge,flashback,landingSequence));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
--
Gitblit v1.8.0