From 68c638f6107fc3704ebe5f9ac318233b7e117b95 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 06 十二月 2024 14:24:42 +0800
Subject: [PATCH] 还原上片常州版本，去除义乌数据
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 07ec598..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
@@ -54,11 +54,11 @@
@ResponseBody
public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
-// List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
if(work){
- return Result.build(200, "鎴愬姛", null);
+ return Result.build(200,"鎴愬姛",glass);
}else {
- return Result.build(100, "鎴愬姛", null);
+ return Result.build(100,"鎴愬姛",glass);
}
}
@@ -69,7 +69,7 @@
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage != null) {
- boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
return Result.build(200, "宸蹭繚瀛樿繃", work);
@@ -85,7 +85,7 @@
engineeringService.saveEngineering(listEngineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
//灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
- boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
if (work) {
--
Gitblit v1.8.0