From 82135a39198718fce5821b770dffdea1d2372c2c Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 27 六月 2025 08:48:53 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..b743284 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;
@@ -388,6 +387,10 @@
if (basShuttle.getStatus() == 0) {
continue;//灏忚溅琚鐢�
}
+ }
+ WrkMast wrkMast = wrkMastService.selectByShuttleNo(basShuttle.getShuttleNo());
+ if(wrkMast!=null){
+ continue;
}
diffLev.add(shuttleThread);
if (lev1 != 0) {
@@ -420,11 +423,11 @@
//妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
- boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);
- if (!checkDispatchMaxNum) {
- News.info("{}浠诲姟锛寋}灞傦紝宸茬粡杈惧埌褰撳墠妤煎眰璋冨害杞﹁締鏈�澶у��", wrkMast1.getWrkNo(), lev);
- return false;
- }
+// boolean checkDispatchMaxNum = checkDispatchMaxNum(lev);
+// if (!checkDispatchMaxNum) {
+// News.info("{}浠诲姟锛寋}灞傦紝宸茬粡杈惧埌褰撳墠妤煎眰璋冨害杞﹁締鏈�澶у��", wrkMast1.getWrkNo(), lev);
+// return false;
+// }
for (ShuttleThread shuttleThread : diffLev) {
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
--
Gitblit v1.9.1