From 2b49c5d247ca32b5aaa47e50749f8b17efa3f408 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 20 八月 2024 14:42:39 +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 | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 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 31ca690..ea52ff3 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
@@ -157,14 +157,15 @@
@ApiOperation("娴佺▼鍗℃墦鍗版煡璇㈡帴鍙�")
@SaCheckPermission("SelectPrintFlowCard.search")
- @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}")
+ @PostMapping("/selectPrintFlowCard/{selectTime1}/{selectTime2}/{orderId}/{project}/{userId}")
public Result selectPrintFlowCard(
@PathVariable Date selectTime1,
@PathVariable Date selectTime2,
@PathVariable String orderId,
@PathVariable String project,
+ @PathVariable String userId,
@RequestBody FlowCard flowCard) {
- return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project, flowCard));
+ return Result.seccess(flowCardService.selectPrintFlowCardSv(selectTime1, selectTime2, orderId, project,userId, flowCard));
}
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@@ -187,9 +188,9 @@
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
- @PostMapping("/getSelectPrintLabel/{projectNo}")
- public Result getSelectPrintLabel(@PathVariable String projectNo) {
- return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo));
+ @PostMapping("/getSelectPrintLabel/{projectNo}/{type}")
+ public Result getSelectPrintLabel(@PathVariable String projectNo,@PathVariable String type) {
+ return Result.seccess(flowCardService.getSelectPrintLabelSv(projectNo,type));
}
@ApiOperation("鎵撳嵃鏍囩鏌ヨ鎺ュ彛")
@@ -302,4 +303,29 @@
@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
}
+
+ @ApiOperation("娴佺▼鍗℃槑缁嗘寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/selectPrintDetails/{inquiryMode}")
+ public Result selectPrintDetails(
+ @PathVariable String inquiryMode,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectPrintDetailsSv(object,inquiryMode));
+
+ }
+
+ @ApiOperation("鎵撳嵃鑷畾涔夋爣绛炬暟鎹寜缂栧彿鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectPrintCustomLabelDetails/{type}/{lableType}")
+ public Result getSelectPrintCustomLabelDetails( @PathVariable String type,
+ @PathVariable Integer lableType,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintCustomLabelDetailsSv(type,lableType,object));
+
+ }
+
+ @ApiOperation("鎺掑簭姹囨�绘煡璇㈡帴鍙�")
+ @PostMapping("/selectSortTable")
+ public Result selectSortTable(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.selectSortTableSv(object));
+ }
}
--
Gitblit v1.8.0