From 976cee4892eec261f6c2927e788e476e5cc5028e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 10 三月 2025 08:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 07c4361..bf20572 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
@@ -77,12 +77,14 @@
public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
- if (upPattenUsage != null) {
+ Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
+ GlassInfo glassInfos = engineeringService.selectGlassinfoIsnull(engineering.getEngineerId());
+ if (upPattenUsage != null && engineerings != null && glassInfos != null) {
boolean work = engineeringService.changeTasks(engineering);
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
return Result.build(200, "寮�濮嬩笂鐗�", work);
- } else {
+ } else if (upPattenUsage == null && engineerings == null && glassInfos == null) {
List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
upPattenUsageService.saveUpPattenUsage(upPattenUsages);
@@ -102,6 +104,11 @@
}else {
return Result.build(200, "淇濆瓨澶辫触"+engineering.getEngineerId(), false);
}
+ } else {
+ upPattenUsageService.deleteTask(engineering.getEngineerId());
+ engineeringService.deleteTask(engineering.getEngineerId());
+ glassInfoService.deleteTask(engineering.getEngineerId());
+ return Result.build(200, "璇烽噸鏂扮偣鍑讳笂鐗�" + engineering.getEngineerId(), true);
}
}
--
Gitblit v1.8.0