From fe52a181f66fed0f792d608696d4cb2ab10679e9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 15 四月 2025 17:01:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 74 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index aae7c02..70a9fef 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -531,24 +531,24 @@
}
// 绌烘《鍑哄簱淇″彿
- OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 18);
+ OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 8);
if (readCall.IsSuccess){
- Integer isNeed = siemensS7Net.getByteTransform().TransInt32(result.Content, 0); // IBC瑕佹《淇″彿
- Integer isFinish = siemensS7Net.getByteTransform().TransInt32(result.Content, 2); // IBC鐏岃瀹屾垚淇″彿
- Integer weight = siemensS7Net.getByteTransform().TransInt32(result.Content, 4); // IBC鐏岃閲嶉噷
- Integer isAHalf = siemensS7Net.getByteTransform().TransInt32(result.Content, 6); // IBC鍗婃《鏍囪
+ int isNeed = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 0); // IBC瑕佹《淇″彿
+ int Finish = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 2); // IBC鐏岃瀹屾垚淇″彿
+ int weight1 = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 4); // IBC鐏岃閲嶉噷
+ int isAHalf = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 6); // IBC鍗婃《鏍囪
isCalled = isNeed;
- isFinish = isFinish;
- weight = weight;
+ isFinish = Finish;
+ weight = weight1;
isHalf = isAHalf;
}
// 瀹屾垚缃愯淇″彿
- OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
- if (finish.IsSuccess){
- short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, 0);
-// isCalled = amount;
- }
+// OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
+// if (finish.IsSuccess){
+// short amount = siemensS7Net.getByteTransform().TransInt16(finish.Content, 0);
+//// isCalled = amount;
+// }
// if (isCalled == 1) {
// writeIsCalled();
@@ -838,9 +838,23 @@
}
ArrayList<Integer> staNos = getWriteStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
- OperateResult write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
- Thread.sleep(500);
- OperateResult write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo()); // 鐩爣绔�
+ OperateResult write = null;
+ OperateResult write1 = null;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(200);
+ write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ if(write.IsSuccess && write1.IsSuccess){
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ break;
+ }
+ else {
+ writeCount++;
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+ }while (writeCount<5);
if (!write.IsSuccess || !write1.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
@@ -864,9 +878,27 @@
}
ArrayList<Integer> staNos = getWriteStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
- OperateResult write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
- OperateResult write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo()); // 鐩爣绔�
- OperateResult write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr()); // 鐩爣绔�
+
+ OperateResult write = null;
+ OperateResult write1 = null;
+ OperateResult write2 = null;
+ //浠诲姟涓嬪彂娆℃暟
+ int writeCount = 0;
+ do {
+ write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ Thread.sleep(100);
+ write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ Thread.sleep(100);
+ write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr()); // 鐩爣绔�
+ if(write.IsSuccess && write1.IsSuccess){
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护鎴愬姛銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ break;
+ }
+ else {
+ writeCount++;
+ log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
+ }
+ }while (writeCount<5);
if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
@@ -882,12 +914,12 @@
}
private void writeIsCalled() throws InterruptedException {
- OperateResult write = siemensS7Net.Write("DB102.0" , 0); // 宸ヤ綔鍙�
+ OperateResult write = siemensS7Net.Write("DB102.0" , (short) 0); // 宸ヤ綔鍙�
}
private void writeIsFinish() throws InterruptedException {
- OperateResult finish = siemensS7Net.Write("DB102.2" , 0); // 宸ヤ綔鍙�
- OperateResult half = siemensS7Net.Write("DB102.6" , 0); // 宸ヤ綔鍙�
+ OperateResult finish = siemensS7Net.Write("DB102.2" , (short)0); // 宸ヤ綔鍙�
+ OperateResult half = siemensS7Net.Write("DB102.6" , (short)0); // 宸ヤ綔鍙�
}
/**
--
Gitblit v1.9.1