From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +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 | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 b29e992..cd54af1 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
@@ -289,12 +289,13 @@
}
@ApiOperation("鎵撳嵃娴佺▼鍗¤ˉ鐗囨暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrintingRefund/{printMerge}/{printLike}")
+ @PostMapping("/getSelectPrintingRefund/{printMerge}/{printLike}/{mergeTechnologyNumber}")
public Result getSelectPrintingRefund(
@PathVariable String printMerge,
@PathVariable String printLike,
+ @PathVariable String mergeTechnologyNumber,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike));
+ return Result.seccess(flowCardService.getSelectPrintingRefundSv(object,printMerge,printLike,mergeTechnologyNumber));
}
@ApiOperation("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
@@ -336,4 +337,20 @@
public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.mergeFlowCard(object));
}
+ @ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
+ @PostMapping("/getProcessCardList/hanbo")
+ public Result getProcessCard(@RequestBody Map<String,String> processCards) {
+ return Result.seccess(flowCardService.getProcessCard(processCards));
+ }
+
+ @ApiOperation("澶嶉�夋鍒犻櫎娴佺▼鍗�")
+ @SaCheckPermission("SelectProcessCard.delete")
+ @PostMapping("/checkboxDelete")
+ public Result checkboxDelete(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.checkboxDeleteSv(object));
+ }
+
}
--
Gitblit v1.8.0