From d39c0479c9ddd38dc36b3c2e29a4e5a3b24fd3d7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 02 七月 2024 17:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 13 ++++++++++---
1 files changed, 10 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 8038379..1a66b50 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
@@ -189,11 +189,18 @@
return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
}
+ @ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintLabel1")
+ public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
+ }
+
@ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrintCustomLabel/{type}")
+ @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @PathVariable Integer lableType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,object));
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
}
@@ -207,7 +214,7 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
- @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹煡璇㈡帴鍙�")
+ @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
public Result printFlowCardDetails(@PathVariable String processId,
@PathVariable String technologyNumber,
--
Gitblit v1.8.0