From 0d91c32f348565109b40c5e1c516bfdd28538bd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 02 七月 2024 11:50:17 +0800
Subject: [PATCH] 补充语言，修改成品标签打印
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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..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
@@ -184,9 +184,24 @@
}
@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("/getSelectPrintLabel1")
+ public Result getSelectPrintLabel1(@RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintLabelSv1(object));
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrintCustomLabel/{type}/{lableType}")
+ public Result getSelectPrintCustomLabel( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelSv(type,lableType,object));
+
}
@ApiOperation("澶嶉�夋淇敼鎺掔増鐘舵��")
@@ -199,7 +214,7 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
- @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹煡璇㈡帴鍙�")
+ @ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}")
public Result printFlowCardDetails(@PathVariable String processId,
@PathVariable String technologyNumber,
@@ -217,4 +232,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