From 18fb477ea840e3dd4b19ff63f68f994d31fab43b Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 21 五月 2024 13:07:04 +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 | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 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 05ba080..b8a688e 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
@@ -43,6 +43,14 @@
return Result.seccess(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
}
+ /*鍙戣揣鎶ヨ〃鏌ヨ*/
+ @ApiOperation("鍙戣揣浜у搧鍒嗙被鎶ヨ〃鏌ヨ鎺ュ彛")
+ @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));
+ }
+
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@ApiOperation("鍙戣揣缂栬緫璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
@SaCheckPermission("createDelivery.search")
@@ -70,38 +78,20 @@
@SaCheckPermission("createDelivery.add")
@PostMapping("/insertDelivery")
public Result insertDelivery( @RequestBody Map<String,Object> object){
- if(deliveryService.insertDelivery(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"鍙戣揣澶辫触");
-
- }
+ return Result.seccess(deliveryService.insertDelivery(object));
}
@ApiOperation("鍙戣揣瀹℃牳淇敼鎺ュ彛")
@SaCheckPermission("createDelivery.review")
@PostMapping("/updateDeliveryToExamine")
public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
- if(deliveryService.updateDeliveryToExamine(object)){
- return Result.seccess();
-
- }else {
- throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
-
- }
+ return Result.seccess(deliveryService.updateDeliveryToExamine(object));
}
@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,"鍒犻櫎澶辫触");
-
- }
+ return Result.seccess(deliveryService.deleteDelivery(object));
}
@ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
--
Gitblit v1.8.0