From 6c8d62614b055111f20435d47319a69859a9f749 Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期六, 27 九月 2025 08:26:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
index b555f70..381e0e7 100644
--- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java
@@ -258,6 +258,8 @@
station.put("model", status1[0] ? 1 : 0);
station.put("busy", status1[1] ? 1 : 0);
station.put("hasTray", status1[2] ? 1 : 0);
+ station.put("inMode", status1[3] ? 1 : 0);
+ station.put("outMode", status1[4] ? 1 : 0);
station.put("allowShuttleTake", status2[5] ? 1 : 0);
station.put("allowShuttlePut", status2[6] ? 1 : 0);
station.put("deviceError", status2[7] ? 1 : 0);
@@ -278,11 +280,10 @@
} else if (commandObj.getInteger("mode") == 10000) {
//鍐欏叆杈撻�佺嚎鏁版嵁
- JSONObject commandBody = commandObj.getJSONObject("commandBody");
- Integer siteId = commandBody.getInteger("siteId");
- Integer staNo = commandBody.getInteger("staNo");
- Integer taskNo = commandBody.getInteger("taskNo");
- String address = commandBody.getString("address");
+ Integer siteId = commandObj.getInteger("siteId");
+ Integer staNo = commandObj.getInteger("staNo");
+ Integer taskNo = commandObj.getInteger("taskNo");
+ String address = commandObj.getString("address");
short[] array = new short[2];
array[0] = staNo.shortValue();//鐩爣绔�
@@ -290,7 +291,7 @@
resultData.put("commandData", array);
- OperateResult result = siemensS7Net.Write("address", array);
+ OperateResult result = siemensS7Net.Write(address, array);
if (result.IsSuccess) {
resultData.put("result", "success");
}
--
Gitblit v1.9.1