From f41e272c8e5378df6fd7a8d1d41ec8116983ebe2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 05 七月 2024 10:16:52 +0800
Subject: [PATCH] 提交
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index 0db09e2..d326354 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -41,6 +41,24 @@
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
}
+
+ @ApiOperation("璁㈠崟琛ㄥご淇濆瓨")
+ @PostMapping("/saveOrderTitle")
+ @SaCheckPermission("createOrder.add")
+ public Result saveOrderTitle(@RequestBody Map<String, Object> orderMap) throws Exception {
+ if(orderService.saveOrderTitle(orderMap)) {
+ return Result.seccess(true);
+ }else{
+ throw new ServiceException(Constants.Code_500,Constants.Code_msg);
+ }
+ }
+
+ @ApiOperation("閲嶅璁㈠崟鏌ヨ")
+ @SaCheckPermission("createOrder.search")
+ @PostMapping("/selectOrder")
+ public Result selectOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
+ return Result.seccess(orderService.selectOrder(orderMap));
+ }
@ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�")
@SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
@@ -90,9 +108,11 @@
}
@ApiOperation("瀹℃牳璁㈠崟")
@SaCheckPermission("createOrder.review")
- @PostMapping("/reviewOrderById/{id}/{status}")
- public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) {
- return Result.seccess(orderService.reviewOrderById(id,status));
+ @PostMapping("/reviewOrderById/{id}/{status}/{userId}/{userName}")
+ public Result reviewOrderById(@PathVariable String id,
+ @PathVariable Integer status
+ ,@PathVariable String userId,@PathVariable String userName) {
+ return Result.seccess(orderService.reviewOrderById(id,status,userId,userName));
}
@ApiOperation("瀹℃牳宸ヨ壓")
@@ -151,5 +171,25 @@
return Result.seccess(orderService.getOrderProductDetailTag(orderId));
}
+ @ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧")
+ @GetMapping ("/printOrderProductDetail/{orderId}")
+ public Result printOrderProductDetail(@PathVariable String orderId) {
+
+ return Result.seccess(orderService.printOrderProductDetail(orderId));
+ }
+
+ @ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-灏忕墖鏄庣粏")
+ @GetMapping ("/printOrderProductGlassDetail/{orderId}")
+ public Result printOrderProductGlassDetail(@PathVariable String orderId) {
+
+ return Result.seccess(orderService.printOrderProductGlassDetail(orderId));
+ }
+ @ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧2")
+ @GetMapping ("/printOrderProductDetail/{orderId}/{selectedValues}")
+ public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable List<String> selectedValues) {
+
+ return Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
+ }
+
}
--
Gitblit v1.8.0