From 554a833b682f4052d7297c633cf4dd68818a33f2 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 15 二月 2024 09:37:16 +0800
Subject: [PATCH] #

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

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 94b3119..8c3a937 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://192.168.4.15:1433;databasename=srjtasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=ahyxasrs
     username: sa
     password: sa@123
   mvc:
@@ -36,43 +36,19 @@
   enable: false
 
 wms:
-  url: localhost:8080/hswms
+  url: localhost:8080/yxwms
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16
+  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.110
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 007
-      row: 3
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 008
-      row: 2
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
     ip: 10.10.10.120
     port: 102
     rack: 0
@@ -83,20 +59,34 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 005
-      row: 7
+      staNo: 102
+      row: 3
       bay: 1
       lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 201
+      row: 3
+      bay: 1
+      lev: 2
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 006
-      row: 6
+      staNo: 100
+      row: 2
       bay: 1
       lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 200
+      row: 2
+      bay: 1
+      lev: 2
+  # 鍫嗗灈鏈�2
+  crn[1]:
+    id: 2
     ip: 10.10.10.130
     port: 102
     rack: 0
@@ -107,21 +97,73 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 003
+      staNo: 105
+      row: 7
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 203
+      row: 7
+      bay: 1
+      lev: 2
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 103
+      row: 6
+      bay: 1
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 202
+      row: 6
+      bay: 1
+      lev: 1
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 192.168.18.29
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 108
       row: 11
       bay: 1
       lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 205
+      row: 11
+      bay: 1
+      lev: 2
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 004
+      staNo: 106
       row: 10
       bay: 1
       lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 204
+      row: 10
+      bay: 1
+      lev: 2
   # 鍫嗗灈鏈�4
   crn[3]:
     id: 4
-    ip: 10.10.10.140
+    ip: 192.168.18.37
     port: 102
     rack: 0
     slot: 0
@@ -131,21 +173,35 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 001
+      staNo: 111
       row: 15
       bay: 1
       lev: 1
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 207
+      row: 15
+      bay: 1
+      lev: 2
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 002
+      staNo: 109
       row: 14
       bay: 1
       lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 206
+      row: 14
+      bay: 1
+      lev: 2
   # 鍫嗗灈鏈�5
   crn[4]:
     id: 5
-    ip: 10.10.10.141
+    ip: 192.168.18.45
     port: 102
     rack: 0
     slot: 0
@@ -155,46 +211,36 @@
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 001
-      row: 15
+      staNo: 114
+      row: 19
       bay: 1
       lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 002
-      row: 14
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�6
-  crn[5]:
-    id: 6
-    ip: 10.10.10.142
-    port: 102
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 001
-      row: 15
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 209
+      row: 19
       bay: 1
-      lev: 1
+      lev: 2
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
       devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 002
-      row: 14
+      staNo: 112
+      row: 18
       bay: 1
       lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 208
+      row: 18
+      bay: 1
+      lev: 2
 
   # RGV绌挎杞�1
   rgv[0]:
     id: 1
-    ip: 10.10.10.40
+    ip: 192.168.18.77
     port: 502
     rack: 0
     slot: 0
@@ -222,7 +268,7 @@
   # RGV绌挎杞�2
   rgv[1]:
     id: 2
-    ip: 10.10.10.41
+    ip: 192.168.18.79
     port: 502
     rack: 0
     slot: 0
@@ -251,41 +297,167 @@
   # 杈撻�佺嚎
   devp[0]:
     id: 1
-    ip: 10.10.10.30
+    ip: 10.10.10.100
+    port: 102
+    rack: 0
+    slot: 0
+    # WMS鍏ュ簱鍙�1
+    inWmsSta[0]:
+      staNo: 145
+    # 绌烘澘鍏ュ簱鍙�1
+    emptyInSta[0]:
+      staNo: 122
+    # 鎷嗗灈鍙犵洏鍙�1
+    emptyInSta2[0]:
+      staNo: 118
+    # 鎷嗗灈鍙犵洏鍙�2
+    emptyInSta2[1]:
+      staNo: 119
+    # 鎷嗗灈鍙犵洏鍙�3
+    emptyInSta2[2]:
+      staNo: 120
+    # 鎷嗗灈鍙犵洏鍙�4
+    emptyInSta2[3]:
+      staNo: 121
+    # 鍑哄簱鍙�1
+    outSta[0]:
+      staNo: 122
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta2[0]:
+      staNo: 118
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta2[1]:
+      staNo: 119
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta2[2]:
+      staNo: 120
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta2[3]:
+      staNo: 121
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 122
+    # Rgv鍑哄簱鍙�1
+    outRgvSta[0]:
+      staNo: 102
+    # Rgv鍑哄簱鍙�1
+    outRgvSta[1]:
+      staNo: 105
+    # Rgv鍑哄簱鍙�1
+    outRgvSta[2]:
+      staNo: 108
+    # Rgv鍑哄簱鍙�1
+    outRgvSta[3]:
+      staNo: 111
+    # Rgv鍑哄簱鍙�1
+    outRgvSta[4]:
+      staNo: 114
+    # Rgv鍑哄簱鍙�1
+    outRgvSta[5]:
+      staNo: 117
+    # Rgv鍏ュ簱鍙�1
+    inRgvSta[0]:
+      staNo: 118
+    # Rgv鍏ュ簱鍙�1
+    inRgvSta[1]:
+      staNo: 119
+    # Rgv鍏ュ簱鍙�1
+    inRgvSta[2]:
+      staNo: 120
+    # Rgv鍏ュ簱鍙�1
+    inRgvSta[3]:
+      staNo: 121
+    # Rgv鍏ュ簱鍙�1
+    inRgvSta[4]:
+      staNo: 122
+    # Rgv鍏ュ簱鍙�1
+    inRgvSta[5]:
+      staNo: 123
+
+  # 杈撻�佺嚎
+  devp[1]:
+    id: 2
+    ip: 192.168.18.81
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 15
+      staNo: 217
       barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[2].id}
+    # 鍏ュ簱鍙�1
+    inSta[1]:
+      staNo: 221
+      barcode: ${wcs-slave.barcode[1].id}
+      led: ${wcs-slave.led[1].id}
+    # WMS鍏ュ簱鍙�1
+    inWmsSta[0]:
+      staNo: 212
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 12
+      staNo: 212
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 11
+      staNo: 212
+    # 鍑哄簱鍙�1
+    outSta[1]:
+      staNo: 213
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 11
-      barcode: ${wcs-slave.barcode[0].id}
+      staNo: 212
+    # 2妤肩爜鍨涗綅缃�
+    driveSta[0]:
+      staNo: 215
+      barcode: ${wcs-slave.barcode[3].id}
+    # 2妤肩爜鍨涗綅缃�
+    driveSta[1]:
+      staNo: 219
+      barcode: ${wcs-slave.barcode[4].id}
 
   # 鏉$爜鎵弿浠�
   barcode[0]:
     id: 1
     ip: 10.10.10.52
     port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[1]:
+    id: 2
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[2]:
+    id: 3
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[3]:
+    id: 4
+    ip: 10.10.10.52
+    port: 51236
+  # 鏉$爜鎵弿浠�
+  barcode[4]:
+    id: 5
+    ip: 10.10.10.52
+    port: 51236
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.201
+    ip: 192.168.18.5
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 15
+    staArr: 144
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.202
+    ip: 192.168.18.6
     port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 11
\ No newline at end of file
+    devpPlcId: ${wcs-slave.devp[1].id}
+    staArr: 221
+  # LED3
+  led[2]:
+    id: 3
+    ip: 192.168.18.7
+    port: 5005
+    devpPlcId: ${wcs-slave.devp[1].id}
+    staArr: 217
\ No newline at end of file

--
Gitblit v1.9.1