From 962a374a511a8a222067a2b8d06bc4c4c9052b29 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 12:54:19 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 49 +++++++++++++++----------------------------------
1 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 682bf4a..7c4b956 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -52,44 +52,24 @@
add(104);add(105);
}};
- /*public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(101);add(102);add(103);
- add(104);add(105);add(106);add(107);
- add(108);add(109);
- add(201);add(202);add(203);
- add(204);add(205);add(206);add(207);
- add(208);add(209);add(210);add(211);
-
- add(401);add(402);add(403);add(404);
- }};*/
public static final ArrayList<Integer> BarcodeList1 = new ArrayList<Integer>() {{
add(1); add(2);add(3);add(4);add(5);
}};
- /* public static final ArrayList<Integer> BarcodeList2 = new ArrayList<Integer>() {{
- add(6);add(7);add(8);add(9);
- add(10); add(11); add(12); add(13);
- }};*/
- /*public static final ArrayList<Integer> staNosErrList2 = new ArrayList<Integer>() {{
- add(102); add(105);add(107);add(109);
- add(203);add(205);add(208);add(211);
- }};*/
+
public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
- add(101);
- add(102);add(103);add(104);add(105);
+
+ add(102);
}};
public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
add(101);add(102);add(103);add(104);add(105);
}};
- /*public static final ArrayList<Integer> staNoWeight2 = new ArrayList<Integer>() {{
- add(102);add(105);add(107);add(109);
- add(203);add(205);add(208);add(211);
- }};*/
+
private Integer count=0;
@@ -293,7 +273,7 @@
boolean[] status = null;
int offset = getOffsetFromSiteId(siteId);//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, offset)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
/*if (staNoWeight.contains(siteId)) {
if(staNoWeight.size() == 4){
staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(resultWeight2.Content, j));
@@ -304,8 +284,8 @@
}
}*/
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, offset+ 4)); // 鐩爣绔�
- status = siemensS7Net.getByteTransform().TransBool(result.Content, offset+ 6, 2);
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
+ status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 1);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -324,7 +304,7 @@
//鏉＄爜鎵弿鍣�
ArrayList<Integer> barcodeList = getBarcodeList();
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2848", (short) (barcodeList.size() * 8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.602", (short) (barcodeList.size() * 8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeList.size(); i++) {
Integer barcodeId = barcodeList.get(i);
@@ -338,11 +318,12 @@
//澶栧舰妫�娴�
ArrayList<Integer> staNoErrs = staNosErrList;
int staNoErrsSize = staNoErrs.size();
- OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.2808", (short) (staNoErrsSize * 4));
+ OperateResultExOne<byte[]> resultErr = siemensS7Net.Read("DB101.702", (short) (staNoErrsSize * 7));
if (resultErr.IsSuccess) {
for (int i = 0; i < staNoErrsSize; i++) {
Integer siteId = staNoErrs.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+// boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 4 + 2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErr.Content, i * 7, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setFrontErr(status[0]);
staProtocol.setBackErr(status[1]);
@@ -439,17 +420,17 @@
return;
}
ArrayList<Integer> staNos = getStaNo();
-// int index = staNos.indexOf(staProtocol.getSiteId());
- int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
+ int index = staNos.indexOf(staProtocol.getSiteId());
+// int offset = getOffsetFromSiteId2(staProtocol.getSiteId());//鍙栦綑鑾峰緱瀵瑰簲db鍧楁暟鎹�
OperateResult write = null;
OperateResult write1 = null;
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB100." + offset, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ write = siemensS7Net.Write("DB100." + index * 6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(200);
- write1 = siemensS7Net.Write("DB100." + (offset+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ 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;
--
Gitblit v1.9.1