From 5c2d7ece5090ed84945e42a1f89af8c279dbcb9a Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 13 八月 2024 18:11:22 +0800
Subject: [PATCH] #标记

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 64c3298..6d129b4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://10.10.10.254:1433;databasename=ahyxasrs
+    url: jdbc:sqlserver://10.10.10.201:1433;databasename=ahyxasrs
 #    url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
     username: sa
     password: sa@123
@@ -118,7 +118,9 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 261
-      staNoOther: 261
+      staNoOther: 257
+      staNoOther1: 256
+      staNoOther2: 255
       row: 10
       bay: 1
       lev: 1
@@ -144,7 +146,9 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 260
-      staNoOther: 260
+      staNoOther: 248
+      staNoOther1: 247
+      staNoOther2: 246
       row: 12
       bay: 1
       lev: 1
@@ -170,7 +174,9 @@
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
       staNo: 259
-      staNoOther: 259
+      staNoOther: 239
+      staNoOther1: 238
+      staNoOther2: 237
       row: 14
       bay: 1
       lev: 1
@@ -245,24 +251,39 @@
     # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
     inSingleSta[0]:
       staNo: 173
+      barcode: ${wcs-slave.barcode[2].id}
     # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
     emptyInSingleSta[0]:
       staNo: 104
+    # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+    emptyInSingleSta[1]:
+      staNo: 126
+    # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
+    emptyInSingleSta[2]:
+      staNo: 131
 #    # 灏忔枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
 #    emptyInSingleSta[1]:
 #      staNo: 173
     # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
     inLargeSta[0]:
       staNo: 292
+      barcode: ${wcs-slave.barcode[1].id}
     # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 鍏ュ簱鍙�1
     inLargeSta[1]:
       staNo: 281
+      barcode: ${wcs-slave.barcode[0].id}
     # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�1
     emptyInLargeSta[0]:
       staNo: 292
     # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
     emptyInLargeSta[1]:
       staNo: 281
+    # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
+    emptyInLargeSta[2]:
+      staNo: 310
+    # 澶ф枡绠� 鍙屽伐浣嶅崟浼� 绌烘澘鍏ュ簱鍙�2
+    emptyInLargeSta[3]:
+      staNo: 312
   # 杈撻�佺嚎
   devp[1]:
     id: 2
@@ -276,12 +297,24 @@
     # 绌烘澘鍏ュ簱鍙�1(涓存椂)
     emptyInSta[1]:
       staNo: 515
+    # 绌烘澘鍏ュ簱鍙�1(涓存椂)
+    emptyInSta[2]:
+      staNo: 536
+    # 绌烘澘鍏ュ簱鍙�1(涓存椂)
+    emptyInSta[3]:
+      staNo: 607
     # 鍏ュ簱鍙�1
     inSta[0]:
       staNo: 460
+      barcode: ${wcs-slave.barcode[6].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
       staNo: 453
+      barcode: ${wcs-slave.barcode[5].id}
+    # 鍏ュ簱鍙�464
+    inSta464[0]:
+      staNo: 464
+      barcode: ${wcs-slave.barcode[6].id}
     # 鍏ョ~鍖栫綈RGV
     enterRgv[0]:
       rgvNo: 623
@@ -356,6 +389,31 @@
   # 鏉$爜鎵弿浠�
   barcode[4]:
     id: 5
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[5]:
+    id: 6
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[6]:
+    id: 7
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[7]:
+    id: 8
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[8]:
+    id: 9
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[9]:
+    id: 10
     ip: 10.10.10.52
     port: 51236
    # LED1
@@ -494,7 +552,7 @@
     # 纭寲缃愬叆搴撶珯鐐�
     jarInSta[0]:
       devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 619
+      staNo: 622
       rgvNo: 624
       steNo: 2
       row: 3
@@ -525,7 +583,7 @@
       devpPlcId: ${wcs-slave.devp[1].id}
       steNo: 2
       row: 2
-  # JAR4
+  # 鍐峰嵈妲�5
   jar[4]:
     id: 5
     ip: 10.10.10.190
@@ -565,7 +623,7 @@
       devpPlcId: ${wcs-slave.devp[1].id}
       steNo: 1
       row: 1
-  # JAR4
+  # 鍐峰嵈妲�6
   jar[5]:
     id: 6
     ip: 10.10.10.193
@@ -612,10 +670,62 @@
     port: 502
     rack: 0
     slot: 0
+    # 鍏ュ簱绔欑偣
+    steInStn[0]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 612
+      rgvNo: 623
+      jarNo: 1
+      row: 3
+    # 鍏ュ簱绔欑偣
+    steInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 615
+      rgvNo: 623
+      jarNo: 2
+      row: 1
   # ste2
   ste[1]:
     id: 2
     ip: 10.10.10.175
     port: 502
     rack: 0
-    slot: 0
\ No newline at end of file
+    slot: 0
+    # 鍏ュ簱绔欑偣
+    steInStn[0]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 619
+      rgvNo: 624
+      jarNo: 3
+      row: 3
+    # 鍏ュ簱绔欑偣
+    steInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 622
+      rgvNo: 624
+      jarNo: 4
+      row: 1
+    # 纾呯Г
+  scale[0]:
+    id: 1
+    ip: 10.10.10.207
+    port: 5005
+    staNo: 281
+  # 纾呯Г
+  scale[1]:
+    id: 2
+    ip: 10.10.10.206
+    port: 5005
+    staNo: 292
+  # 纾呯Г
+  scale[2]:
+    id: 3
+    ip: 10.10.10.209
+    port: 5005
+    staNo: 453
+  # 纾呯Г
+  scale[3]:
+    id: 4
+    ip: 10.10.10.208
+    port: 5005
+    staNo: 460
\ No newline at end of file

--
Gitblit v1.9.1