From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 114 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 80 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 bda6582..8628514 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -77,6 +77,12 @@
*/
public IoModeType ioModeOf1F = IoModeType.NONE;
public IoModeType ioModeOf2F = IoModeType.NONE;
+ public IoModeType ioModeOf3F = IoModeType.NONE;
+ public short ioModeOf3FX = 0;
+ public short ioModeOf3FD = 0;
+ public IoModeType ioModeOf4F = IoModeType.NONE;
+ public short ioModeOf4FX = 0;
+ public short ioModeOf4FD = 0;
private ArrayList<Integer> getStaNo() {
switch (slave.getId()) {
@@ -154,9 +160,9 @@
// 鏇存柊鍏ュ嚭搴撴ā寮�
updateIoMode();
ArrayList<Integer> staNos = getStaNo();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) 50);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100.0", (short) (staNos.size()*2));
if (result.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -168,9 +174,9 @@
}
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) 50);
+ OperateResultExOne<byte[]> result0 = siemensS7Net.Read("DB101.0", (short) (staNos.size()*2));
if (result0.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
@@ -181,12 +187,25 @@
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result0.Content, i*2)); // 鐩爣绔�
}
}
+ if (slave.getId()!=1){
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result2F = siemensS7Net.Read("DB102.50", (short) (4));
+ if (result2F.IsSuccess) {
+ if (slave.getId()==2){
+ this.ioModeOf3FX = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 0);
+ this.ioModeOf3FD = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 2);
+ } if (slave.getId()==3){
+ this.ioModeOf4FX = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 0);
+ this.ioModeOf4FD = siemensS7Net.getByteTransform().TransInt16(result2F.Content, 2);
+ }
+ }
+ }
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) 50);
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) (staNos.size()*2));
if (result1.IsSuccess) {
- for (int i = 0; i < 25; i++) {
+ for (int i = 0; i < staNos.size(); i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*2, 1);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i * 2, 1);
StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
@@ -199,10 +218,10 @@
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
- }else if (staProtocol.getSiteId().equals(300)){
+ } else if (staProtocol.getSiteId().equals(300)) {
BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
BasDevp basDevp = basDevpMapper.selectByDevNo(300);
- if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())){
+ if (!basDevp.getWrkNo().equals(basDevp.getWrkNo1())) {
staProtocol.setPakMk(true);
}
}
@@ -211,26 +230,37 @@
//璇绘潯鐮�
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(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 (slave.getId()==1){
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(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);
+ }
+ }
+
+ }
+
+ // 鍏呯數淇″彿浣�
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
+ if (result3.IsSuccess) {
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
+ charge0 = status[0];
+ charge1 = status[1];
+ charge2 = status[2];
+ }
+ } else {
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.100",(short)(8));
+ if (result2.IsSuccess) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,0,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId()+1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
}
-
- }
-
- // 鍏呯數淇″彿浣�
- Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
- if (result3.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
- charge0 = status[0];
- charge1 = status[1];
- charge2 = status[2];
}
if (result.IsSuccess && result0.IsSuccess && result1.IsSuccess) {
@@ -405,16 +435,32 @@
// 鏇存柊鍏ュ嚭搴撴ā寮�
private void updateIoMode() throws InterruptedException {
- if (this.ioModeOf1F != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
- News.error("鍐欏叆杈撻�佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ if (slave.getId()==1){
+ if (this.ioModeOf1F != IoModeType.NONE) {
+ if (!siemensS7Net.Write("DB100.180", this.ioModeOf1F.id).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+// News.error("鍐欏叆杈撻�佺嚎103鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ }
}
- }
- if (this.ioModeOf2F != IoModeType.NONE) {
- if (!siemensS7Net.Write("DB100.182", this.ioModeOf2F.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
- News.error("鍐欏叆杈撻�佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ if (this.ioModeOf2F != IoModeType.NONE) {
+ if (!siemensS7Net.Write("DB100.182", this.ioModeOf2F.id).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+// News.error("鍐欏叆杈撻�佺嚎203鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ }
+ }
+ } else if (slave.getId()==2){
+ if (this.ioModeOf3F != IoModeType.NONE && this.ioModeOf3F.id/2 != this.ioModeOf3FX) {
+ if (!siemensS7Net.Write("DB102.50", (short) (this.ioModeOf3F.id/2)).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎113鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+// News.error("鍐欏叆杈撻�佺嚎113鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ }
+ }
+ } else if (slave.getId()==3){
+ if (this.ioModeOf4F != IoModeType.NONE && this.ioModeOf4F.id/2 != this.ioModeOf4FX) {
+ if (!siemensS7Net.Write("DB102.50", (short) (this.ioModeOf4F.id/2)).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎213鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+// News.error("鍐欏叆杈撻�佺嚎213鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
+ }
}
}
}
--
Gitblit v1.9.1