From 04855df566ae02edda46ccb49b3dceabc39cf0d5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 30 八月 2024 00:03:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 96 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index aaf7964..95b8243 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -194,7 +194,7 @@
// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNoSize * 4));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize*4));
// OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB100.2", (short) (staNoSize*2));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
@@ -205,28 +205,19 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4)); // 宸ヤ綔鍙�
+ staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2)); // 鐩爣绔�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2)); // 鐩爣绔�
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.2", (short) (staNoSize * 4));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.6", (short) (staNoSize * 4));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- //boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
StaProtocol staProtocol = station.get(siteId);
-
-
- staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8)); // 宸ヤ綔鍙�
-
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
-
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
-
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
@@ -240,11 +231,11 @@
staProtocol.setPakMk(true);
}
- if (staProtocol.getStamp() >= 2 && !staProtocol.isLoading()) {
+ if (staProtocol.getStamp()>=2 && !staProtocol.isLoading()){
staProtocol.setStamp(0);
- } else if (staProtocol.getStamp() < 2 && staProtocol.isLoading()) {
+ }else if (staProtocol.getStamp()<2 && staProtocol.isLoading()){
//lfd鍏ュ簱鍗拌 褰搒tamp>=2鏃舵墠鍏ュ簱
- staProtocol.setStamp(staProtocol.getStamp() + 1);
+ staProtocol.setStamp(staProtocol.getStamp()+1);
}
}
}
@@ -265,31 +256,31 @@
// }
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.0", (short) (barcodeSize * 8));
- if (result2.IsSuccess && 1 != 1) {
- if (slave.getId() == 1) {
- for (int i = 0; i < barcodeSize / 3; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.2",(short)(barcodeSize*8));
+ if (result2.IsSuccess && 1!=1) {
+ if (slave.getId()==1){
+ for (int i = 0; i < barcodeSize/3; 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)) {
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
barcodeThread.setBarcode(barcode);
}
}
- } else if (slave.getId() == 2) {
- for (int i = barcodeSize / 3; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, (i - barcodeSize / 3) * 8, 8, "UTF-8");
+ }else if (slave.getId()==2){
+ for (int i = barcodeSize/3; i < barcodeSize; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-barcodeSize/3)*8,8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
barcodeThread.setBarcode(barcode);
}
}
- } else if (slave.getId() == 3) {
- for (int i = barcodeSize / 3 + 1; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, (i - (barcodeSize / 3) * 2) * 8, 8, "UTF-8");
+ }else if (slave.getId()==3){
+ for (int i = barcodeSize/3+1; i < barcodeSize; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-(barcodeSize/3)*2)*8,8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
- if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)){
// && !Cools.isEmpty(barcode) && Cools.isEmpty(barcodeThread.getBarcode())) {
barcodeThread.setBarcode(barcode);
}
@@ -297,9 +288,48 @@
}
}
+
+ // 澶栧舰妫�娴� - 1妤�
+ Thread.sleep(50);
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB101.1", (short)48);
+ if (result4.IsSuccess) {
+ StaProtocol staProtocol100 = station.get(100);
+ StaProtocol staProtocol110 = station.get(110);
+ for (int i=0 ;i<6;i++){
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, i, 1);
+ if (i==0){
+ }else if (i==1){
+ staProtocol100.setFrontErr(status[3]);// 鍓嶈秴闄�
+ staProtocol100.setBackErr(status[4]);// 鍚庤秴闄�
+ staProtocol100.setHighErr(status[5]); // 楂樿秴闄�
+ staProtocol100.setLeftErr(status[6]);// 宸﹁秴闄�
+ }else if (i==2){
+ staProtocol100.setRightErr(status[0]);// 鍙宠秴闄�
+
+ staProtocol110.setFrontErr(status[1]);
+ staProtocol110.setBackErr(status[2]);
+ staProtocol110.setHighErr(status[3]);
+ staProtocol110.setLeftErr(status[4]);
+ staProtocol110.setRightErr(status[5]);
+ }else if (i==3){
+ }else if (i==4){
+ staProtocol100.setBarcodeErr(status[2]);
+ staProtocol110.setBarcodeErr(status[3]);
+ }else if (i==5){
+ staProtocol100.setWeightErr(status[0]);
+ staProtocol110.setWeightErr(status[1]);
+ staProtocol100.setBarcodeErr(status[2]);
+ staProtocol110.setBarcodeErr(status[3]);
+ }
+
+ }
+
+ }
+
+
if (result.IsSuccess && result1.IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
try {
@@ -317,7 +347,7 @@
initSite();
e.printStackTrace();
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- News.error("SiemensDevp" + " - 3" + " - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ News.error("SiemensDevp"+" - 3"+" - 鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
} else {
--
Gitblit v1.9.1