From d983b88916d7489aa154984b67e1bcfb2f13f5d1 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 06 五月 2025 11:10:43 +0800
Subject: [PATCH] 解决待机位和提升机互锁问题
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index 10bd959..68a2f30 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -30,7 +30,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.rmi.CORBA.Util;
import java.util.*;
/**
@@ -363,7 +362,7 @@
/**
* 璋冨害杞﹁締
*/
- public boolean searchDispatchShuttleNoLift(Integer wrkNo, String sourceLocNo, String locNo, String flag) {
+ public synchronized boolean searchDispatchShuttleNoLift(Integer wrkNo, String sourceLocNo, String locNo, String flag) {
ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
int lev1 = 0;
boolean tongLev = false;
@@ -389,6 +388,10 @@
continue;//灏忚溅琚鐢�
}
}
+ WrkMast wrkMast = wrkMastService.selectByShuttleNo(basShuttle.getShuttleNo());
+ if(wrkMast!=null){
+ continue;
+ }
diffLev.add(shuttleThread);
if (lev1 != 0) {
if (lev1 == Utils.getLev(shuttleProtocol.getCurrentLocNo())) {
--
Gitblit v1.9.1