From f2b2132ded0de6e3e8e2ff65bfbd98d46caa148e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 13 十一月 2025 13:46:37 +0800
Subject: [PATCH] #1

---
 src/main/resources/application.yml |  105 +++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 127cb86..66fc17d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,18 +38,18 @@
   enable: false
 
 wms:
-  url: 127.0.0.1:8080/rqdzasrs
+  url: 127.0.0.1:8080/zjhlasrs
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   #
   isToOrigin: false
   # 鍙屾繁
-  doubleDeep: true
+  doubleDeep: false
   # 鍙屾繁搴撲綅鎺掑彿
   doubleLocs: 1,4
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
+  groupCount: 2
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
@@ -63,28 +63,73 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 102
-      row: 1
+      staNo: 101
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 105
+      row: 3
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 101
-      row: 1
+      row: 2
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[1]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 104
-      row: 1
+      staNo: 105
+      row: 3
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
+    ip: 10.10.10.110
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝璐ф灦浠�2寮�濮嬶紝鍔�1
+    offset: 0
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 105
+      row: 3
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+      row: 2
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 105
+      row: 3
       bay: 1
       lev: 1
   # plc
   devp[0]:
     id: 1
-    ip: 10.10.10.144
+    ip: 10.10.10.120
     port: 102
     rack: 0
     slot: 0
@@ -92,7 +137,7 @@
     inSta[0]:
       staNo: 102
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 101
+      backSta: 103
       led: ${wcs-slave.led[0].id}
 #    # 鍏ュ簱鍙�2
 #    inSta[1]:
@@ -102,10 +147,10 @@
 #      led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 223
+      staNo: 104
       barcode: ${wcs-slave.barcode[0].id}
-      led: ${wcs-slave.led[0].id}
-      backSta: 222
+      led: ${wcs-slave.led[1].id}
+      backSta: 104
 #    # 鎷f枡鍏ュ簱鍙�2
 #    pickSta[1]:
 #      staNo: 225
@@ -114,36 +159,44 @@
 #      backSta: 224
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 123
+      staNo: 102
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 122
+      backSta: 103
+      led: ${wcs-slave.led[0].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[1]:
+      staNo: 104
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 104
       led: ${wcs-slave.led[0].id}
     # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 223
-      barcode: ${wcs-slave.barcode[0].id}
-      backSta: 222
-      led: ${wcs-slave.led[1].id}
+    #emptyInSta[1]:
+      #staNo: 223
+      #barcode: ${wcs-slave.barcode[0].id}
+      #backSta: 222
+      #led: ${wcs-slave.led[1].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 121
+      staNo: 104
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.151
+    ip: 10.10.10.122
     port: 51236
   # LED1
   led[0]:
     id: 121
-    ip: 10.10.10.51
+    ip: 10.10.10.150
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 121
+    staArr: 102
+    crnId: 1
   # LED2
   led[1]:
     id: 123
-    ip: 10.10.10.52
+    ip: 10.10.10.151
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 123
+    staArr: 104
+    crnId: 1
 

--
Gitblit v1.9.1