From 26aa014b40fa80905990997bc848db975861c916 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 05 十二月 2024 13:27:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 17 +++++++++++++++--
1 files changed, 15 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 3ffe382..0a0b4ed 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
@@ -376,12 +376,25 @@
}
@ApiOperation("宸ョ▼鏄庣粏鎵撳嵃鏍囩鏌ヨ")
- @PostMapping("/getPrintCustomDataProjectNoDetail/{type}")
+ @PostMapping("/getPrintCustomDataProjectNoDetail/{type}/{detailType}")
public Result getPrintCustomDataProjectNoDetail(
@PathVariable String type,
+ @PathVariable Integer detailType,
@RequestBody Map<String, Object> object) {
- return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,object));
+ return Result.seccess(flowCardService.getPrintCustomDataProjectNoDetailSv(type,detailType,object));
}
+ @ApiOperation("淇敼宸ヨ壓娴佺▼")
+ @PostMapping("/updateProcess/{processId}/{technologyNumber}/{orderId}/{process}")
+ public Result updateProcess(
+ @PathVariable String processId,
+ @PathVariable String technologyNumber,
+ @PathVariable String orderId,
+ @PathVariable String process,
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.updateProcessSv(processId,technologyNumber,orderId,process,object));
+ }
}
--
Gitblit v1.8.0