From c46cb6a71c35f38c7f23a2d01ad686f46a3d0e0b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 26 六月 2024 15:14:44 +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 | 15 ++++++++++++---
1 files changed, 12 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 0b299a5..8038379 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,9 @@
}
@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("鎵撳嵃鑷畾涔夋爣绛炬暟鎹煡璇㈡帴鍙�")
@@ -236,4 +236,13 @@
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