From 0ebbadc4c9b676c86a88de53ad57f10058725144 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 27 四月 2024 02:03:18 +0800
Subject: [PATCH] 设置全局异常报错信息

---
 north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java |   43 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 34 insertions(+), 9 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 206cbec..a653efd 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
@@ -28,16 +28,23 @@
 
     /*鍙戣揣璁㈠崟鏌ヨ*/
     @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
-    @PostMapping("/getseletShippingOrder/{pageNum}/{pageSize}/{selectDate}")
-    public Result getseletShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
-        return Result.seccess(deliveryService.getseletShippingOrder(pageNum,pageSize,selectDate,delivery));
+    @PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
+    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
+        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("/getseletShippingOrderDetail/{pageNum}/{pageSize}")
-    public Result getseletShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getseletShippingOrderDetail(pageNum,pageSize,orderDetail));
+    @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
+    public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
+        return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
     }
 
     /*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
@@ -49,9 +56,9 @@
 
     /*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
     @ApiOperation("鍙戣揣鏂板璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
-    @PostMapping("/getseletShippingOrderDetails/{pageNum}/{pageSize}")
-    public Result getseletShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getseletShippingOrderDetails(pageNum,pageSize,orderDetail));
+    @PostMapping("/getSelectShippingOrderDetails/{pageNum}/{pageSize}")
+    public Result getSelectShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+        return Result.seccess(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
     }
     @ApiOperation("鍙戣揣鏂板鎺ュ彛")
     @PostMapping("/insertDelivery")
@@ -76,6 +83,24 @@
         }
     }
 
+    @ApiOperation("鍙戣揣鍒犻櫎鎺ュ彛")
+    @PostMapping("/deleteDelivery")
+    public Result deleteDelivery( @RequestBody Map<String,Object> object){
+        if(deliveryService.deleteDelivery(object)){
+            return Result.seccess();
+
+        }else {
+            throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+
+        }
+    }
+
+    @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+    @PostMapping("/getSelectDeliveryPrinting")
+    public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
+        return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
+    }
+
 
 
 

--
Gitblit v1.8.0