From fcb71b8fc63f74cd00d3faa76c73f4c5566ee352 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 07 五月 2025 23:23:09 +0800
Subject: [PATCH] 解决提升机在本层，而没有锁提升机的问题
---
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index f26d2ad..64edd4f 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -162,6 +162,7 @@
staProtocol.setInEnable(status[3]); // 鍙叆
staProtocol.setOutEnable(status[4]);// 鍙嚭
+
staProtocol.setBackErr(status[5]);
staProtocol.setLeftErr(status[6]);
staProtocol.setRightErr(status[7]);
@@ -175,6 +176,7 @@
staProtocol.setWeightErr(status2[1]);
staProtocol.setLow(status2[2]);
staProtocol.setHigh(status2[3]);
+ staProtocol.setBarcodeErr(status2[4]);
// staProtocol.setInEnable(status[13]); // 鍙叆
// staProtocol.setOutEnable(status[14]);// 鍙嚭
@@ -204,11 +206,7 @@
BasDevp sqlModel = staProtocol.toSqlModel();
stations.add(sqlModel);
- //鏆傛椂鍐欏叆鏁版嵁搴�
- BasDevp basDevp = basConveyorStaService.selectById(sta);
- if (basDevp == null) {
- basConveyorStaService.insert(sqlModel);
- }
+
}
if (!stations.isEmpty()) {
if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
@@ -308,7 +306,7 @@
if (this.ioModeOf2_5 != null && (this.ioModeOf2_5.id == 0 || this.ioModeOf2_5.id == 1)) {
short[] array = new short[1];
array[0] = this.ioModeOf2_5.id;
- if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id).IsSuccess) {
+ if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id == 1).IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐�", this.ioModeOf2_5));
log.error("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", this.ioModeOf2_5);
} else {
--
Gitblit v1.9.1