From 91b61fe723df498d62c596372521d426299f0f8b Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:54:26 +0800
Subject: [PATCH] 标签不显示标题问题
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 79 insertions(+), 8 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 994c3d1..cb85036 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,15 @@
throw new ServiceException(Constants.Code_500,Constants.Code_msg);
}
}
+ @ApiOperation("鍏朵粬绯荤粺浼犺緭璁㈠崟淇濆瓨")
+ @PostMapping("/saveOtherSystemOrder")
+ public Result saveOtherSystemOrder(@RequestBody Map<String, Object> orderMap) throws Exception {
+ if(orderService.saveOrder(orderMap)) {
+ return Result.seccess(true);
+ }else{
+ throw new ServiceException(Constants.Code_500,Constants.Code_msg);
+ }
+ }
@ApiOperation("璁㈠崟琛ㄥご淇濆瓨")
@PostMapping("/saveOrderTitle")
@@ -62,8 +72,8 @@
@ApiOperation("璁㈠崟鍒嗛〉绛涢�夋煡璇�")
@SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderList/{pageNum}/{pageSize}/{orderType}/{selectDate}")
- public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Order order) {
- return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, order,orderType));
+ public Result getOrderList(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable Integer orderType, @PathVariable List<String> selectDate, @RequestBody Map<String,Object> config) {
+ return Result.seccess(orderService.getOrderList(pageNum, pageSize, selectDate, config,orderType));
}
@ApiOperation("鍒犻櫎璁㈠崟")
@SaCheckPermission("selectOrder.delete")
@@ -86,7 +96,7 @@
}
@ApiOperation("鏍规嵁id鑾峰彇璁㈠崟鏄庣粏淇℃伅")
- @SaCheckPermission("selectOrder.edit")
+ @SaCheckPermission("selectOrder.search")
@PostMapping("/getOrderDetailById/{id}")
public Result getOrderDetailById(@PathVariable String id) {
return Result.seccess(orderService.getOrderDetailById(id));
@@ -150,6 +160,18 @@
return Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));
}
+
+ @SaCheckPermission("orderReport.search")
+ @ApiOperation("鏌ヨ璁㈠崟鎬绘姤琛�")
+ @PostMapping("/getOrderSummaryReport/{pageNum}/{pageSize}/{selectDate}")
+ public Result getOrderSummaryReport(@PathVariable Integer pageNum,
+ @PathVariable Integer pageSize,
+ @PathVariable List<String> selectDate,
+ @RequestBody Order order) {
+ return Result.seccess(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));
+
+ }
+
@ApiOperation("璁㈠崟鎶ヨ〃瀵煎嚭")
@PostMapping("/exportOrderReport")
public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
@@ -164,6 +186,15 @@
//鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport");
}
+
+ @ApiOperation("璁㈠崟鎬绘姤琛ㄥ鍑�")
+ @PostMapping("/exportOrderSummary")
+ public void exportOrderSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, Order.class, orderService.exportOrderSummary(dates),"orderReport");
+ }
+
@ApiOperation("璁㈠崟灏忕墖鏍囩")
@PostMapping("/getOrderProductDetailTag/{orderId}")
@@ -181,15 +212,55 @@
@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}/{productId}")
- public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable String productId) {
+ @GetMapping ("/printOrderProductDetail/{orderId}/{selectedValues}")
+ public Result printOrderProductDetail(@PathVariable String orderId,@PathVariable List<String> selectedValues) {
- return Result.seccess(orderService.printOrderProductDetails(orderId,productId));
+ return Result.seccess(orderService.printOrderProductDetails(orderId,selectedValues));
+ }
+
+ @ApiOperation("璁㈠崟鎵撳嵃璁℃暟")
+ @PostMapping ("/updateOrderPrintNumber/{orderId}")
+ public Result updateOrderPrintNumber(@PathVariable String orderId) {
+
+ return Result.seccess(orderService.updateOrderPrintNumber(orderId));
+ }
+
+ @ApiOperation("淇敼璁㈠崟鍙�")
+ @SaCheckPermission("createOrder.amountReset")
+ @PostMapping("/updateOrderId")
+ public Result updateOrderId(@RequestBody Map<String,Object> map) {
+ return Result.seccess(orderService.updateOrderId(map));
+ }
+
+ @ApiOperation("璁㈠崟鍙嶅鏄惁瀛樺湪鎵嬪姩澶у皬鐗�")
+ @PostMapping("/selectDifferentSize/{orderId}")
+ public Result selectDifferentSize(@PathVariable String orderId) {
+ return Result.seccess(orderService.selectDifferentSize(orderId));
+ }
+
+ @ApiOperation("閫�鍥炴祦绋�")
+ @PostMapping("/processBack/{orderId}/{status}")
+ public Result processBack(@PathVariable String orderId,@PathVariable Integer status) {
+ return Result.seccess(orderService.processBack(orderId,status));
+ }
+
+ @ApiOperation("鎵嬫満鎵爜鐜荤拑淇℃伅")
+ @PostMapping("/scannerGlassInfo/{projectNo}")
+ public Result scannerGlassInfo(@PathVariable String projectNo) {
+ return Result.seccess(orderService.scannerGlassInfo(projectNo));
+ }
+
+ @PostMapping("/test")
+ public Result scannerGlassInfo() {
+ return Result.seccess(null);
}
--
Gitblit v1.8.0