From 93d7e7ce852d4956a2911a86f06f3d37c889c1f1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 23 十二月 2022 15:37:21 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  108 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 75 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e76ffa8..d088790 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,7 +34,7 @@
   enable: false
 
 wms:
-  url: localhost:8080/lfdwms
+  url: localhost:8081/lfdwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -48,7 +48,7 @@
   crn[0]:
     id: 1
     ip: 10.10.10.1
-    port: 102
+    port: 6000
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -63,7 +63,7 @@
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
+      devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 106
       row: 2
       bay: 1
@@ -72,7 +72,7 @@
   crn[1]:
     id: 2
     ip: 10.10.10.2
-    port: 102
+    port: 6000
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -95,8 +95,8 @@
   # 鍫嗗灈鏈�3
   crn[2]:
     id: 3
-    ip: 10.10.10.121
-    port: 102
+    ip: 10.10.10.3
+    port: 6000
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -119,8 +119,8 @@
   # 鍫嗗灈鏈�4
   crn[3]:
     id: 4
-    ip: 10.10.10.121
-    port: 102
+    ip: 10.10.10.4
+    port: 6000
     rack: 0
     slot: 0
     # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -143,7 +143,7 @@
   # 鍫嗗灈鏈�5
   crn[4]:
     id: 5
-    ip: 10.10.10.121
+    ip: 10.10.10.111
     port: 102
     rack: 0
     slot: 0
@@ -152,14 +152,14 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 202
       row: 10
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 203
       row: 11
       bay: 1
@@ -167,7 +167,7 @@
   # 鍫嗗灈鏈�6
   crn[5]:
     id: 6
-    ip: 10.10.10.121
+    ip: 10.10.10.111
     port: 102
     rack: 0
     slot: 0
@@ -176,14 +176,14 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 208
       row: 13
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 209
       row: 14
       bay: 1
@@ -191,7 +191,7 @@
   # 鍫嗗灈鏈�7
   crn[6]:
     id: 7
-    ip: 10.10.10.121
+    ip: 10.10.10.111
     port: 102
     rack: 0
     slot: 0
@@ -200,14 +200,14 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 214
       row: 16
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 215
       row: 17
       bay: 1
@@ -221,46 +221,50 @@
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 109
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 108
+      backSta: 100
       led: ${wcs-slave.led[0].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
-      staNo: 117
+      staNo: 109
       barcode: ${wcs-slave.barcode[1].id}
-      backSta: 116
+      backSta: 108
       led: ${wcs-slave.led[1].id}
     # 鍏ュ簱鍙�3
     inSta[2]:
-      staNo: 101
+      staNo: 117
       barcode: ${wcs-slave.barcode[2].id}
-      backSta: 100
+      backSta: 116
       led: ${wcs-slave.led[2].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 109
+      staNo: 101
       barcode: ${wcs-slave.barcode[0].id}
       led: ${wcs-slave.led[0].id}
     # 绌烘澘鍏ュ簱鍙�2
     emptyInSta[1]:
-      staNo: 117
+      staNo: 109
       barcode: ${wcs-slave.barcode[1].id}
       led: ${wcs-slave.led[1].id}
-    # 绌烘澘鍏ュ簱鍙�2
+    # 绌烘澘鍏ュ簱鍙�3
     emptyInSta[2]:
-      staNo: 101
+      staNo: 117
       barcode: ${wcs-slave.barcode[2].id}
       led: ${wcs-slave.led[2].id}
+
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 126
+      led: ${wcs-slave.led[3].id}
     # 鍑哄簱鍙�2
     outSta[1]:
       staNo: 134
+      led: ${wcs-slave.led[4].id}
     # 鍑哄簱鍙�2
     outSta[2]:
       staNo: 100
+      led: ${wcs-slave.led[0].id}
 #    # 鎷f枡鍏ュ簱鍙�1
 #    pickSta[0]:
 #      staNo: 126
@@ -281,43 +285,46 @@
       staNo: 201
       barcode: ${wcs-slave.barcode[3].id}
       backSta: 200
-      led: ${wcs-slave.led[3].id}
+      led: ${wcs-slave.led[5].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
       staNo: 207
       barcode: ${wcs-slave.barcode[4].id}
       backSta: 206
-      led: ${wcs-slave.led[4].id}
+      led: ${wcs-slave.led[7].id}
     # 鍏ュ簱鍙�3
     inSta[2]:
       staNo: 213
       barcode: ${wcs-slave.barcode[5].id}
       backSta: 212
-      led: ${wcs-slave.led[5].id}
+      led: ${wcs-slave.led[9].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
       staNo: 201
       barcode: ${wcs-slave.barcode[3].id}
-      led: ${wcs-slave.led[3].id}
+      led: ${wcs-slave.led[5].id}
     # 绌烘澘鍏ュ簱鍙�2
     emptyInSta[1]:
       staNo: 207
       barcode: ${wcs-slave.barcode[4].id}
-      led: ${wcs-slave.led[4].id}
+      led: ${wcs-slave.led[7].id}
     # 绌烘澘鍏ュ簱鍙�3
     emptyInSta[2]:
       staNo: 213
       barcode: ${wcs-slave.barcode[5].id}
-      led: ${wcs-slave.led[5].id}
+      led: ${wcs-slave.led[9].id}
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 205
+      led: ${wcs-slave.led[6].id}
     # 鍑哄簱鍙�2
     outSta[1]:
       staNo: 211
+      led: ${wcs-slave.led[8].id}
     # 鍑哄簱鍙�3
     outSta[2]:
       staNo: 217
+      led: ${wcs-slave.led[10].id}
 #    # 鎷f枡鍏ュ簱鍙�1
 #    pickSta[0]:
 #      staNo: 011
@@ -398,4 +405,39 @@
     ip: 10.10.10.202
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 011
+  # LED7
+  led[6]:
+    id: 6
+    ip: 10.10.10.202
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 011
+  # LED8
+  led[7]:
+    id: 5
+    ip: 10.10.10.202
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 011
+  # LED9
+  led[8]:
+    id: 6
+    ip: 10.10.10.202
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 011
+  # LED10
+  led[9]:
+    id: 6
+    ip: 10.10.10.202
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 011
+  # LED11
+  led[10]:
+    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