From 4ef842f72092a7573628310092ba5ef3302b217b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 九月 2024 14:31:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 5 +++++
src/main/resources/application.yml | 8 +++++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index cff24ec..d05c434 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -171,6 +171,11 @@
boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
short count = siemensS7Net.getByteTransform().TransInt16(result1.Content, i * 4 + 2);
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]); // 鍙叆
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 68b2e40..5c13bf6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -57,14 +57,14 @@
# 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1003
+ staNo: 1001
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1006
+ staNo: 1002
row: 3
bay: 1
lev: 1
@@ -78,10 +78,12 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 1002
+ staNo: 1001
barcode: ${wcs-slave.barcode[0].id}
backSta: 1001
led: ${wcs-slave.led[0].id}
+ outSta[0]:
+ staNo: 1002
# 鏉＄爜鎵弿浠�1
--
Gitblit v1.9.1