From 26956bc393bb08eb868aeafde10c187336ad5888 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 26 三月 2024 14:23:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SurayShuttleThread.java | 20 +++++++++++++++++---
1 files changed, 17 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..f2a3918 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
@@ -147,6 +147,20 @@
return this.shuttleProtocol;
}
+ @Override
+ public synchronized boolean movePath() {
+ return false;
+ }
+
+ @Override
+ public synchronized boolean move() {
+ return false;
+ }
+
+ @Override
+ public synchronized boolean lift() {
+ return false;
+ }
//***************璁惧灞傞�氳-涓嶅悓鍘傚晢璁惧閫氳鏂规涓嶄竴鑷�***************
--
Gitblit v1.9.1