From 211d896fdaec687976851c7d7e6a1b60701b450f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 21 七月 2023 14:25:36 +0800
Subject: [PATCH] write5
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f4280e7..e6a2015 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -489,7 +489,7 @@
OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.310", (short)2);
if(readResult.IsSuccess){
short rollback = siemensS7Net.getByteTransform().TransInt16(readResult.Content, 0);
- if (staProtocol.getRollback102().equals(rollback)) {
+ if (staProtocol.getRollback102() == (int) rollback) {
//浠诲姟鍛戒护鍐欏叆鎴愬姛
writeFlag = true;
log.info("鍐欏叆杈撻�佺嚎鍛戒护鍚庤繑鍥炴垚鍔燂紝骞朵笖鍥炶鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛寋}锛屽啓鍏ユ鏁�={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
@@ -528,15 +528,6 @@
boolean result = MessageQueue.offer(SlaveType.Devp, slave.getId(), new Task(5, staProtocol));
read();//璇诲彇1娆¤澶囩姸鎬�
return;
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂鎴愬姛 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
- log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂鎴愬姛锛� {}", slave.getId(), JSON.toJSON(staProtocol));
-
- Integer siteId = staProtocol.getSiteId();
- staProtocol = station.get(siteId);
- if ((siteId == 101 || siteId == 201)&&(staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0)) {
- staProtocol.setPakMk(true);
- }
}
}
--
Gitblit v1.9.1