From 01b07fdef6c2117c3672b0d90b8b2f2218bdd659 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 31 十月 2025 09:44:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 593d0f6..7e0ea1d 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());
--
Gitblit v1.8.0