From e18062feb4097017d21ab9c87728020a0043742b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 17 十二月 2024 11:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 d155b60..1514655 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
@@ -107,9 +107,11 @@
// glassInfoService.deleteTask(engineering.getEngineerId());
// upPattenUsageService.deleteTask(engineering.getEngineerId());
// optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
+ //鏆傚仠宸ョ▼
+ engineeringService.pauseTask(engineering.getEngineerId(),0);
//鏌ヨ鏈笂鐗囩殑灏忕墖淇℃伅
List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
- return Result.build(200, "鍒犻櫎鎴愬姛"+engineering, glasslist);
+ return Result.build(200, "鍒犻櫎鎴愬姛"+engineering.getEngineerId(), glasslist);
}
--
Gitblit v1.8.0