From 1b2f7cbe26f32310f528958da66ad81d4e48ca44 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 11 四月 2024 10:40:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 5812579..4f1645d 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
@@ -33,6 +33,13 @@
return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
}
+ /*鍙戣揣鎶ヨ〃鏌ヨ*/
+ @ApiOperation("鍙戣揣鎶ヨ〃鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectDeliveryDetailReport/{pageNum}/{pageSize}/{selectDate}")
+ public Result getSelectDeliveryDetailReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
+ return Result.seccess(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
+ }
+
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@ApiOperation("鍙戣揣缂栬緫璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
@PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
--
Gitblit v1.8.0