From 6fa0eca8982af6a45b65477a232de3e3e2c972d7 Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 02 五月 2025 18:22:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c0277e9..47a26e4 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -295,39 +295,39 @@
News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+1+"]");
Thread.sleep(100);
do {
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100."+(index*66 +6), (short) 2);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100." + (index * 66 + 6), (short) 2);
short mk = siemensS7Net.getByteTransform().TransInt16(result2.Content, 0);
- if (mk == 2){
- OperateResult write5 = siemensS7Net.Write("DB100." + index*66, 0); // 宸ヤ綔鍙�
+ if (mk == 2) {
+ OperateResult write5 = siemensS7Net.Write("DB100." + index * 66, 0); // 宸ヤ綔鍙�
Thread.sleep(100);
- OperateResult write6 = siemensS7Net.Write("DB100." + (index*66+4), (short) 0); // 鐩爣绔�
+ OperateResult write6 = siemensS7Net.Write("DB100." + (index * 66 + 4), (short) 0); // 鐩爣绔�
Thread.sleep(100);
- OperateResult write4 = siemensS7Net.Write("DB100." + (index*66+6), (short) 0);
+ OperateResult write4 = siemensS7Net.Write("DB100." + (index * 66 + 6), (short) 0);
reset = false;
- if (write4.IsSuccess && write5.IsSuccess && write6.IsSuccess){
- News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100."+(index*66), (short) 8);
+ if (write4.IsSuccess && write5.IsSuccess && write6.IsSuccess) {
+ News.info("杈撻�佺嚎鍛戒护涓嬪彂[id:" + slave.getId() + "] >>>>>" + "[" + "0,0,0" + "]");
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100." + (index * 66), (short) 8);
Integer wrkNo1 = siemensS7Net.getByteTransform().TransInt32(result1.Content, 0);
short staNo1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 4);
short mk1 = siemensS7Net.getByteTransform().TransInt16(result1.Content, 6);
- if (wrkNo1 != 0 || staNo1 !=0 || mk1 !=0){
+ if (wrkNo1 != 0 || staNo1 != 0 || mk1 != 0) {
whileCount++;
- News.info("澶嶄綅澶辫触,杈撻�佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"0,0,0"+"]");
- }else {
+ News.info("澶嶄綅澶辫触,杈撻�佺嚎鍛戒护涓嬪彂[id:" + slave.getId() + "] >>>>>" + "[" + "0,0,0" + "]");
+ } else {
News.info("杈撻�佺嚎澶嶄綅瀹屾垚");
break;
}
}
- }else if (reset && mk == 0 ){
- OperateResult write7 = siemensS7Net.Write("DB100." + (index*66+6), (short) 1);
- News.info("鍥炶1澶辫触锛岃緭閫佺嚎鍛戒护涓嬪彂[id:"+slave.getId()+"] >>>>>"+"["+"1"+"]");
+ } else if (reset && mk == 0) {
+ OperateResult write7 = siemensS7Net.Write("DB100." + (index * 66 + 6), (short) 1);
+ News.info("鍥炶1澶辫触锛岃緭閫佺嚎鍛戒护涓嬪彂[id:" + slave.getId() + "] >>>>>" + "[" + "1" + "]");
Thread.sleep(100);
whileCount++;
- }else {
+ } else {
whileCount++;
}
- }while (whileCount <10);
+ } while (whileCount < 10);
}
}else {
log.error("杈撻�佸懡浠や笅鍙戝け璐�"+JSON.toJSONString(staProtocol));
@@ -349,7 +349,7 @@
int index = staNos.indexOf(staProtocol.getSiteId());
do {
log.info("杈撻�侀�掑綊娆℃暟:" + count);
- OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ OperateResult write1 = siemensS7Net.Write("DB100." + index * 66, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
Thread.sleep(100);
OperateResult write2 = siemensS7Net.Write("DB100." + (index * 66 + 4), staProtocol.getStaNo()); // 鐩爣绔�
if (write1.IsSuccess && write2.IsSuccess) {
--
Gitblit v1.9.1