From 6ba157825d34078a75fee36cb66ead17327f5b32 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 四月 2025 14:32:55 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  142 ++++++++++++++++++++++++++++++-----------------
 1 files changed, 90 insertions(+), 52 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 874489d..4629c92 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9091
+  port: 8080
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -34,7 +34,9 @@
   enable: false
 
 wms:
-  url: 127.0.0.1:8080/ykwms
+  url: 127.0.0.1:9090/ykwms
+inventory:
+  number: 7
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -81,15 +83,15 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 127
-      row: 6
+      staNo: 131
+      row: 7
       bay: 1
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 131
-      row: 7
+      staNo: 127
+      row: 6
       bay: 1
       lev: 1
   # 鍫嗗灈鏈�3
@@ -198,33 +200,33 @@
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 103
   # RGV绌挎杞�2
-#  rgv[2]:
-#    id: 3
-#    ip: 10.10.10.66
-#    port: 502
-#    rack: 0
-#    slot: 0
-#    #RGV鍏ュ簱婧愮珯鐐�
-#    rgvInSStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 100
-#    rgvInSStn[1]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 101
-#    #RGV鍑哄簱婧愮珯鐐�
-#    rgvOutSStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 110
-#    rgvOutSStn[1]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 112
-#    #RGV鐩爣绔欑偣
-#    rgvDestStn[0]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 102
-#    rgvDestStn[1]:
-#      devpPlcId: ${wcs-slave.devp[0].id}
-#      staNo: 103
+  rgv[2]:
+    id: 3
+    ip: 10.10.10.66
+    port: 502
+    rack: 0
+    slot: 0
+    #RGV鍏ュ簱婧愮珯鐐�
+    rgvInSStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 100
+    rgvInSStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 101
+    #RGV鍑哄簱婧愮珯鐐�
+    rgvOutSStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 110
+    rgvOutSStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 112
+    #RGV鐩爣绔欑偣
+    rgvDestStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 102
+    rgvDestStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 103
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
@@ -236,6 +238,7 @@
     inSta[0]:
       staNo: 106
       barcode: ${wcs-slave.barcode[0].id}
+      barcodeMat: ${wcs-slave.barcode[3].id}
       backSta: 105
       led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
@@ -246,32 +249,45 @@
       led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 106
-      barcode: ${wcs-slave.barcode[0].id}
-      led: ${wcs-slave.led[1].id}
-      backSta: 105
+      staNo: 159
+      barcode: ${wcs-slave.barcode[2].id}
+      led: ${wcs-slave.led[5].id}
+      backSta: 160
     # 鍏ュ簱鍙�1
     inSta[1]:
       staNo: 107
       barcode: ${wcs-slave.barcode[1].id}
+      barcodeMat: ${wcs-slave.barcode[4].id}
       backSta: 108
-      led: ${wcs-slave.led[1].id}
+      led: ${wcs-slave.led[2].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[1]:
       staNo: 107
       barcode: ${wcs-slave.barcode[1].id}
       backSta: 108
-      led: ${wcs-slave.led[1].id}
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[1]:
-      staNo: 107
-      barcode: ${wcs-slave.barcode[1].id}
-      led: ${wcs-slave.led[1].id}
-      backSta: 108
+      led: ${wcs-slave.led[2].id}
+    inSta[2]:
+      staNo: 159
+      barcode: ${wcs-slave.barcode[2].id}
+      barcodeMat: ${wcs-slave.barcode[5].id}
+      backSta: 160
+      led: ${wcs-slave.led[5].id}
+#    # 鎷f枡鍏ュ簱鍙�1
+#    pickSta[1]:
+#      staNo: 107
+#      barcode: ${wcs-slave.barcode[1].id}
+#      led: ${wcs-slave.led[1].id}
+#      backSta: 108
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 100
       led: ${wcs-slave.led[0].id}
+    outSta[1]:
+      staNo: 152
+      led: ${wcs-slave.led[3].id}
+    outSta[2]:
+      staNo: 156
+      led: ${wcs-slave.led[4].id}
 
   # 鏉$爜鎵弿浠�1
   barcode[0]:
@@ -288,38 +304,60 @@
     id: 3
     ip: 10.10.10.123
     port: 51236
+  # 鏉$爜鎵弿浠�1mat
+  barcode[3]:
+    id: 4
+    ip: 10.10.10.121
+    port: 51236
+  # 鏉$爜鎵弿浠�2mat
+  barcode[4]:
+    id: 5
+    ip: 10.10.10.122
+    port: 51236
+  # 鏉$爜鎵弿浠�3mat
+  barcode[5]:
+    id: 6
+    ip: 10.10.10.123
+    port: 51236
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.249
+    ip: 10.10.10.101
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 100
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.248
+    ip: 10.10.10.102
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 106
   # LED3
   led[2]:
     id: 3
-    ip: 10.10.10.247
+    ip: 10.10.10.103
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 107
   # LED4
   led[3]:
     id: 4
-    ip: 10.10.10.246
+    ip: 10.10.10.104
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 126
+    staArr: 152
   # LED5
   led[4]:
     id: 5
-    ip: 10.10.10.245
+    ip: 10.10.10.105
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 134
\ No newline at end of file
+    staArr: 156
+  # LED6
+  led[5]:
+    id: 6
+    ip: 10.10.10.106
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 160,159
\ No newline at end of file

--
Gitblit v1.9.1