From 12ef5e75adbba166b4c6fdaf4b1ea624dc30b22b Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 06 一月 2026 14:34:03 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 ++----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2fec88a..29de1be 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3796,7 +3796,7 @@
case 5:////婊″彇
signWork = rgvRunWrkMastEmptyStaTakeFull(rgvSlave);
break;
- case 6:////鎻愬崌
+ case 6:////鎻愬崌4 绉诲姩
// signWork = qwe();
signWork = rgvRunWrkMastMove(rgvSlave);
break;
@@ -4022,7 +4022,7 @@
if (!basDevp.getAutoing().equals("Y")){
continue;
}
- if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (basDevp.getDevNo()>119 && basDevp.getDevNo()<122){
if (basDevp.getEmptyMk().equals("Y")){
continue;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index e09fe00..b97e087 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -130,15 +130,6 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
- connectDev = this.connect();
- while(!connectDev){
- try {
- connectDev = this.connect();
- Thread.sleep(100);
- } catch (Exception e){
-
- }
- }
// 鍚姩绾跨▼鑷姩閲嶈繛
new Thread(this::devConnect).start();
@@ -155,6 +146,7 @@
* 鍒濆鍖栫珯鐐圭姸鎬�
*/
private void initSite() {
+ connectDev = false;
try{
ArrayList<Integer> staNos = getStaNo();
// 绔欑偣缂栧彿
@@ -218,7 +210,7 @@
connectDev = this.connect();
Thread.sleep(100L);
} catch (Exception e){
-
+ initSite();
}
}
} catch (Exception e) {
--
Gitblit v1.9.1