From 2f640b1038fa331954f78ed1f4317212cf5bb34d Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 07 六月 2024 16:56:06 +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 | 98 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 76 insertions(+), 22 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..0a9d737 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,8 +1,12 @@
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.dto.mm.FinishedOperateLogDTO;
+import com.example.erp.dto.sd.DeliveryDetailDTO;
+import com.example.erp.dto.sd.DeliveryDetailProductDTO;
import com.example.erp.entity.mm.FinishedGoodsInventory;
import com.example.erp.entity.sd.Delivery;
import com.example.erp.entity.sd.DeliveryDetail;
@@ -10,13 +14,20 @@
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.DeliveryService;
+import com.example.erp.tools.DownExcel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@RestController
+@Api(value="鍙戣揣controller",tags={"鍙戣揣鎿嶄綔鎺ュ彛"})
@RequestMapping("/Delivery")
public class DeliveryController {
@Autowired
@@ -24,48 +35,91 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
- @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));
+ }
+
+ /*鍙戣揣鎶ヨ〃鏌ヨ*/
+ @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));
}
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
- @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)){
- 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();
+ return Result.seccess(deliveryService.updateDeliveryToExamine(object));
+ }
- }else {
- throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
+ @ApiOperation("鍙戣揣鍒犻櫎鎺ュ彛")
+ @SaCheckPermission("selectDelivery.delete")
+ @PostMapping("/deleteDelivery")
+ public Result deleteDelivery( @RequestBody Map<String,Object> object){
+ return Result.seccess(deliveryService.deleteDelivery(object));
+ }
- }
+ @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @SaCheckPermission("selectDelivery.search")
+ @PostMapping("/getSelectDeliveryPrinting")
+ public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
+ return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
+ }
+
+ @ApiOperation("鍙戣揣鏄庣粏鎶ヨ〃")
+ @PostMapping("/exportDeliveryDetailReport")
+ public void exportDeliveryDetailReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, DeliveryDetailDTO.class, deliveryService.exportDeliveryDetailReport(dates),"orderReport");
+ }
+
+ @ApiOperation("鍙戣揣鏄庣粏浜у搧鍒嗙被鎶ヨ〃")
+ @PostMapping("/exportDeliveryDetailProductReport")
+ public void exportDeliveryDetailProductReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
+ //鍙傛暟锛氱浉搴旂殑鏁版嵁锛屽疄浣撶被淇℃伅锛岀浉搴旂殑鏂规硶锛堟暟鎹幏鍙栵級锛岀敓鎴愮殑excel鍚嶅瓧
+ DownExcel.download(response, DeliveryDetailProductDTO.class, deliveryService.exportDeliveryDetailProductReport(dates),"orderReport");
}
--
Gitblit v1.8.0