From f69bc4779fa1abd564fdfea2c99aced36d90b5f8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 13 五月 2024 19:54:30 +0800
Subject: [PATCH] #二楼
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 195 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 164 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 85db633..287bcb4 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -67,11 +67,17 @@
}};
public static final ArrayList<Integer> staNos5 = new ArrayList<Integer>() {{
- add(4001);add(4002);add(4003);add(4004);add(4005);add(4006);add(4007);
+ add(4016);
}};
public static final ArrayList<Integer> staNos6 = new ArrayList<Integer>() {{
- add(4010);add(4011);add(4012);add(4013);add(4014);add(4015);add(4016);
+ add(2007);add(2008);add(2009);add(2010);add(2011);add(2012);add(2013);
+ add(2108);add(2109);add(2110);add(2111);add(2112);add(2113);add(2114);
+ add(2401);add(2402);add(2403);
+ }};
+ public static final ArrayList<Integer> staNos7 = new ArrayList<Integer>() {{
+ add(3001);add(3002);add(3003);add(3004);add(3005);add(3006);add(3007);
+ add(3008);add(3009);add(3010);add(3011);add(3012);
}};
@@ -94,17 +100,21 @@
}};
public static final ArrayList<Integer> writeStaNos4 = new ArrayList<Integer>() {{
- add(3001);
- add(3007);
- add(3012);
+ add(4007);
}};
public static final ArrayList<Integer> writeStaNos5 = new ArrayList<Integer>() {{
- add(4001);add(4007);
+ add(4016);
}};
public static final ArrayList<Integer> writeStaNos6 = new ArrayList<Integer>() {{
- add(4010);add(4016);
+ add(2007);add(2008);add(2009);add(2010);add(2011);add(2012);add(2013);
+ add(2108);add(2109);add(2110);add(2111);add(2112);add(2113);add(2114);
+ add(2401);add(2402);add(2403);
+ }};
+ public static final ArrayList<Integer> writeStaNos7 = new ArrayList<Integer>() {{
+ add(3001);add(3002);add(3003);add(3004);add(3005);add(3006);add(3007);
+ add(3008);add(3009);add(3010);add(3011);add(3012);
}};
public static final ArrayList<Integer> errorStaNos1 = new ArrayList<Integer>() {{
@@ -117,6 +127,10 @@
public static final ArrayList<Integer> errorStaNos4 = new ArrayList<Integer>() {{
add(3007);add(3012);
+ }};
+
+ public static final ArrayList<Integer> errorStaNos7 = new ArrayList<Integer>() {{
+ add(3006);add(3007);
}};
/**
@@ -152,6 +166,8 @@
return staNos5;
case 6:
return staNos6;
+ case 7:
+ return staNos7;
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -171,6 +187,8 @@
return writeStaNos5;
case 6:
return writeStaNos6;
+ case 7:
+ return writeStaNos7;
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -184,6 +202,8 @@
return errorStaNos2;
case 4:
return errorStaNos4;
+ case 7:
+ return errorStaNos7;
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -205,6 +225,8 @@
case 1:
switch (slave.getId()){
case 1:
+ case 6:
+ case 7:
read();break;
case 2:
read10();break;
@@ -212,6 +234,8 @@
read30();break;
case 4:
read33();break;
+ case 5:
+ read55();break;
}
break;
@@ -220,7 +244,9 @@
switch (slave.getId()){
case 1:
case 3:
- write((StaProtocol)task.getData());
+ case 6:
+ case 7:
+ write((StaProtocol)task.getData());break;
case 2:
write10((StaProtocol)task.getData());break;
@@ -319,25 +345,62 @@
}
}
}
+ } else if (slave.getId() == 7) {
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = null;
+ result2 = siemensS7Net.Read("DB101.104.0", (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 + 4);
+ if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
+ }
}
- //鎶ヨ淇℃伅
- Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = null;
- result3 = siemensS7Net.Read("DB101.200.0", (short) (getErrorStaNo().size() * 4));
- if (result3.IsSuccess) {
- for (int i = 0; i < getErrorStaNo().size(); i++) {
- Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
+ if (slave.getId() ==1){
+ //鎶ヨ淇℃伅
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = null;
+ result3 = siemensS7Net.Read("DB101.200.0", (short) (getErrorStaNo().size() * 4));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < getErrorStaNo().size(); i++) {
+ Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
// staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 搴撲綅楂樺害
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
+ staProtocol.setFrontErr(status[0]);
+ staProtocol.setBackErr(status[1]);
+ staProtocol.setHighErr(status[2]);
+ staProtocol.setLeftErr(status[3]);
+ staProtocol.setRightErr(status[4]);
+ staProtocol.setWeightErr(status[5]);
+ staProtocol.setBarcodeErr(status[6]);
+ }
+
+ }
+ } else if (slave.getId() == 7) {
+ //鎶ヨ淇℃伅
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = null;
+ result3 = siemensS7Net.Read("DB101.96.0", (short) (getErrorStaNo().size() * 4));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < getErrorStaNo().size(); i++) {
+ Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+// staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 搴撲綅楂樺害
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
+ staProtocol.setFrontErr(status[0]);
+ staProtocol.setBackErr(status[1]);
+ staProtocol.setHighErr(status[2]);
+ staProtocol.setLeftErr(status[3]);
+ staProtocol.setRightErr(status[4]);
+ staProtocol.setWeightErr(status[5]);
+ staProtocol.setBarcodeErr(status[6]);
+ }
+
}
}
@@ -384,7 +447,7 @@
}
staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 10)); // 宸ヤ綔鍙�
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*10 + 4 )); // 鐩爣绔�
- staProtocol.setMatnr(siemensS7Net.getByteTransform().TransInt16(result.Content, i*10 + 6 )); // 鐩爣绔�
+ staProtocol.setMatnr((int) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 10 + 6)); // 鐩爣绔�
}
}
Thread.sleep(200);
@@ -413,14 +476,14 @@
}
// 鏉＄爜鎵弿鍣�
- if(slave.getId() == 1) {
+ if(slave.getId() == 2) {
Thread.sleep(200);
OperateResultExOne<byte[]> result2 = null;
- result2 = siemensS7Net.Read("DB101.208.0", (short) (barcodeSize * 8));
+ result2 = siemensS7Net.Read("DB101.194.0", (short) (8));
if (result2.IsSuccess) {
- for (int i = 0; i < barcodeSize; i++) {
+ for (int i = 0; i < 1; i++) {
String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 3);
if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
}
@@ -523,13 +586,15 @@
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
- result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*6));
+ result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*30));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
- short matnr = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 4);
+ Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 4);
+ short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 8);
+ String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+10, 20, "UTF-8");
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
@@ -539,8 +604,76 @@
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
+ staProtocol.setEmptyOutPalletRequire(status[3]);
staProtocol.setMatnr(matnr);
staProtocol.setTongType(tongType);
+ staProtocol.setBatch(batch);
+ staProtocol.setAmount(amount);
+ staProtocol.setLow(true);
+
+
+
+ if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
+ staProtocol.setPakMk(true);
+ }
+ }
+ }
+
+ if (result.IsSuccess) {
+
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ try {
+ List<BasDevp> basDevps = new ArrayList<>();
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ basDevps.add(staProtocol.toSqlModel());
+ }
+
+ BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
+ if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
+ throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
+ }
+ } catch (Exception e) {
+ 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()));
+ log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+// log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+ }
+
+ private void read55() throws InterruptedException {
+ ArrayList<Integer> staNos = getStaNo();
+ int staNoSize = staNos.size();
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
+
+ result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*28));
+ if (result.IsSuccess) {
+ for (int i = 0; i < staNoSize; i++) {
+ Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
+// short tongType = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
+ Integer matnr = siemensS7Net.getByteTransform().TransInt32(result.Content, i * 4 + 2);
+ short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 6);
+ String batch = siemensS7Net.getByteTransform().TransString(result.Content, i * 4+8, 20, "UTF-8");
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setAutoing(status[0]); // 鑷姩
+ staProtocol.setLoading(status[1]); // 鏈夌墿
+ staProtocol.setInEnable(status[2]); // 鍙叆
+ staProtocol.setEmptyOutPalletRequire(status[3]);
+ staProtocol.setMatnr(matnr);
+ staProtocol.setAmount(amount);
+ staProtocol.setBatch(batch);
staProtocol.setLow(true);
--
Gitblit v1.9.1