From 01330d5bdc70dce94b42b41da9d86a5fbf50817e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 22 六月 2024 15:24:32 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
index 811346c..3ea5461 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
@@ -192,7 +192,7 @@
public boolean writeWorkNo(int siteId, short workNo) {
int index = findStaNosIndex(siteId);
- OperateResult write = siemensS7Net.Write("DB100." + index*6, workNo); // 宸ヤ綔鍙�
+ OperateResult write = siemensS7Net.Write("DB1001." + (index * 20 + 100 + 2), workNo); // 宸ヤ綔鍙�
if (!write.IsSuccess) {
StaProtocol staProtocol = station.get(siteId);
@@ -213,7 +213,7 @@
public boolean writeStaNo(int siteId,short staNo) {
int index = findStaNosIndex(siteId);
- OperateResult write = siemensS7Net.Write("DB100." + (index*6+4), staNo); // 鐩爣绔�
+ OperateResult write = siemensS7Net.Write("DB1001." + (index * 20 + 100 + 4), staNo); // 鐩爣绔�
if (!write.IsSuccess) {
StaProtocol staProtocol = station.get(siteId);
@@ -231,11 +231,13 @@
}
@Override
- public boolean writeWorkSta(int siteId, short staNo, short workNo) {
+ public boolean writeWorkSta(int siteId, short workNo, short staNo) {
int index = findStaNosIndex(siteId);
- OperateResult write1 = siemensS7Net.Write("DB100." + index*6, workNo); // 宸ヤ綔鍙�
- OperateResult write2 = siemensS7Net.Write("DB100." + (index*6+4), staNo); // 鐩爣绔�
+ String workNoAddress = "DB1001." + (index * 20 + 100 + 2);
+ String staNoAddress = "DB1001." + (index * 20 + 100 + 4);
+ OperateResult write1 = siemensS7Net.Write(workNoAddress, workNo); // 宸ヤ綔鍙�
+ OperateResult write2 = siemensS7Net.Write(staNoAddress, staNo); // 鐩爣绔�
if (!(write1.IsSuccess && write2.IsSuccess)) {
StaProtocol staProtocol = station.get(siteId);
@@ -288,8 +290,8 @@
WorkModeType workModeType = workModeTypeDto.getWorkModeType();
if (workModeType != WorkModeType.NONE) {
if (!siemensS7Net.Write(workModeTypeDto.getAddress(), workModeType.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("鍐欏叆杈撻�佺嚎{1}鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎缂栧彿={0}", device.getId(), workModeTypeDto.getSiteId()));
- log.error("鍐欏叆杈撻�佺嚎{1}鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎缂栧彿={0}", device.getId(), workModeTypeDto.getSiteId());
+ OutputQueue.DEVP.offer(MessageFormat.format("鍐欏叆杈撻�佺嚎{}鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎缂栧彿={}", workModeTypeDto.getSiteId(), device.getId()));
+ log.error("鍐欏叆杈撻�佺嚎{}鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎缂栧彿={}", workModeTypeDto.getSiteId(), device.getId());
}
}
}
--
Gitblit v1.9.1