From de27c6f2d428632ed21a015dc6bfb73cc07f31a3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 30 三月 2023 10:43:55 +0800
Subject: [PATCH] 四向穿梭车入库模式完善

---
 src/main/java/com/zy/core/thread/LiftThread.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index f67aa95..0f9a811 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -105,7 +105,7 @@
                 //鑾峰彇鏁版嵁
                 byte[] content = result.Content;
                 //鎻愬崌鏈洪攣瀹�
-                liftProtocol.setLiftLock(modbusTcpNet.getByteTransform().TransInt16(content,0));
+                liftProtocol.setLiftLock(modbusTcpNet.getByteTransform().TransBool(content,0));
                 //浣嶇疆鍒拌揪鍙嶉
                 liftProtocol.setPositionArrivalFeedback(modbusTcpNet.getByteTransform().TransInt16(content,2));
                 //鍑嗗灏辩华
@@ -150,7 +150,7 @@
                 ///璇诲彇鎻愬崌鏈虹姸鎬�-end
 
                 OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-                log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+//                log.info(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
                 // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
                 //.....
@@ -187,7 +187,7 @@
         //鍥涘眰楂樺害璁惧畾
         array[5] = command.getHeight4();
         //鎻愬崌鏈洪攣瀹�
-        array[29] = command.getLiftLock();
+        array[29] = command.getLiftLockShortValue();
 
         OperateResult result = modbusTcpNet.Write("0", array);;
         if (result != null && result.IsSuccess) {
@@ -229,7 +229,7 @@
         command.setHeight2((short) 100);
         command.setHeight3((short) 200);
         command.setHeight4((short) 303);
-        command.setLiftLock((short) 1);
+        command.setLiftLock(true);
         thread.write(command);
 
     }

--
Gitblit v1.9.1