From 6c8dea924db9adf786356318581cc0572d2d299f Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 04 七月 2024 17:25:27 +0800
Subject: [PATCH] 提交
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 78 +++++++++++++++++++++++++++++++++++++--
1 files changed, 74 insertions(+), 4 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 a5ed56a..4109491 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}")
@@ -62,22 +80,39 @@
}
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟淇℃伅")
- @SaCheckPermission("selectOrder.edit")
@PostMapping("/getOrderById/{id}")
public Result getOrderById(@PathVariable String id) {
return Result.seccess(orderService.getOrderById(id));
}
+
+ @ApiOperation("鏍规嵁id鑾峰彇璁㈠崟鏄庣粏淇℃伅")
+ @SaCheckPermission("selectOrder.edit")
+ @PostMapping("/getOrderDetailById/{id}")
+ public Result getOrderDetailById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderDetailById(id));
+ }
+
+
+
+
@ApiOperation("鏌ヨ璁㈠崟宸ヨ壓")
@SaCheckPermission("updateOrderCraft.search")
@PostMapping("/getOrderCraftById/{id}")
public Result getOrderCraftById(@PathVariable String id) {
return Result.seccess(orderService.getOrderCraftById(id));
}
+
+ @PostMapping("/getOrderCraftDetailById/{id}")
+ public Result getOrderCraftDetailById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderCraftDetailById(id));
+ }
@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("瀹℃牳宸ヨ壓")
@@ -122,4 +157,39 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, OrderDTO.class, orderService.exportOrderReport(dates),"orderReport");
}
+
+ @ApiOperation("璁㈠崟浜у搧姹囨�绘姤琛ㄥ鍑�")
+ @PostMapping("/exportOrderProductSummary")
+ public void exportOrderProductSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport");
+ }
+
+ @ApiOperation("璁㈠崟灏忕墖鏍囩")
+ @PostMapping("/getOrderProductDetailTag/{orderId}")
+ public Result getOrderProductDetailTag(@PathVariable String orderId) {
+ 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}/{productId}")
+ public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable String productId) {
+
+ return Result.seccess(orderService.printOrderProductDetails(orderId,productId));
+ }
+
+
}
--
Gitblit v1.8.0