From 381c0218343114eaabd393c33b3d35d0b6e26f7c Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 11 七月 2024 09:12:02 +0800
Subject: [PATCH] 创建时间更新问题
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..847d38b 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;
@@ -165,6 +166,7 @@
DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport");
}
+
@ApiOperation("璁㈠崟灏忕墖鏍囩")
@PostMapping("/getOrderProductDetailTag/{orderId}")
public Result getOrderProductDetailTag(@PathVariable String orderId) {
@@ -181,15 +183,25 @@
@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));
}
--
Gitblit v1.8.0