From 502246ee4961c85827b7f14e2b9b8e0f2edfdfbc Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 07 五月 2025 10:24:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 4 +---
src/main/resources/application-prod.yml | 12 ++++++------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index cd97abe..53fbb42 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -161,9 +161,6 @@
crnProtocol = new CrnProtocol();
}
crnProtocol.setCrnNo(slave.getId());
-
- crnProtocol.setLaneNo(siemensNet.getByteTransform().TransInt32(result.Content, 0));//宸烽亾鍙�
-
crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
@@ -185,6 +182,7 @@
crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
+ crnProtocol.setLaneNo((int)siemensNet.getByteTransform().TransInt16(result.Content, 54));//宸烽亾鍙�
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index f4d906c..d902b62 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -3,7 +3,7 @@
doubleLocs: 3 #鍙屾繁搴撲綅鎺掑彿
groupCount: 2 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
devp[0]: #杈撻�佺嚎
- ip: 192.168.4.250
+ ip: 10.10.10.60
slot: 0
port: 102
rack: 102
@@ -79,7 +79,7 @@
# RGV绌挎杞�2
rgv[1]:
id: 2
- ip: 192.168.1.1
+ ip: 10.10.10.65
port: 502
rack: 0
slot: 0
@@ -127,7 +127,7 @@
staNo: 281
devpPlcId: 1
crn[0]: #鍫嗗灈鏈�1
- ip: 10.10.123.30
+ ip: 10.10.10.10
id: 1
slot: 0
demo: false
@@ -147,7 +147,7 @@
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[1]: #鍫嗗灈鏈�1
- ip: 192.168.4.250
+ ip: 10.10.10.20
id: 2
slot: 0
demo: false
@@ -187,7 +187,7 @@
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[3]: #鍫嗗灈鏈�1
- ip: 192.168.4.250
+ ip: 10.10.10.40
id: 4
slot: 0
demo: false
@@ -207,7 +207,7 @@
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[4]: #鍫嗗灈鏈�1
- ip: 192.168.4.250
+ ip: 10.10.10.50
id: 5
slot: 0
demo: false
--
Gitblit v1.9.1