From b0c60452329a61c32db74a1c7d7753d383d6310a Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 九月 2025 08:20:53 +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/pp/ProcessCardController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
index 10a9176..c6729a2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java
@@ -440,16 +440,17 @@
}
@ApiOperation("淇敼宸ヨ壓娴佺▼")
- @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
+ @PostMapping("/updateProcess/{processId}/{orderNumber}/{technologyNumber}/{orderId}/{process}")
public Result updateProcess(
@PathVariable String processId,
+ @PathVariable String orderNumber,
@PathVariable String technologyNumber,
@PathVariable String orderId,
@PathVariable String process,
@RequestBody Map<String, Object> object
) {
- return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
+ return Result.seccess(flowCardService.updateProcessSv(processId,orderNumber,technologyNumber,orderId,process,object));
}
@ApiOperation("宸ョ▼鎵撳嵃鏍囩娆℃暟淇敼")
@@ -503,4 +504,14 @@
return Result.seccess(flowCardService.updateTerminationSv(processId,orderNumber,value));
}
+
+ @ApiOperation("鏌ヨ鐢ㄤ簬淇敼鐢熶骇缁堟鏁伴噺鐨勫畬宸ユ暟閲�")
+ @PostMapping("/selectCompleted/{processId}/{orderNumber}/{process}")
+ public Result selectCompleted(
+ @PathVariable String processId,
+ @PathVariable Integer orderNumber,
+ @PathVariable String process) {
+ return Result.seccess(flowCardService.selectCompletedSv(processId, orderNumber,process));
+
+ }
}
--
Gitblit v1.8.0