From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
index 681dfff..f2ffbd8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -110,9 +110,9 @@
@ApiOperation("璁㈠崟鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
@SaCheckPermission("selectDelivery.search")
- @PostMapping("/getSelectOrderPrinting")
- public Result getSelectOrderPrinting( @RequestBody OrderDetail orderDetail){
- return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail));
+ @PostMapping("/getSelectOrderPrinting/{selectedValues}")
+ public Result getSelectOrderPrinting(@PathVariable List<String> selectedValues, @RequestBody OrderDetail orderDetail){
+ return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
}
@ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")
@@ -129,6 +129,13 @@
DownExcel.download(response, DeliveryDetailProductDTO.class, deliveryService.exportDeliveryDetailProductReport(dates),"orderReport");
}
+ @ApiOperation("鍙戣揣鍗曟墦鍗拌鏁�")
+ @PostMapping ("/updateDeliveryPrintNumber/{deliveryId}")
+ public Result updateDeliveryPrintNumber(@PathVariable String deliveryId) {
+
+ return Result.seccess(deliveryService.updateDeliveryPrintNumber(deliveryId));
+ }
+
--
Gitblit v1.8.0