From e8ba2a1bec7ffbd78cb941521b31d000890e66de Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 27 二月 2024 14:04:16 +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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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..206cbec 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,6 +10,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 +19,7 @@
import java.util.Map;
@RestController
+@Api(value="鍙戣揣controller",tags={"鍙戣揣鎿嶄綔鎺ュ彛"})
@RequestMapping("/Delivery")
public class DeliveryController {
@Autowired
@@ -24,29 +27,33 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
+ @ApiOperation("鍙戣揣璁㈠崟鏌ヨ鎺ュ彛")
@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("鍙戣揣缂栬緫璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
@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("搴撳瓨鍙彂璐ц鍗曟煡璇㈡帴鍙ｆ帴鍙�")
@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));
}
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
+ @ApiOperation("鍙戣揣鏂板璁㈠崟鏄庣粏鏌ヨ鎺ュ彛")
@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("鍙戣揣鏂板鎺ュ彛")
@PostMapping("/insertDelivery")
public Result insertDelivery( @RequestBody Map<String,Object> object){
if(deliveryService.insertDelivery(object)){
@@ -57,6 +64,7 @@
}
}
+ @ApiOperation("鍙戣揣瀹℃牳淇敼鎺ュ彛")
@PostMapping("/updateDeliveryToExamine")
public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
if(deliveryService.updateDeliveryToExamine(object)){
--
Gitblit v1.8.0