From ceb1dea2b24d5c3216816f42fd0e514613656416 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 08 十二月 2025 16:11:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 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 cf906a8..63f3dd4 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
@@ -39,8 +39,8 @@
     @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
     @SaCheckPermission("selectDelivery.search")
     @PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
-    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery) throws JsonProcessingException {
-        return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
+    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Map<String,Object> config) throws JsonProcessingException {
+        return Result.success(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,config));
     }
 
     /*鍙戣揣鎶ヨ〃鏌ヨ*/
@@ -48,7 +48,7 @@
     @SaCheckPermission("deliveryReport.search")
     @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));
+        return Result.success(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
     }
 
     /*鍙戣揣鎶ヨ〃鏌ヨ*/
@@ -56,7 +56,7 @@
     @SaCheckPermission("deliveryReport.search")
     @PostMapping("/getSelectDeliveryDetailProductReport/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectDeliveryDetailProductReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
-        return Result.seccess(deliveryService.getSelectDeliveryDetailProductReport(pageNum,pageSize,selectDate,deliveryDetail));
+        return Result.success(deliveryService.getSelectDeliveryDetailProductReport(pageNum,pageSize,selectDate,deliveryDetail));
     }
 
     /*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@@ -64,7 +64,7 @@
     @SaCheckPermission("createDelivery.search")
     @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
     public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
+        return Result.success(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
     }
 
     /*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
@@ -72,7 +72,7 @@
     @SaCheckPermission("selectOrderList.search")
     @PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}/{selectDate}")
     public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Order order){
-        return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
+        return Result.success(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
     }
 
     /*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@@ -80,40 +80,41 @@
     @SaCheckPermission("createDelivery.search")
     @PostMapping("/getSelectShippingOrderDetails/{pageNum}/{pageSize}")
     public Result getSelectShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
+        return Result.success(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
     }
     @ApiOperation("鍙戣揣鏂板鎺ュ彛")
     @SaCheckPermission("createDelivery.add")
     @PostMapping("/insertDelivery")
     public Result insertDelivery( @RequestBody Map<String,Object> object){
-        return Result.seccess(deliveryService.insertDelivery(object));
+        return Result.success(deliveryService.insertDelivery(object));
     }
+
     @ApiOperation("鍙戣揣瀹℃牳淇敼鎺ュ彛")
     @SaCheckPermission("createDelivery.review")
     @PostMapping("/updateDeliveryToExamine")
     public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
-        return Result.seccess(deliveryService.updateDeliveryToExamine(object));
+        return Result.success(deliveryService.updateDeliveryToExamine(object));
     }
 
     @ApiOperation("鍙戣揣鍒犻櫎鎺ュ彛")
     @SaCheckPermission("selectDelivery.delete")
     @PostMapping("/deleteDelivery")
     public Result deleteDelivery( @RequestBody Map<String,Object> object){
-        return Result.seccess(deliveryService.deleteDelivery(object));
+        return Result.success(deliveryService.deleteDelivery(object));
     }
 
     @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
     @SaCheckPermission("selectDelivery.search")
     @PostMapping("/getSelectDeliveryPrinting")
     public Result getSelectDeliveryPrinting( @RequestBody Map<String,Object> object) throws IllegalAccessException {
-        return Result.seccess(deliveryService.getSelectDeliveryPrinting(object));
+        return Result.success(deliveryService.getSelectDeliveryPrinting(object));
     }
 
     @ApiOperation("璁㈠崟鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
     @SaCheckPermission("selectDelivery.search")
     @PostMapping("/getSelectOrderPrinting/{selectedValues}")
     public Result getSelectOrderPrinting(@PathVariable List<String> selectedValues, @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
+        return Result.success(deliveryService.getSelectOrderPrinting(orderDetail,selectedValues));
     }
 
     @ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")
@@ -134,7 +135,7 @@
     @PostMapping ("/updateDeliveryPrintNumber/{deliveryId}")
     public Result updateDeliveryPrintNumber(@PathVariable String deliveryId)  {
 
-        return  Result.seccess(deliveryService.updateDeliveryPrintNumber(deliveryId));
+        return  Result.success(deliveryService.updateDeliveryPrintNumber(deliveryId));
     }
 
 

--
Gitblit v1.8.0