From 15e254a574f0c8bc2f7054d9d09c89f95afdd6bb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 10 七月 2024 12:22:58 +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 | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 0a9d737..681dfff 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
@@ -104,10 +104,17 @@
@ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
@SaCheckPermission("selectDelivery.search")
@PostMapping("/getSelectDeliveryPrinting")
- public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
+ public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail) throws IllegalAccessException {
return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
}
+ @ApiOperation("璁㈠崟鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectDelivery.search")
+ @PostMapping("/getSelectOrderPrinting")
+ public Result getSelectOrderPrinting( @RequestBody OrderDetail orderDetail){
+ return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail));
+ }
+
@ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")
@PostMapping("/exportDeliveryDetailReport")
public void exportDeliveryDetailReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
--
Gitblit v1.8.0