From 0f0694b9a72196d92ce10ada588240121c4c0448 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 26 四月 2024 13:41:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 136 ++++++++-------------------------------------
1 files changed, 25 insertions(+), 111 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 96d1699..90cbc08 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -49,10 +49,11 @@
//
// }};
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);
- add(104);add(105);add(106);add(107);
- add(108);add(109);add(110);add(111);
- add(1000);
+ add(100);add(101);add(102);add(103);add(104);
+ add(200);add(201);add(202);add(203);add(204);
+ }};
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(300);add(301);add(302);add(303);add(304);
}};
@@ -63,7 +64,7 @@
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 1;
+ private int barcodeSize = 2;
/**
* 鍏ュ嚭搴撴ā寮�
@@ -86,6 +87,8 @@
switch (slave.getId()) {
case 1:
return staNos1;
+ case 2:
+ return staNos2;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -198,45 +201,9 @@
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4+2)); // 鐩爣绔�
}
}
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 186);
-// if (result0.IsSuccess) {
-// for (int i = 0; i < 93; i++) {
-// Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
-// }
-// }
- //鏉＄爜鎵弿鍣�
- Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.26",(short)(8));
- if (result2.IsSuccess) {
- if (slave.getId()==1){
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
- if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
-// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
- barcodeThread.setBarcode(barcode);
- }
-
- }
-
- }
-
- //鎺ユ敹瓒呭瓒呴珮娌℃壂鍒版潯鐮佹姤璀�
- Thread.sleep(200);
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.34",(short)(1));
- if (result4.IsSuccess) {
- startSignal = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
- }
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize * 2));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB100.60", (short) (staNoSize * 2));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -260,82 +227,29 @@
if (!staProtocol.isLoading()){
staProtocol.setStamp(0);
}
-// if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
-// //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
-// staProtocol.setStamp(staProtocol.getStamp()+1);
-// }
-
-// //20230110锛屾棩蹇楁墦鍗帮紝纭鏀跺埌鍏ュ簱绔欏彲鍏ヤ俊鍙锋椂锛屽搴旀潯鐮佹暟鎹槸鍚﹀凡鏈�
-// if ((siteId==101 || siteId==109 || siteId==117 || siteId==201 || siteId==207 || siteId==213)
-// && staProtocol.isInEnable()){
-// Integer barcodeId = 0;
-// switch (siteId){
-// case 101:
-// barcodeId=1;
-// break;
-// case 109:
-// barcodeId=2;
-// break;
-// case 117:
-// barcodeId=3;
-// break;
-// case 201:
-// barcodeId=4;
-// break;
-// case 207:
-// barcodeId=5;
-// break;
-// case 213:
-// barcodeId=6;
-// break;
-// }
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
-// if(barcodeThread!=null){
-// //lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
-// staProtocol.setStamp(staProtocol.getStamp()+1);
-// News.info("{}绔欐湁鍙叆淇″彿鏃讹紝鏉＄爜鍊间负{}", siteId, barcodeThread.getBarcode());
-// if(Cools.isEmpty(barcodeThread.getBarcode())){
-// staProtocol.setInEnable(false);//鏉＄爜鏁版嵁涓虹┖鏃讹紝鍏堟竻涓�娆″唴瀛樼殑绔欑偣鍙叆淇″彿锛岀瓑寰呬笅涓�娆¤幏鍙栧彲鍏ヤ俊鍙�
-// }
-// }
-// }
}
}
-
- //RGV鍙拌溅浣嶇疆
+ //鎺ユ敹瓒呭瓒呴珮娌℃壂鍒版潯鐮佹姤璀�
Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
- if (result3.IsSuccess) {
- Integer siteId = 1000; // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
-// String aa = staProtocol.getNearbySta();
-// System.out.println(siteId + "===>>" + staProtocol.getNearbySta());
-
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.34",(short)(1));
+ if (result4.IsSuccess) {
+ startSignal = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
}
-// //RGV灏忚溅
-// Thread.sleep(200);
-// OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.160",(short)2);
-// if (result3.IsSuccess) {
-// Integer siteId = 16;
-// StaProtocol staProtocol = station.get(siteId);
-// if (null == staProtocol) {
-// staProtocol = new StaProtocol();
-// staProtocol.setSiteId(siteId);
-// station.put(siteId, staProtocol);
-// }
-// staProtocol.setNearbySta(String.valueOf(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0)));
-// }
-
-
+ //鏉＄爜鎵弿鍣�
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.90",(short)(barcodeSize*8));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeSize; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
+ }
if (result.IsSuccess && result1.IsSuccess) {
--
Gitblit v1.9.1