From 5f685f89bf6501325b6129ecf709b988369eeedd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 10:16:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 57 ++++++++++++++++++++-------------------------------------
1 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 296f4f2..11ffaee 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -55,11 +55,16 @@
add(303);add(317);
add(325);add(331);
add(333);add(339);
+ add(309);add(312);
}};
- public static final ArrayList<Integer> outInStaNos = new ArrayList<Integer>() {{
- add(102);add(105);add(106);
- add(107);add(108);
+ //楂樹綆淇″彿绔欑偣
+ public static final ArrayList<Integer> locType1StaNos = new ArrayList<Integer>() {{
+ add(100);add(103);
+ add(105);add(200);
+ add(203);add(205);
+ add(300);add(341);
+ add(346);
}};
public boolean charge0;
@@ -173,7 +178,7 @@
//璇绘潯鐮�
Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 72);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 88);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
@@ -181,6 +186,17 @@
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
+ }
+ }
+
+ //璇婚珮浣庝俊鍙�
+ Thread.sleep(100);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB1000.300", (short) (locType1StaNos.size()*2));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < locType1StaNos.size(); i++) {
+ Integer siteId = locType1StaNos.get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+ staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result3.Content, i * 2));//璇诲彇楂樹綆淇″彿
}
}
@@ -192,39 +208,6 @@
short outInModel = siemensS7Net.getByteTransform().TransInt16(result102.Content, 0);
StaProtocol staProtocol = station.get(102);
staProtocol.setOutInModel(outInModel);
- }
-
- Thread.sleep(50);
- for (Integer siteId : outInStaNos) {
- String dbAddress = "DB100.300";
- switch (siteId) {
- case 102:
- dbAddress = "DB100.300";
- break;
- case 105:
- dbAddress = "DB100.302";
- break;
- case 106:
- dbAddress = "DB100.304";
- break;
- case 107:
- dbAddress = "DB100.306";
- break;
- case 108:
- dbAddress = "DB100.308";
- break;
- }
-
- OperateResultExOne<byte[]> resultRead = siemensS7Net.Read(dbAddress, (short) 2);
- if (resultRead.IsSuccess) {
- //閾炬潯杞姩鎯呭喌
- short direction = siemensS7Net.getByteTransform().TransInt16(resultRead.Content, 0);
- StaProtocol staProtocol = station.get(siteId);
- if (direction != 0 && !staProtocol.isLoading()) {
- //鐘舵�佷负姝ｈ浆鎴栧弽杞笖鏃犵墿鏃讹紝灏嗛摼鏉¤浆鍔ㄤ俊鍙蜂綅澶嶄綅
- write4(siteId, 0);
- }
- }
}
if (result.IsSuccess && result1.IsSuccess) {
--
Gitblit v1.9.1