From c7631c62aac9c97e80ed59ebb2eebd4a314e0784 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 19 四月 2024 13:55:15 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProcessCardController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 cd4b6dd..cbc1ec4 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
@@ -59,8 +59,8 @@
}
- //鍒犻櫎宸ュ崟
- @ApiOperation("鍒犻櫎宸ュ崟鎺ュ彛")
+ //鍒犻櫎娴佺▼鍗�
+ @ApiOperation("鍒犻櫎娴佺▼鍗℃帴鍙�")
@PostMapping("/deleteFlowCard/{orderId}/{processId}")
public Result deleteOrderWork(
@PathVariable String orderId,
@@ -69,18 +69,19 @@
if(flowCardService.deleteFlowCardSv(orderId,processId)){
return Result.seccess();
}else {
- throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚﹀凡鎶ュ伐");
}
}
//淇敼鎺掔増鐘舵��
@ApiOperation("淇敼鎺掔増鐘舵�佹帴鍙�")
- @PostMapping("/updateLayoutStatus/{processId}")
+ @PostMapping("/updateLayoutStatus/{processId}/{state}")
public Result updateLayoutStatus(
- @PathVariable String processId
+ @PathVariable String processId,
+ @PathVariable Integer state
){
- if(flowCardService.updateLayoutStatusSv(processId)){
+ if(flowCardService.updateLayoutStatusSv(processId,state)){
return Result.seccess();
}else {
throw new ServiceException(Constants.Code_500,"淇敼澶辫触");
@@ -134,5 +135,13 @@
return Result.seccess(flowCardService.selectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,flowCard));
}
+ //娴佺▼鍗℃槑缁嗘煡璇�
+ @ApiOperation("娴佺▼鍗℃槑缁嗘煡璇㈡帴鍙�")
+ @PostMapping ("/flowCardDetail/{processId}")
+ public Result flowCardDetail(
+ @PathVariable String processId,
+ @RequestBody FlowCard flowCard){
+ return Result.seccess(flowCardService.flowCardDetailSv(processId,flowCard));
+ }
}
--
Gitblit v1.8.0