From 2c98be64470f8298d3083ce337b0ffb948bee5f7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:45:34 +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 | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 08b99fc..cb85036 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
@@ -247,9 +247,20 @@
}
@ApiOperation("閫�鍥炴祦绋�")
- @PostMapping("/processBack/{orderId}")
- public Result processBack(@PathVariable String orderId) {
- return Result.seccess(orderService.processBack(orderId));
+ @PostMapping("/processBack/{orderId}/{status}")
+ public Result processBack(@PathVariable String orderId,@PathVariable Integer status) {
+ return Result.seccess(orderService.processBack(orderId,status));
+ }
+
+ @ApiOperation("鎵嬫満鎵爜鐜荤拑淇℃伅")
+ @PostMapping("/scannerGlassInfo/{projectNo}")
+ public Result scannerGlassInfo(@PathVariable String projectNo) {
+ return Result.seccess(orderService.scannerGlassInfo(projectNo));
+ }
+
+ @PostMapping("/test")
+ public Result scannerGlassInfo() {
+ return Result.seccess(null);
}
--
Gitblit v1.8.0