From d35d14bc183e7275e79cb64537ce28dc83f271f0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 13 五月 2024 10:53:30 +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 | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 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 73720a7..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;
@@ -28,13 +29,23 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
@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));
+ }
+
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@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));
@@ -42,6 +53,7 @@
/*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
@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));
@@ -49,11 +61,13 @@
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@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)){
@@ -65,6 +79,7 @@
}
}
@ApiOperation("鍙戣揣瀹℃牳淇敼鎺ュ彛")
+ @SaCheckPermission("createDelivery.review")
@PostMapping("/updateDeliveryToExamine")
public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
if(deliveryService.updateDeliveryToExamine(object)){
@@ -76,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