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/OrderController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
index 4dc6df3..63568bb 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java
@@ -3,6 +3,7 @@
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Order;
+import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.service.sd.OrderService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,14 +46,19 @@
public Result getOrderById(@PathVariable String id) {
return Result.seccess(orderService.getOrderById(id));
}
+ @PostMapping("/getOrderCraftById/{id}")
+ public Result getOrderCraftById(@PathVariable String id) {
+ return Result.seccess(orderService.getOrderCraftById(id));
+ }
@PostMapping("/reviewOrderById/{id}/{status}")
public Result reviewOrderById(@PathVariable String id,@PathVariable Integer status) {
return Result.seccess(orderService.reviewOrderById(id,status));
}
+
@PostMapping("/reviewProcessById/{id}/{status}")
- public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status) {
- return Result.seccess(orderService.reviewProcessById(id,status));
+ public Result reviewProcessById(@PathVariable String id,@PathVariable Integer status,@RequestBody List<OrderGlassDetail> orderGlassDetails) {
+ return Result.seccess(orderService.reviewProcessById(id,status,orderGlassDetails));
}
}
--
Gitblit v1.8.0