From 4dc1abb37aec033fdbd09d290c6f62d082ba774a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 29 十一月 2025 17:07:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 3ba70c9..c1f788d 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
@@ -4,6 +4,8 @@
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
+import com.mes.engineerScheduling.entity.EngineerScheduling;
+import com.mes.engineerScheduling.service.EngineerSchedulingService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.glassinfo.entity.GlassInfo;
@@ -43,6 +45,9 @@
private OptimizeProjectService optimizeProjectService;
@Autowired
DamageService damageService;
+ @Autowired
+ EngineerSchedulingService engineerSchedulingService;
+
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@@ -76,6 +81,11 @@
@ResponseBody
public synchronized Result<Boolean> changeTask(@RequestBody Engineering engineering) {
try {
+ //鑾峰彇鎺掍骇椤哄簭锛屼笉鏄綋鍓嶆鍦ㄤ笂鐗囩殑宸ョ▼鍙风洿鎺ヨ繑鍥炲け璐� 鏆傛椂娉ㄩ噴锛岀瓑寰呮帓浜у姛鑳芥寮忎笂绾�
+// List<EngineerScheduling> engineerScheduling = engineerSchedulingService.queryByType(1);
+// if (!engineerScheduling.get(0).getProjectNo().equals(engineering.getEngineerId())) {
+// return Result.build(100, "璇锋牴鎹綋鍓嶆帓浜ч『搴忛�夋嫨宸ョ▼鍙凤紝鎺掍骇棣栦綅涓猴細" + engineerScheduling.get(0).getProjectNo(), false);
+// }
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
@@ -95,10 +105,10 @@
log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
engineeringService.saveEngineering(listEngineering);
- log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
//灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
boolean work = engineeringService.changeTasks(engineering);
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
+ log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
if (work) {
return Result.build(200, "淇濆瓨鎴愬姛" + engineering.getEngineerId(), true);
} else {
@@ -107,15 +117,15 @@
} else {
upPattenUsageService.deleteTask(engineering.getEngineerId());
engineeringService.deleteTask(engineering.getEngineerId());
- glassInfoService.deleteTask(engineering.getEngineerId());
+// glassInfoService.deleteTask(engineering.getEngineerId());
return Result.build(200, "璇烽噸鏂扮偣鍑讳笂鐗�" + engineering.getEngineerId(), true);
}
} catch (Exception e) {
log.info("寮傚父淇℃伅:{}", e);
log.error("寮傚父淇℃伅:{}", e);
- upPattenUsageService.deleteTask(engineering.getEngineerId());
- engineeringService.deleteTask(engineering.getEngineerId());
- glassInfoService.deleteTask(engineering.getEngineerId());
+// upPattenUsageService.deleteTask(engineering.getEngineerId());
+// engineeringService.deleteTask(engineering.getEngineerId());
+// glassInfoService.deleteTask(engineering.getEngineerId());
return Result.build(200, "淇濆瓨澶辫触" + engineering.getEngineerId(), false);
}
}
@@ -129,8 +139,8 @@
// glassInfoService.deleteTask(engineering.getEngineerId());
// upPattenUsageService.deleteTask(engineering.getEngineerId());
// optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
- //鏆傚仠宸ョ▼
- engineeringService.pauseTask(engineering.getEngineerId(), 0);
+ //鏆傚仠宸ョ▼ - > 鏀逛负鍒犻櫎宸ョ▼
+ engineeringService.deleteTask(engineering.getEngineerId());
//鏌ヨ鏈笂鐗囩殑灏忕墖淇℃伅
List<GlassInfo> glasslist = glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
return Result.build(200, "鍒犻櫎鎴愬姛" + engineering.getEngineerId(), glasslist);
--
Gitblit v1.8.0