From fb8419ef141e16b8ec8b1d9802fa0d5a46768794 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 20 九月 2023 08:24:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LiftThread.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java
index 971b4ff..816e9f4 100644
--- a/src/main/java/com/zy/core/thread/LiftThread.java
+++ b/src/main/java/com/zy/core/thread/LiftThread.java
@@ -141,7 +141,7 @@
private void readStatus() {
try {
//鑾峰彇鎻愬崌鏈烘暟鎹�
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB4.0", (short) 10);
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB82.4.0", (short) 10);
if (result1.IsSuccess) {
if (null == liftProtocol) {
liftProtocol = new LiftProtocol();
@@ -154,7 +154,7 @@
//妯″紡
liftProtocol.setModel(status1[0]);
//蹇欓棽
- liftProtocol.setBusy(status1[1]);
+ liftProtocol.setBusy(!status1[1]);
//鍓嶈秴闄�
liftProtocol.setFrontOverrun(status1[4]);
//鍚庤秴闄�
@@ -220,7 +220,7 @@
Thread.sleep(200);
//鑾峰彇鎻愬崌鏈虹珯鐐规暟鎹�
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB14.0", (short) (10 * liftStaProtocols.size()));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB82.14.0", (short) (10 * liftStaProtocols.size()));
if (result1.IsSuccess) {
for (int i = 0; i < slave.getSta().size(); i++) {
LiftStaProtocol liftStaProtocol = liftStaProtocols.get(i);
@@ -233,7 +233,7 @@
//妯″紡
liftStaProtocol.setModel(status1[0]);
//蹇欓棽
- liftStaProtocol.setBusy(status1[1]);
+ liftStaProtocol.setBusy(!status1[1]);
//鏈夋墭鐩�
liftStaProtocol.setHasTray(status1[2]);
//鍓嶈秴闄�
@@ -273,7 +273,7 @@
command.setLiftNo(slave.getId().shortValue());
short[] array = getCommandArr(command);//鑾峰彇鍛戒护鎶ユ枃
- OperateResult result = siemensS7Net.Write("41088", array);
+ OperateResult result = siemensS7Net.Write("DB83.0", array);
if (result != null && result.IsSuccess) {
News.info("鎻愬崌鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
OutputQueue.LIFT.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
--
Gitblit v1.9.1