From 05142e44912f1d8fd0a64cfd8bc29199f00c474f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 22 七月 2024 09:06:58 +0800
Subject: [PATCH] #OFFLINE状态复位
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java | 5 +++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 4c238ad..7c4c9f9 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -441,7 +441,7 @@
continue;
}
if (!barcodeThread.getBarcode().equals(task.getZpallet())) {
- log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝鏉＄爜涓嶇鍚�");
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝鏉＄爜涓嶇鍚堬紝浠诲姟鏉＄爜锛�"+task.getZpallet()+",绾跨▼鏉＄爜:"+barcodeThread.getBarcode());
continue;
}
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
index b652a28..aa9bc31 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java
@@ -117,6 +117,11 @@
if (deviceStatus == 255) {
//绂荤嚎
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.OFFLINE);
+ }else if (deviceStatus == 3) {
+ //灏辩华鐘舵�佷笖绂荤嚎
+ if (shuttleProtocol.getProtocolStatusType().equals(ShuttleProtocolStatusType.OFFLINE)) {
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);
+ }
}
if(deviceStatus != 4 || deviceStatus != 6 || deviceStatus != 7 || deviceStatus != 8 || deviceStatus != 255 || deviceStatus != -1) {
--
Gitblit v1.9.1