From a27ce393f9924c044dfe743b220f0300f33e79d3 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期二, 06 八月 2024 15:47:14 +0800
Subject: [PATCH] 合并相关文件
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 16 +++++++++++++---
1 files changed, 13 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 6087bd5..8096b83 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
@@ -169,10 +169,11 @@
@ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
@SaCheckPermission("PrintFlowCard.search")
- @PostMapping("/selectPrint")
+ @PostMapping("/selectPrint/{inquiryMode}")
public Result selectPrint(
+ @PathVariable String inquiryMode,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.selectPrintSv(object));
+ return Result.seccess(flowCardService.selectPrintSv(object,inquiryMode));
}
@@ -283,7 +284,7 @@
}
}
- @ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囪繑宸ユ暟鎹煡璇㈡帴鍙�")
+ @ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
@PostMapping("/getSelectPrintingRefund/{printMerge}/{printLike}")
public Result getSelectPrintingRefund(
@PathVariable String printMerge,
@@ -291,4 +292,13 @@
@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike));
}
+
+ @ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
+ @PostMapping("/getSelectPrinRework/{printMerge}/{printLike}")
+ public Result getSelectPrinRework(
+ @PathVariable String printMerge,
+ @PathVariable String printLike,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrinReworkSv(object,printMerge,printLike));
+ }
}
--
Gitblit v1.8.0