From 1a04230a60c65e2a7e8d1b392bc6408b2e77aa61 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期六, 22 二月 2025 13:53:17 +0800
Subject: [PATCH] 配置文件修改
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 4f72d2c..4e30f01 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,7 +224,7 @@
}
- @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�2")
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
@PostMapping("/getSelectPrintCustomLabel2/{type}/{lableType}")
public Result getSelectPrintCustomLabel2( @PathVariable String type,
@PathVariable Integer lableType,
@@ -425,4 +426,24 @@
public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
}
+
+ @ApiOperation("娴佺▼鍗″悎鏋�")
+ @PostMapping("/flowCardDetail")
+ public Result flowCardDetail(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.flowCardDetail(object));
+ }
+
+ @ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
+ @PostMapping("/updateProcessCardRack")
+ public Result updateProcessCardRack(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.updateProcessCardRack(object));
+ }
+
+ @ApiOperation("鏅鸿兘鍒嗘灦")
+ @PostMapping("/processCardAutoRack")
+ public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.processCardAutoRack(object));
+ }
}
--
Gitblit v1.8.0