From 536ac7042e063ec9b9d370d6cd973d5c0b48e4fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 19 十二月 2023 17:15:57 +0800
Subject: [PATCH] #

---
 src/main/resources/application-prod.yml |  421 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 347 insertions(+), 74 deletions(-)

diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index d302ce5..36fabaf 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,96 +1,346 @@
 wcs-slave:
+  doubleDeep: true #鍙屾繁
+  doubleLocs: 1,4,7,10,11,14,15,18,19 #鍙屾繁搴撲綅鎺掑彿
+  groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   crn[0]: #鍫嗗灈鏈�1
-    rack: 0
-    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    port: 102
-    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
-      staNo: 210
-      row: 1
-      bay: 41
-      lev: 1
-      devpPlcId: ${wcs-slave.devp[0].id}
-    crnInStn[1]:  #鍫嗗灈鏈哄叆搴撶珯鐐�2
-      staNo: 209
-      row: 2
-      bay: 41
-      lev: 1
-      devpPlcId: ${wcs-slave.devp[0].id}
-    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
-      staNo: 105
-      row: 1
-      bay: 1
-      lev: 1
-      devpPlcId: ${wcs-slave.devp[0].id}
-    ip: 10.10.10.3
-    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
-      staNo: 106
-      row: 2
-      bay: 1
-      lev: 1
-      devpPlcId: ${wcs-slave.devp[0].id}
     id: 1
+    ip: 172.17.91.2
     slot: 0
     demo: false
-  crn[1]: #鍫嗗灈鏈�2
     rack: 0
     offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     port: 102
-    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
-      staNo: 206
-      row: 3
-      bay: 41
+    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 100
+      row: 2
+      bay: 1
       lev: 1
       devpPlcId: ${wcs-slave.devp[0].id}
+    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 103
+      row: 3
+      bay: 1
+      lev: 1
+      backSta: 102
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 200
+      row: 2
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
     crnInStn[1]:  #鍫嗗灈鏈哄叆搴撶珯鐐�2
       staNo: 205
-      row: 4
-      bay: 41
-      lev: 1
-      devpPlcId: ${wcs-slave.devp[0].id}
-    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
-      staNo: 109
       row: 3
-      bay: 1
-      lev: 1
-      devpPlcId: ${wcs-slave.devp[0].id}
-    ip: 10.10.10.10
-    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
-      staNo: 110
-      row: 4
-      bay: 1
-      lev: 1
-      devpPlcId: ${wcs-slave.devp[0].id}
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+  crn[1]: #鍫嗗灈鏈�2
     id: 2
+    ip: 172.17.91.7
     slot: 0
     demo: false
-  doubleLocs: null #鍙屾繁搴撲綅鎺掑彿 1,4,5,8,9,12,13,16
-  barcode[1]:
-    port: 51236
-    ip: 10.10.10.52
-    id: 2
-  groupCount: 2 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  devp[0]: #杈撻�佺嚎
-    emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
-      staNo: 201
     rack: 0
-    emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
-      staNo: 101
+    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     port: 102
-    inSta[0]: #鍏ュ簱鍙�1
-      scale: ${wcs-slave.scale[0].id}
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-    ip: 10.10.10.30
-    inSta[1]: #鍏ュ簱鍙�2
-      scale: ${wcs-slave.scale[1].id}
-      staNo: 201
-      barcode: ${wcs-slave.barcode[1].id}
-    id: 1
+    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 104
+      row: 5
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 107
+      row: 6
+      bay: 1
+      lev: 1
+      backSta: 106
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 206
+      row: 5
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+    crnInStn[1]:  #鍫嗗灈鏈哄叆搴撶珯鐐�2
+      staNo: 211
+      row: 6
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+  crn[2]: #鍫嗗灈鏈�3
+    id: 3
+    ip: 172.17.91.12
     slot: 0
-    outSta[0]: #鍑哄簱鍙�1
+    demo: false
+    rack: 0
+    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    port: 102
+    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 108
+      row: 8
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 111
+      row: 9
+      bay: 1
+      lev: 1
+      backSta: 110
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 212
+      row: 8
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+    crnInStn[1]:  #鍫嗗灈鏈哄叆搴撶珯鐐�2
+      staNo: 217
+      row: 9
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+  crn[3]: #鍫嗗灈鏈�4
+    id: 4
+    ip: 172.17.91.17
+    slot: 0
+    demo: false
+    rack: 0
+    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    port: 102
+    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 112
+      row: 12
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 115
+      row: 13
+      bay: 1
+      lev: 1
+      backSta: 114
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 218
+      row: 12
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+    crnInStn[1]:  #鍫嗗灈鏈哄叆搴撶珯鐐�2
+      staNo: 223
+      row: 13
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+  crn[4]: #鍫嗗灈鏈�5
+    id: 5
+    ip: 172.17.91.22
+    slot: 0
+    demo: false
+    rack: 0
+    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    port: 102
+    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 116
+      row: 16
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 119
+      row: 17
+      bay: 1
+      lev: 1
+      backSta: 118
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 224
+      row: 16
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+    crnInStn[1]:  #鍫嗗灈鏈哄叆搴撶珯鐐�2
+      staNo: 229
+      row: 17
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+  crn[5]: #鍫嗗灈鏈�6
+    id: 6
+    ip: 172.17.91.27
+    slot: 0
+    demo: false
+    rack: 0
+    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    port: 102
+    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 120
+      row: 20
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnInStn[0]:  #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 123
+      row: 21
+      bay: 1
+      lev: 1
+      backSta: 122
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[1]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 230
+      row: 20
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+    crnInStn[1]:  #鍫嗗灈鏈哄叆搴撶珯鐐�2
+      staNo: 235
+      row: 21
+      bay: 22
+      lev: 2
+      devpPlcId: ${wcs-slave.devp[1].id}
+  devp[0]: #杈撻�佺嚎
+    id: 1
+    ip: 172.17.91.36
+    rack: 0
+    port: 102
+    slot: 0
+    emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
       staNo: 103
+    emptyInSta[1]: #绌烘澘鍏ュ簱鍙�1
+      staNo: 105
+    emptyInSta[2]: #绌烘澘鍏ュ簱鍙�2
+      staNo: 109
+    emptyInSta[3]: #绌烘澘鍏ュ簱鍙�3
+      staNo: 113
+    emptyInSta[4]: #绌烘澘鍏ュ簱鍙�4
+      staNo: 117
+    emptyInSta[5]: #绌烘澘鍏ュ簱鍙�5
+      staNo: 121
+    inSta[0]: #鍏ュ簱鍙�1
+      #scale: ${wcs-slave.scale[0].id}
+      staNo: 103
+      backSta: 102
+      barcode: ${wcs-slave.barcode[0].id}
+    inSta[1]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 107
+      backSta: 106
+      barcode: ${wcs-slave.barcode[1].id}
+      #slot: 0
+    inSta[2]: #鍏ュ簱鍙�1
+      #scale: ${wcs-slave.scale[0].id}
+      staNo: 111
+      backSta: 110
+      barcode: ${wcs-slave.barcode[2].id}
+    inSta[3]: #鍏ュ簱鍙�1
+      #scale: ${wcs-slave.scale[0].id}
+      staNo: 115
+      backSta: 114
+      barcode: ${wcs-slave.barcode[3].id}
+    inSta[4]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 119
+      backSta: 118
+      barcode: ${wcs-slave.barcode[4].id}
+      #slot: 0
+    inSta[5]: #鍏ュ簱鍙�1
+      #scale: ${wcs-slave.scale[0].id}
+      staNo: 123
+      backSta: 122
+      barcode: ${wcs-slave.barcode[5].id}
+    outSta[0]: #鍑哄簱鍙�1
+      staNo: 100
     outSta[1]: #鍑哄簱鍙�2
-      staNo: 203
+      staNo: 104
+    outSta[2]: #鍑哄簱鍙�2
+      staNo: 108
+    outSta[3]: #鍑哄簱鍙�1
+      staNo: 112
+    outSta[4]: #鍑哄簱鍙�2
+      staNo: 116
+    outSta[5]: #鍑哄簱鍙�2
+      staNo: 120
+  devp[1]: #杈撻�佺嚎
+    id: 2
+    ip: 172.17.91.45
+    rack: 0
+    port: 102
+    slot: 0
+    inSta[0]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 205
+      backSta: 203
+      #barcode: ${wcs-slave.barcode[4].id}
+    inSta[1]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 211
+      backSta: 209
+      #barcode: ${wcs-slave.barcode[4].id}
+    inSta[2]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 217
+      backSta: 215
+      #barcode: ${wcs-slave.barcode[4].id}
+    inSta[3]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 223
+      backSta: 221
+      #barcode: ${wcs-slave.barcode[4].id}
+    inSta[4]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 229
+      backSta: 227
+      #barcode: ${wcs-slave.barcode[4].id}
+    inSta[5]: #鍏ュ簱鍙�2
+      #scale: ${wcs-slave.scale[1].id}
+      staNo: 235
+      backSta: 232
+      #barcode: ${wcs-slave.barcode[4].id}
+    outSta[0]: #鍑哄簱鍙�1
+      staNo: 200
+    outSta[1]: #鍑哄簱鍙�1
+      staNo: 206
+    outSta[2]: #鍑哄簱鍙�1
+      staNo: 212
+    outSta[3]: #鍑哄簱鍙�1
+      staNo: 218
+    outSta[4]: #鍑哄簱鍙�1
+      staNo: 224
+    outSta[5]: #鍑哄簱鍙�1
+      staNo: 230
+  devp[2]: #杈撻�佺嚎
+    id: 3
+    ip: 172.17.8.201
+    rack: 0
+    slot: 0
+    port: 102
+    emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+      staNo: 306
+    inSta[0]: #鍏ュ簱鍙�1
+      scale: ${wcs-slave.scale[1].id}
+      staNo: 301
+      barcode: ${wcs-slave.barcode[6].id}
+      backSta: 300
+      #slot: 0
+    outSta[0]: #鍑哄簱鍙�1
+      staNo: 307
+#  devp[3]: #杈撻�佺嚎
+#    id: 4
+#    ip: 10.10.10.30
+#    rack: 0
+#    slot: 0
+#    port: 102
+#    emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+#      staNo: 406
+#    inSta[0]: #鍏ュ簱鍙�1
+#      scale: ${wcs-slave.scale[1].id}
+#      staNo: 406
+#      barcode: ${wcs-slave.barcode[1].id}
+#      #slot: 0
+#    outSta[0]: #鍑哄簱鍙�1
+#      staNo: 407
   scale[0]: #纾呯Г
     port: 5005
     ip: 10.10.10.201
@@ -101,6 +351,29 @@
     id: 2
   barcode[0]: #鏉$爜鎵弿浠�
     port: 51236
-    ip: 10.10.10.52
+    ip: 172.17.91.39
     id: 1
-  doubleDeep: false #鍙屾繁
+  barcode[1]:
+    port: 51236
+    ip: 172.17.91.40
+    id: 2
+  barcode[2]:
+    port: 51236
+    ip: 172.17.91.41
+    id: 3
+  barcode[3]:
+    port: 51236
+    ip: 172.17.91.42
+    id: 4
+  barcode[4]:
+    port: 51236
+    ip: 172.17.91.43
+    id: 5
+  barcode[5]:
+    port: 51236
+    ip: 172.17.91.44
+    id: 6
+  barcode[6]:
+    port: 51236
+    ip: 172.17.8.203
+    id: 7

--
Gitblit v1.9.1