From 4ca5d03d8d95c78e29eaeba01a5dc4eae019bad3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 25 三月 2024 11:18:31 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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 2780f6e..6c46a09 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
@@ -85,15 +85,15 @@
                 //灏忚溅蹇欑姸鎬佷綅
                 shuttleProtocol.setDeviceStatus(data.getInteger("deviceStatus"));
                 //褰撳墠浜岀淮鐮�
-                shuttleProtocol.setCurrentCode(data.getString("deviceLocation"));
+                shuttleProtocol.setCurrentCode(data.getString("deviceLocation") == null ? "0" : data.getString("deviceLocation"));
                 //鐢垫睜鐢甸噺
-                shuttleProtocol.setBatteryPower(data.getString("battery"));
+                shuttleProtocol.setBatteryPower(data.getString("battery") == null ? "0%" : data.getString("battery"));
 
 
                 //鏄惁椤跺崌
                 shuttleProtocol.setHasLift(data.getInteger("palletStatus") == 1 ? true : false);
                 //琛岄┒鏂瑰悜
-                shuttleProtocol.setRunDirection(data.getString("direction"));
+                shuttleProtocol.setRunDirection(data.getString("direction") == null ? "none" : data.getString("direction"));
 
                 ///璇诲彇鍥涘悜绌挎杞︾姸鎬�-end
 

--
Gitblit v1.9.1