From e53d36a01183ebe660ab2d77c9bcd4e0ab6c42a3 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 06 二月 2024 19:20:06 +0800
Subject: [PATCH] #AGV 输送线扫码器扫描

---
 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 7c57f24..bcbc38e 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -184,7 +184,7 @@
 
     public void setBusyStatus(Short status) {
         this.busyStatus = status;
-        this.busyStatusType = ShuttleStatusType.get(status);
+        this.busyStatusType = ShuttleStatusType.get(status.intValue());
     }
 
     public void setBusyStatus(ShuttleStatusType type) {
@@ -337,7 +337,7 @@
         BasShuttleErrService basShuttleErrService = SpringUtils.getBean(BasShuttleErrService.class);
         BasShuttleErr basShuttleErr = basShuttleErrService.queryByCode(this.statusErrorCode.intValue());
         if (basShuttleErr == null) {
-            return null;
+            return this.statusErrorCode.toString();
         }
         return basShuttleErr.getErrName();
     }

--
Gitblit v1.9.1