From 8449b7205be9e73ddd353f9835a40fd1d72462d4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 23 四月 2024 14:46:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java | 73 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 16 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 0e88e0c..a653efd 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
@@ -10,12 +10,16 @@
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.*;
+import java.util.List;
import java.util.Map;
@RestController
+@Api(value="鍙戣揣controller",tags={"鍙戣揣鎿嶄綔鎺ュ彛"})
@RequestMapping("/Delivery")
public class DeliveryController {
@Autowired
@@ -23,34 +27,42 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
- @PostMapping("/getseletShippingOrder/{pageNum}/{pageSize}")
- public Result getseletShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Delivery delivery){
- return Result.seccess(deliveryService.getseletShippingOrder(pageNum,pageSize,delivery));
+ @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @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("鍙戣揣鎶ヨ〃鏌ヨ鎺ュ彛")
+ @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){
- System.out.println(orderDetail.getDeliveryDetail().getDeliveryId());
- return Result.seccess(deliveryService.getseletShippingOrderDetail(pageNum,pageSize,orderDetail));
+ @ApiOperation("鍙戣揣缂栬緫璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
+ public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+ return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
}
/*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
- @PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}")
- public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Order order){
- return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,order));
+ @ApiOperation("搴撳瓨鍙彂璐ц鍗曟煡璇㈡帴鍙ｆ帴鍙�")
+ @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){
- System.out.println(orderDetail);
- return Result.seccess(deliveryService.getseletShippingOrderDetails(pageNum,pageSize,orderDetail));
+ @ApiOperation("鍙戣揣鏂板璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
+ @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("鍙戣揣鏂板鎺ュ彛")
@PostMapping("/insertDelivery")
public Result insertDelivery( @RequestBody Map<String,Object> object){
- System.out.println(object);
if(deliveryService.insertDelivery(object)){
return Result.seccess();
@@ -59,6 +71,35 @@
}
}
+ @ApiOperation("鍙戣揣瀹℃牳淇敼鎺ュ彛")
+ @PostMapping("/updateDeliveryToExamine")
+ public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
+ if(deliveryService.updateDeliveryToExamine(object)){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
+
+ }
+ }
+
+ @ApiOperation("鍙戣揣鍒犻櫎鎺ュ彛")
+ @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("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
+ @PostMapping("/getSelectDeliveryPrinting")
+ public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
+ return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));
+ }
--
Gitblit v1.8.0