From e55a701f5d4807a84eecc6aff5f69e35e9ee6af4 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 11 七月 2024 17:02:49 +0800
Subject: [PATCH] 提交
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 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 6c3b015..16256e3 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
@@ -178,9 +178,11 @@
}
@ApiOperation("鎵撳嵃娴佺▼鍗℃暟鎹煡璇㈡帴鍙�")
- @PostMapping("/getSelectPrinting")
- public Result getSelectPrinting(@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getSelectPrintingSv(object));
+ @PostMapping("/getSelectPrinting/{printMerge}")
+ public Result getSelectPrinting(
+ @PathVariable String printMerge,
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.getSelectPrintingSv(object,printMerge));
}
@ApiOperation("鎵撳嵃鏍囩鏁版嵁鏌ヨ鎺ュ彛")
@@ -262,4 +264,22 @@
return Result.seccess(flowCardService.updatePrintStateSv(printState,object));
}
+
+ @ApiOperation("娴佺▼鍗℃墦鍗拌鍗曟暟鎹帓搴忔煡璇㈡帴鍙�")
+ @PostMapping("/printFlowCardOrderSort/{orderId}")
+ public Result printFlowCardOrderSort(@PathVariable String orderId,
+ @RequestBody FlowCard flowCard) {
+ return Result.seccess(flowCardService.printFlowCardOrderSortSv(orderId, flowCard));
+ }
+
+ @ApiOperation("淇濆瓨鎵撳嵃璁㈠崟鎺掑簭鎺ュ彛")
+ @PostMapping("/printOrderSort")
+ public Result printOrderSort(@RequestBody Map<String, Object> object) {
+ if (flowCardService.printOrderSort(object)) {
+ return Result.seccess();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇濆瓨澶辫触");
+
+ }
+ }
}
--
Gitblit v1.8.0