From dffdcaa14f32c51a63b4ab2cc7a38eebf17f8f44 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 28 七月 2024 15:58:34 +0800
Subject: [PATCH] 修改发货报表
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 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 0db09e2..996bb83 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
@@ -4,6 +4,7 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
+import com.example.erp.dto.sd.OrderDetailProductDTO;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
@@ -41,6 +42,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}")
@@ -68,7 +87,7 @@
}
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟鏄庣粏淇℃伅")
- @SaCheckPermission("selectOrder.edit")
+ @SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderDetailById/{id}")
public Result getOrderDetailById(@PathVariable String id) {
return Result.seccess(orderService.getOrderDetailById(id));
@@ -90,9 +109,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("瀹℃牳宸ヨ壓")
@@ -145,11 +166,43 @@
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("璁㈠崟鍔犲伐鍗曟墦鍗�-灏忕墖鏄庣粏1")
+ @PostMapping ("/printOrderProductGlassDetailMonolithic/{orderId}")
+ public Result printOrderProductGlassDetailMonolithic(@PathVariable String orderId,@RequestBody List<String> selectedValues) {
+ return Result.seccess(orderService.printOrderProductGlassDetailMonolithic(orderId,selectedValues));
+ }
+ @ApiOperation("璁㈠崟鍔犲伐鍗曟墦鍗�-鎴愬搧2")
+ @GetMapping ("/printOrderProductDetail/{orderId}/{selectedValues}")
+ public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable List<String> selectedValues) {
+
+ return Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
+ }
+
+ @ApiOperation("璁㈠崟鎵撳嵃璁℃暟")
+ @PostMapping ("/updateOrderPrintNumber/{orderId}")
+ public Result updateOrderPrintNumber(@PathVariable String orderId) {
+
+ return Result.seccess(orderService.updateOrderPrintNumber(orderId));
+ }
+
}
--
Gitblit v1.8.0