From 8041ff1c93a86f2f1b9e4ed2b61fa65a01562665 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 21 七月 2023 14:47:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/RgvThread.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1 +
src/main/java/com/zy/core/MainProcess.java | 2 +-
src/main/resources/application.yml | 45 +++++++++++++++++++++++++++++++++++++++++++--
4 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 37e50e7..ca57d80 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -534,6 +534,7 @@
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgv.getId());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
if (rgvProtocol == null) {
+
continue;
}
BasRgv basRgv = basRgvService.selectById(rgv.getId());
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index e25cfac..bb4baec 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -44,7 +44,7 @@
}
//鍒濆鍖朢GV鍦板浘
- mainService.initRgvMap();
+// mainService.initRgvMap();
// 婕旂ず
mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index db8bd9c..c3dd9d8 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -158,7 +158,7 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 34);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB1.0", (short) 34);
if (result.IsSuccess) {
if (null == rgvProtocol) {
rgvProtocol = new RgvProtocol();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index aca4a58..620400c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -222,7 +222,7 @@
# RGV绌挎杞�2
rgv[1]:
id: 2
- ip: 10.10.10.41
+ ip: 192.168.4.15
port: 502
rack: 0
slot: 0
@@ -251,7 +251,28 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.30
+ ip: 192.168.4.250
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 15
+ barcode: ${wcs-slave.barcode[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 12
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 11
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 11
+ barcode: ${wcs-slave.barcode[0].id}
+ # 杈撻�佺嚎
+ devp[1]:
+ id: 2
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
@@ -275,6 +296,26 @@
id: 1
ip: 10.10.10.52
port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[2]:
+ id: 3
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[3]:
+ id: 4
+ ip: 10.10.10.52
+ port: 51236
+ # 鏉＄爜鎵弿浠�
+ barcode[4]:
+ id: 5
+ ip: 10.10.10.52
+ port: 51236
# LED1
led[0]:
id: 1
--
Gitblit v1.9.1