From 5df5dba2a321098fd0fc7e18b71549f5c2312049 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 八月 2024 17:19:13 +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 | 22 ++++++++++++++++++++--
1 files changed, 20 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 abca359..fc6c6b1 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("鎵撳嵃娴佺▼鍗¤繑宸ユ暟鎹煡璇㈡帴鍙�")
@@ -330,4 +331,21 @@
@RequestBody Map<String, Object> object) {
return Result.seccess(flowCardService.selectSortTableSv(object));
}
+
+ @ApiOperation("鍚堝苟娴佺▼鍗℃帴鍙�")
+ @PostMapping("/mergeFlowCard")
+ public Result mergeFlowCard(@RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.mergeFlowCard(object));
+ }
+ @ApiOperation("姹夌幓鑾峰彇娴佺▼鍗℃帴鍙�")
+ @PostMapping("/getProcessCardList/hanbo")
+ public Result getProcessCard() {
+ return Result.seccess(flowCardService.getProcessCard());
+ }
+
+ @ApiOperation("姹夌幓纭鎺ユ敹鎺ュ彛")
+ @PostMapping("/updateProcessCardState/hanbo")
+ public Result updateProcessCardState(@RequestBody Integer id) {
+ return Result.seccess(flowCardService.updateProcessCardState(id));
+ }
}
--
Gitblit v1.8.0