From ba7530a23220c82586013aa24c05647ce041fd2a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 04 七月 2025 16:23:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
index c94ebb5..7206144 100644
--- a/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
+++ b/src/main/java/com/zy/core/thread/impl/LfdZyForkLiftMasterThread.java
@@ -10,7 +10,6 @@
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;
import com.zy.core.model.ForkLiftSlave;
-import com.zy.core.model.protocol.ForkLiftProtocol;
import lombok.extern.slf4j.Slf4j;
import java.text.MessageFormat;
@@ -24,7 +23,6 @@
public class LfdZyForkLiftMasterThread implements ThreadHandler {
private ForkLiftSlave slave;
- private ForkLiftProtocol forkLiftProtocol;
private RedisUtil redisUtil;
private SiemensS7Net siemensS7Net;
private List<HashMap<String,Object>> slaveAddressList = null;
@@ -36,7 +34,7 @@
ArrayList<HashMap<String, Object>> addressList = new ArrayList<>();
HashMap<String, Object> lift1 = new HashMap<>();
- lift1.put("status", new DbData("DB101.0", (short) 16));//鎻愬崌鏈烘暟鎹�
+ lift1.put("status", new DbData("DB101.0", (short) 18));//鎻愬崌鏈烘暟鎹�
lift1.put("staStatusTray", new DbData("DB102.0", (short) 14));//绔欑偣鏁版嵁
lift1.put("staStatusCar", new DbData("DB102.50", (short) 14));//绔欑偣鏁版嵁
lift1.put("write", new DbData("DB103.0", null));//鍐欏叆鏁版嵁
@@ -45,9 +43,9 @@
lift1.put("switchIOMode", new DbData("DB103.12", null));//鍑哄叆搴撴ā寮�
HashMap<String, Object> lift2 = new HashMap<>();
- lift2.put("status", new DbData("DB104.0", (short) 16));//鎻愬崌鏈烘暟鎹�
- lift1.put("staStatusTray", new DbData("DB105.0", (short) 14));//绔欑偣鏁版嵁
- lift1.put("staStatusCar", new DbData("DB105.50", (short) 14));//绔欑偣鏁版嵁
+ lift2.put("status", new DbData("DB104.0", (short) 18));//鎻愬崌鏈烘暟鎹�
+ lift2.put("staStatusTray", new DbData("DB105.0", (short) 14));//绔欑偣鏁版嵁
+ lift2.put("staStatusCar", new DbData("DB105.50", (short) 14));//绔欑偣鏁版嵁
lift2.put("write", new DbData("DB106.0", null));//鍐欏叆鏁版嵁
lift2.put("writeConfirm", new DbData("DB106.8", null));//鍐欏叆纭鏁版嵁
lift2.put("confirm", new DbData("DB106.10", null));//纭鍛戒护
--
Gitblit v1.9.1