From 574a90c2d6550fa67dde1994d533fcd4c2a08735 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 21 十一月 2023 16:02:22 +0800
Subject: [PATCH] #出库过滤同库位组

---
 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