From 91f291a2c3b4e41fc0b44f2395ad5c956803ee8c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期六, 11 五月 2024 08:34:24 +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 |   63 ++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 10 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 c52b2df..05ba080 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
@@ -1,6 +1,7 @@
 package com.example.erp.controller.sd;
 
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.example.erp.common.Constants;
 import com.example.erp.common.Result;
 import com.example.erp.entity.mm.FinishedGoodsInventory;
@@ -10,6 +11,8 @@
 import com.example.erp.entity.sd.OrderDetail;
 import com.example.erp.exception.ServiceException;
 import com.example.erp.service.sd.DeliveryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,6 +20,7 @@
 import java.util.Map;
 
 @RestController
+@Api(value="鍙戣揣controller",tags={"鍙戣揣鎿嶄綔鎺ュ彛"})
 @RequestMapping("/Delivery")
 public class DeliveryController {
     @Autowired
@@ -24,29 +28,46 @@
 
 
     /*鍙戣揣璁㈠崟鏌ヨ*/
-    @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));
+    @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){
+        return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
+    }
+
+    /*鍙戣揣鎶ヨ〃鏌ヨ*/
+    @ApiOperation("鍙戣揣鎶ヨ〃鏌ヨ鎺ュ彛")
+    @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));
     }
 
     /*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
-    @PostMapping("/getseletShippingOrderDetail/{pageNum}/{pageSize}")
-    public Result getseletShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getseletShippingOrderDetail(pageNum,pageSize,orderDetail));
+    @ApiOperation("鍙戣揣缂栬緫璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
+    @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));
     }
 
     /*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
+    @ApiOperation("搴撳瓨鍙彂璐ц鍗曟煡璇㈡帴鍙ｆ帴鍙�")
+    @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));
     }
 
     /*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
-    @PostMapping("/getseletShippingOrderDetails/{pageNum}/{pageSize}")
-    public Result getseletShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
-        return Result.seccess(deliveryService.getseletShippingOrderDetails(pageNum,pageSize,orderDetail));
+    @ApiOperation("鍙戣揣鏂板璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
+    @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));
     }
-
+    @ApiOperation("鍙戣揣鏂板鎺ュ彛")
+    @SaCheckPermission("createDelivery.add")
     @PostMapping("/insertDelivery")
     public Result insertDelivery( @RequestBody Map<String,Object> object){
         if(deliveryService.insertDelivery(object)){
@@ -57,6 +78,8 @@
 
         }
     }
+    @ApiOperation("鍙戣揣瀹℃牳淇敼鎺ュ彛")
+    @SaCheckPermission("createDelivery.review")
     @PostMapping("/updateDeliveryToExamine")
     public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
         if(deliveryService.updateDeliveryToExamine(object)){
@@ -68,6 +91,26 @@
         }
     }
 
+    @ApiOperation("鍙戣揣鍒犻櫎鎺ュ彛")
+    @SaCheckPermission("selectDelivery.delete")
+    @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("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+    @SaCheckPermission("selectDelivery.search")
+    @PostMapping("/getSelectDeliveryPrinting")
+    public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
+        return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
+    }
+
 
 
 

--
Gitblit v1.8.0