From eb90c2121359aa5a66e222d1178bbfcbb6d4018d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 10 六月 2023 19:18:25 +0800
Subject: [PATCH] 错误修复

---
 src/main/java/com/zy/asrs/controller/ShuttleController.java |    2 +-
 src/main/java/com/zy/asrs/controller/LiftController.java    |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LiftController.java b/src/main/java/com/zy/asrs/controller/LiftController.java
index 3443596..487738c 100644
--- a/src/main/java/com/zy/asrs/controller/LiftController.java
+++ b/src/main/java/com/zy/asrs/controller/LiftController.java
@@ -204,6 +204,7 @@
                 assignCommand.setTaskNo((short) 9999);
                 assignCommand.setTaskMode(param.getLiftTaskMode().shortValue());
                 assignCommand.setAuto(false);//鎵嬪姩妯″紡
+                assignCommand.setLev(param.getLev());//绉诲姩妤煎眰
 
                 if (MessageQueue.offer(SlaveType.Lift, liftSlave.getId(), new Task(3, assignCommand))) {
                     return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 0f428b9..c373d3b 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -169,7 +169,7 @@
             vo.setCurrentLiftServoSpeed(shuttleProtocol.getCurrentLiftServoSpeed());//褰撳墠鐨勫崌闄嶄己鏈嶉�熷害
             vo.setPakMk(shuttleProtocol.getPakMk()?"Y" : "N");    // 浣滀笟鏍囪
             vo.setLocNo(shuttleProtocol.getLocNo());//鍥涘悜绌挎杞﹀綋鍓嶅簱浣嶅彿
-            vo.setLev(Utils.getLev(shuttleProtocol.getLocNo()));//鍥涘悜绌挎杞﹀綋鍓嶅眰楂�
+            vo.setLev(shuttleProtocol.getLocNo() == null ? 0 : Utils.getLev(shuttleProtocol.getLocNo()));//鍥涘悜绌挎杞﹀綋鍓嶅眰楂�
             vo.setRunSpeed(basShuttle.getRunSpeed());//鍥涘悜绌挎杞﹁繍琛岄�熷害(璁剧疆)
             vo.setChargeLine(basShuttle.getChargeLine());//鍏呯數闃堝��
         }

--
Gitblit v1.9.1