From e9e776e4ad2f191496defcca1a0250b2c49c9f4f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 二月 2025 16:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 ae654c3..eb29361 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
@@ -243,6 +243,15 @@
return Result.seccess(flowCardService.updateComposingSv(object));
}
+ @ApiOperation("澶嶉�夋鎾ら攢鍙帓鐗堢姸鎬�")
+ @SaCheckPermission("selectProcessCard.review")
+ @PostMapping("/revokeComposing")
+ public Result revokeComposing(
+ @RequestBody Map<String, Object> object
+ ) {
+
+ return Result.seccess(flowCardService.revokeComposingSv(object));
+ }
@ApiOperation("娴佺▼鍗℃墦鍗版槑缁嗘暟鎹帓搴忔煡璇㈡帴鍙�")
@PostMapping("/printFlowCardDetails/{processId}/{technologyNumber}/{process}")
public Result printFlowCardDetails(@PathVariable String processId,
@@ -426,4 +435,24 @@
public Result updateProjectProcessPrintCount(@PathVariable String projectNo){
return Result.seccess(flowCardService.updateProjectProcessPrintCount(projectNo));
}
+
+ @ApiOperation("娴佺▼鍗″悎鏋�")
+ @PostMapping("/flowCardDetail")
+ public Result flowCardDetail(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.flowCardDetail(object));
+ }
+
+ @ApiOperation("淇濆瓨娴佺▼鍗″悎鏋�")
+ @PostMapping("/updateProcessCardRack")
+ public Result updateProcessCardRack(
+ @RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.updateProcessCardRack(object));
+ }
+
+ @ApiOperation("鏅鸿兘鍒嗘灦")
+ @PostMapping("/processCardAutoRack")
+ public Result processCardAutoRack(@ RequestBody Map<String, Object> object) {
+ return Result.seccess(flowCardService.processCardAutoRack(object));
+ }
}
--
Gitblit v1.8.0