From 691372c235ee367e9d09e33546432952144519b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 16 四月 2024 14:59:16 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java | 3 +++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java | 2 --
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
index 8ce012d..977fba7 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/action/ShuttleAction.java
@@ -26,7 +26,6 @@
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
-import org.aspectj.apache.bcel.generic.RET;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -244,7 +243,6 @@
if (shuttleThread == null) {
return;
}
-
ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
if (shuttleProtocol == null) {
return;
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
index 091bb1d..5b117f0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/model/enums/SlaveType.java
@@ -14,7 +14,7 @@
public static SlaveType findInstance(String s){
for (SlaveType type : SlaveType.values()) {
- if (type.toString().toUpperCase().equals(s)) {
+ if (type.toString().toUpperCase().equals(s.toUpperCase())) {
return type;
}
}
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 2734158..461c4e2 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
@@ -208,6 +208,9 @@
@Override
public ShuttleProtocol getStatus() {
+ if (this.shuttleProtocol == null) {
+ return null;
+ }
return this.shuttleProtocol.clone();
}
--
Gitblit v1.9.1