From c48d0150aa9f6b297671f28adb6b9dc95b529cfc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:59:39 +0800
Subject: [PATCH] 1

---
 src/main/resources/application.yml |  130 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 122 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 63008e2..1acdcc3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9090
+  port: 9091
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -9,7 +9,7 @@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
-#    url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
     username: sa
     #    password: Zoneyung@zy56$
     password: sa@123
@@ -36,7 +36,7 @@
   enable: false
 
 wms:
-  url: localhost:8080/bfwms
+  url: 10.10.10.100:8080/bfwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
@@ -63,12 +63,26 @@
       row: 4
       bay: 4
       lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 112
+      row: 3
+      bay: 2
+      lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 108
       row: 4
       bay: 5
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 112
+      row: 3
+      bay: 2
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
@@ -125,12 +139,26 @@
       row: 18
       bay: 4
       lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[2].id}
+      staNo: 212
+      row: 19
+      bay: 6
+      lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 208
       row: 18
       bay: 5
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[2].id}
+      staNo: 212
+      row: 19
+      bay: 6
       lev: 1
   # 绌挎杞�1
   ste[0]:
@@ -153,7 +181,7 @@
     port: 502
     rack: 0
     slot: 0
-  # 杈撻�佺嚎
+  # 杈撻�佺嚎1
   devp[0]:
     id: 1
     ip: 10.10.10.61
@@ -186,9 +214,69 @@
     # 鍑哄簱鍙�2
     outSta[1]:
       staNo: 200
-    # 鎷f枡鍏ュ簱鍙�
-    pickSta[0]:
+    # 鎷f枡鍑哄簱鍙�
+    pickOutSta[0]:
       staNo: 300
+    # 鎷f枡鍑哄簱鍙�
+    pickInSta[0]:
+      staNo: 103
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 100
+      led: ${wcs-slave.led[0].id}
+    # 鎷f枡鍑哄簱鍙�
+    pickInSta[1]:
+      staNo: 203
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 200
+      led: ${wcs-slave.led[2].id}
+  # 杈撻�佺嚎2
+  devp[1]:
+    id: 2
+    ip: 10.10.10.160
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍏ュ簱鍙�1
+    inSta[0]:
+      staNo: 113
+      barcode: ${wcs-slave.barcode[2].id}
+      backSta: 114
+      led: ${wcs-slave.led[3].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[0]:
+      staNo: 113
+      barcode: ${wcs-slave.barcode[2].id}
+      led: ${wcs-slave.led[3].id}
+
+    # 鍑哄簱鍙�1
+    outSta[0]:
+      staNo: 114
+      led: ${wcs-slave.led[3].id}
+
+  # 杈撻�佺嚎3
+  devp[2]:
+    id: 3
+    ip: 10.10.10.170
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍏ュ簱鍙�1
+    inSta[0]:
+      staNo: 213
+      barcode: ${wcs-slave.barcode[3].id}
+      backSta: 214
+      led: ${wcs-slave.led[4].id}
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[0]:
+      staNo: 213
+      barcode: ${wcs-slave.barcode[3].id}
+      led: ${wcs-slave.led[4].id}
+
+    # 鍑哄簱鍙�1
+    outSta[0]:
+      staNo: 214
+      led: ${wcs-slave.led[4].id}
+
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
@@ -200,23 +288,49 @@
     ip: 10.10.10.53
     port: 51236
    # LED1
+  # 鏉$爜鎵弿浠�
+  barcode[2]:
+    id: 3
+    ip: 10.10.11.53
+    port: 51236
+    # LED1
+  # 鏉$爜鎵弿浠�
+  barcode[3]:
+    id: 4
+    ip: 10.10.12.53
+    port: 51236
+    # LED1
   led[0]:
     id: 1
     ip: 10.10.10.205
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 100
-  # LED1
+  # LED2
   led[1]:
     id: 2
     ip: 10.10.10.206
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 300
-  # LED1
+  # LED3
   led[2]:
     id: 3
     ip: 10.10.10.207
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
     staArr: 200
+  # LED4
+  led[3]:
+    id: 4
+    ip: 10.10.10.208
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[1].id}
+    staArr: 114
+  # LED5
+  led[4]:
+    id: 5
+    ip: 10.10.10.209
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[2].id}
+    staArr: 214

--
Gitblit v1.9.1