From 33308e16bbb153d9aac76fd703ec0f38ea7e344a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 09 十月 2024 15:47:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 3421f33..5e9e82d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -42,18 +42,24 @@
public Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
- log.info("StartorStop:{},{}", work,engineering);
- return Result.build(200, engineering.getEngineerId(),glass);
+ if(work){
+ return Result.build(200,"鎴愬姛",glass);
+ }else {
+ return Result.build(100,"澶辫触",glass);
+ }
}
@ApiOperation("鏆傚仠")
@PostMapping("/pause") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
- boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
- List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
- log.info("StartorStop:{},{}", work,engineering);
- return Result.build(200, engineering.getEngineerId(),glass);
+ boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
+ if(work){
+ return Result.build(200,"鎴愬姛",glass);
+ }else {
+ return Result.build(100,"鎴愬姛",glass);
+ }
}
@ApiOperation("寮�濮嬩笂鐗�")
@@ -82,7 +88,11 @@
boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
- return Result.build(200, "淇濆瓨鎴愬姛", work);
+ if (work) {
+ return Result.build(200, "淇濆瓨鎴愬姛"+engineering.getEngineerId(), true);
+ }else {
+ return Result.build(200, "淇濆瓨澶辫触"+engineering.getEngineerId(), false);
+ }
}
}
--
Gitblit v1.8.0