From 9364375dceda8f2a1441f8b6739da2831cad1aac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 13:48:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |    2 
 src/main/resources/application.yml                     |  136 +++++++++++++++++++++++---------------------
 2 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index a3c7bed..f70c83c 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -142,7 +142,7 @@
      */
     private void readStatus(){
         try {
-            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 70);
+            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
             if (result.IsSuccess) {
                 if (null == crnProtocol) {
                     crnProtocol = new CrnProtocol();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2d2c6e2..cbb7c1c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -47,71 +47,77 @@
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
-#  crn[0]:
-#    id: 1
-#    ip: 10.10.10.10
-#    port: 102
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#      row: 2
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 101
-#      row: 3
-#      bay: 1
-#      lev: 1
-#  # 鍫嗗灈鏈�2
-#  crn[1]:
-#    id: 1
-#    ip: 10.10.10.20
-#    port: 102
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#      row: 2
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 101
-#      row: 3
-#      bay: 1
-#      lev: 1
-#  # 鍫嗗灈鏈�3
-#  crn[2]:
-#    id: 1
-#    ip: 10.10.10.30
-#    port: 102
-#    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-#    offset: 2
-#    demo: false
-#    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-#    crnInStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#      row: 2
-#      bay: 1
-#      lev: 1
-#    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-#    crnOutStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 101
-#      row: 3
-#      bay: 1
-#      lev: 1
+  crn[0]:
+    id: 1
+    ip: 10.10.10.10
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 3
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 10.10.10.20
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 3
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 10.10.10.30
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 3
+      bay: 1
+      lev: 1
   # 绌挎杞�1
   ste[0]:
     id: 1

--
Gitblit v1.9.1