From 859c827e2f1af3fe55c081d045db2c9f1ca79ef9 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 17 十二月 2022 09:27:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 23 ++++++++---
src/main/resources/application.yml | 82 +++++++++++++++++++++++++++++++++-------
2 files changed, 84 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index dfca779..1c0c6f7 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -252,16 +252,27 @@
//鏉＄爜鎵弿鍣�
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize*8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.200",(short)(barcodeSize/2*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 (slave.getId()==1){
+ for (int i = 0; i < barcodeSize/2; 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);
+ }
+ }
+ }else if (slave.getId()==2){
+ for (int i = barcodeSize/2; i < barcodeSize; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,(i-barcodeSize/2)*8,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
}
}
+
}
// //RGV灏忚溅
// Thread.sleep(200);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7e3d605..e76ffa8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 9090
servlet:
context-path: /@pom.build.finalName@
@@ -47,7 +47,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.10.1
port: 102
rack: 0
slot: 0
@@ -63,7 +63,7 @@
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
+ devpPlcId: ${wcs-slave.devp[1].id}
staNo: 106
row: 2
bay: 1
@@ -71,7 +71,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.111
+ ip: 10.10.10.2
port: 102
rack: 0
slot: 0
@@ -223,23 +223,35 @@
inSta[0]:
staNo: 109
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 108
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 117
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 116
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�3
inSta[2]:
staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 100
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 109
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 117
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[2]:
staNo: 101
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 126
@@ -267,24 +279,36 @@
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 201
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 200
+ led: ${wcs-slave.led[3].id}
# 鍏ュ簱鍙�2
inSta[1]:
staNo: 207
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[4].id}
+ backSta: 206
+ led: ${wcs-slave.led[4].id}
# 鍏ュ簱鍙�3
inSta[2]:
staNo: 213
- barcode: ${wcs-slave.barcode[0].id}
+ barcode: ${wcs-slave.barcode[5].id}
+ backSta: 212
+ led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 201
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 207
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[4].id}
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
staNo: 213
+ barcode: ${wcs-slave.barcode[5].id}
+ led: ${wcs-slave.led[5].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 205
@@ -306,32 +330,32 @@
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.52
+ ip: 10.10.10.121
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.52
+ ip: 10.10.10.122
port: 51236
# 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.52
+ ip: 10.10.10.123
port: 51236
# 鏉＄爜鎵弿浠�4
barcode[3]:
id: 4
- ip: 10.10.10.52
+ ip: 10.10.10.124
port: 51236
# 鏉＄爜鎵弿浠�5
barcode[4]:
id: 5
- ip: 10.10.10.52
+ ip: 10.10.10.125
port: 51236
# 鏉＄爜鎵弿浠�6
barcode[5]:
id: 6
- ip: 10.10.10.52
+ ip: 10.10.10.126
port: 51236
# LED1
led[0]:
@@ -346,4 +370,32 @@
ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 011
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 011
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 011
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 011
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
staArr: 011
\ No newline at end of file
--
Gitblit v1.9.1