From 3ed2e039353daa5a29b822faa135663965f81d29 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 22 二月 2024 08:20:33 +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 | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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..43b0e23 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
@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
@RestController
@@ -23,22 +24,22 @@
/*鍙戣揣璁㈠崟鏌ヨ*/
- @PostMapping("/getseletShippingOrder/{pageNum}/{pageSize}")
- public Result getseletShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Delivery delivery){
- return Result.seccess(deliveryService.getseletShippingOrder(pageNum,pageSize,delivery));
+ @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));
}
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@PostMapping("/getseletShippingOrderDetail/{pageNum}/{pageSize}")
- public Result getseletShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
+ 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));
}
/*搴撳瓨鍙彂璐ц鍗曟煡璇�*/
- @PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}")
- public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Order order){
- return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,order));
+ @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));
}
/*鍙戣揣璁㈠崟鏄庣粏鏌ヨ*/
@@ -50,7 +51,6 @@
@PostMapping("/insertDelivery")
public Result insertDelivery( @RequestBody Map<String,Object> object){
- System.out.println(object);
if(deliveryService.insertDelivery(object)){
return Result.seccess();
@@ -59,6 +59,17 @@
}
}
+ @PostMapping("/updateDeliveryToExamine")
+ public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
+ System.out.println(object);
+ if(deliveryService.updateDeliveryToExamine(object)){
+ return Result.seccess();
+
+ }else {
+ throw new ServiceException(Constants.Code_500,"瀹℃牳澶辫触");
+
+ }
+ }
--
Gitblit v1.8.0