From aa641ae9531ff38a80316cb4f72fa8ece43d7029 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 26 四月 2025 15:24:34 +0800
Subject: [PATCH] #

---
 src/main/resources/application-prod.yml |  451 +++++++++++++++++--------------------------------------
 1 files changed, 142 insertions(+), 309 deletions(-)

diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 7759046..dbe7b2c 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,333 +1,166 @@
 wcs-slave:
-  doubleDeep: false #鍙屾繁
-  doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24 #鍙屾繁搴撲綅鎺掑彿
-  groupCount: 2 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   crn[0]: #鍫嗗灈鏈�1
-    id: 1
-    ip: 172.17.91.2
-    slot: 0
-    demo: false
     rack: 0
-    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2    #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     port: 102
-    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 101
+      row: 2
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[0]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
       staNo: 100
-      row: 2
+      row: 1
       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: 3
-      bay: 22
-      lev: 2
-      devpPlcId: ${wcs-slave.devp[1].id}
-  crn[1]: #鍫嗗灈鏈�2
-    id: 2
-    ip: 172.17.91.7
-    slot: 0
-    demo: false
-    rack: 0
-    offset: 2  #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    port: 102
-    crnOutStn[0]:  #鍫嗗灈鏈哄嚭搴撶珯鐐�
-      staNo: 104
-      row: 5
+    ip: 192.168.4.250
+    crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 100
+      row: 1
       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
-    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: 19
-      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
+    demo: false
+  crn[1]: #鍫嗗灈鏈�2
+    rack: 0
+    offset: 2    #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    port: 102
+    crnOutStn[1]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
       staNo: 103
-    emptyInSta[1]: #绌烘澘鍏ュ簱鍙�1
+      row: 5
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[0]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 102
+      row: 4
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    ip: 10.10.10.10
+    crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 102
+      row: 4
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    id: 2
+    slot: 0
+    demo: false
+  barcode[3]: #鏉$爜鎵弿浠�4
+    port: 51236
+    ip: 10.10.10.52
+    id: 4
+  barcode[2]: #鏉$爜鎵弿浠�3
+    port: 51236
+    ip: 10.10.10.52
+    id: 3
+  doubleLocs: 3,6,7,10,13 #鍙屾繁搴撲綅鎺掑彿 3,6,7,10,13
+  barcode[1]: #鏉$爜鎵弿浠�2
+    port: 51236
+    ip: 10.10.10.52
+    id: 2
+  groupCount: 4 #涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
+  devp[0]: #杈撻�佺嚎
+    emptyInSta[2]: #绌烘澘鍏ュ簱鍙�3
+      staNo: 104
+    emptyInSta[1]: #绌烘澘鍏ュ簱鍙�2
+      staNo: 102
+    rack: 0
+    emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
+      staNo: 100
+    ip: 192.168.4.250
+    outSta[4]: #鍑哄簱鍙�5
+      staNo: 104
+    outSta[3]: #鍑哄簱鍙�4
+      staNo: 103
+    outSta[6]: #鍑哄簱鍙�7
+      staNo: 106
+    slot: 0
+    outSta[5]: #鍑哄簱鍙�6
       staNo: 105
-    emptyInSta[2]: #绌烘澘鍏ュ簱鍙�2
-      staNo: 109
-    emptyInSta[3]: #绌烘澘鍏ュ簱鍙�3
-      staNo: 113
-    emptyInSta[4]: #绌烘澘鍏ュ簱鍙�4
-      staNo: 117
-    emptyInSta[5]: #绌烘澘鍏ュ簱鍙�5
-      staNo: 121
+    outSta[0]: #鍑哄簱鍙�1
+      staNo: 100
+    outSta[2]: #鍑哄簱鍙�3
+      staNo: 102
+    emptyInSta[3]: #绌烘澘鍏ュ簱鍙�4
+      staNo: 106
+    outSta[1]: #鍑哄簱鍙�2
+      staNo: 101
+    inSta[2]:
+      staNo: 104
+      barcode: ${wcs-slave.barcode[2].id}
+    inSta[3]:
+      staNo: 106
+      barcode: ${wcs-slave.barcode[3].id}
+    port: 102
+    outSta[7]: #鍑哄簱鍙�8
+      staNo: 107
     inSta[0]: #鍏ュ簱鍙�1
-      scale: ${wcs-slave.scale[0].id}
-      staNo: 103
-      backSta: 102
+      staNo: 100
       barcode: ${wcs-slave.barcode[0].id}
     inSta[1]: #鍏ュ簱鍙�2
-      scale: ${wcs-slave.scale[1].id}
-      staNo: 107
-      backSta: 106
+      staNo: 102
       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
+    id: 1
+  barcode[0]: #鏉$爜鎵弿浠�1
+    port: 51236
+    ip: 10.10.10.52
+    id: 1
+  doubleDeep: false #鍙屾繁
+  crn[2]: #鍫嗗灈鏈�3
+    rack: 0
+    offset: 2    #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    port: 102
+    crnOutStn[1]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 105
+      row: 9
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[0]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
       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
-  devp[2]: #杈撻�佺嚎
+      row: 8
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    ip: 10.10.10.11
+    crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 104
+      row: 8
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
     id: 3
-    ip: 172.17.8.201
-    rack: 0
     slot: 0
+    demo: false
+  crn[3]: #鍫嗗灈鏈�4
+    rack: 0
+    offset: 2    #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
     port: 102
-    emptyInSta[0]: #绌烘澘鍏ュ簱鍙�1
-      staNo: 306
-    inSta[0]: #鍏ュ簱鍙�1
-      scale: ${wcs-slave.scale[1].id}
-      staNo: 301
-      barcode: ${wcs-slave.barcode[1].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
-    id: 1
-  scale[1]: #纾呯Г
-    port: 5005
-    ip: 10.10.10.202
-    id: 2
-  barcode[0]: #鏉$爜鎵弿浠�
-    port: 51236
-    ip: 172.17.91.39
-    id: 1
-  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
+    crnOutStn[1]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 107
+      row: 12
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    crnOutStn[0]:    #鍫嗗灈鏈哄嚭搴撶珯鐐�
+      staNo: 106
+      row: 11
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
+    ip: 10.10.10.11
+    crnInStn[0]:    #鍫嗗灈鏈哄叆搴撶珯鐐�1
+      staNo: 106
+      row: 11
+      bay: 1
+      lev: 1
+      devpPlcId: ${wcs-slave.devp[0].id}
     id: 4
-  barcode[4]:
-    port: 51236
-    ip: 172.17.91.43
-    id: 5
-  barcode[5]:
-    port: 51236
-    ip: 172.17.91.44
-    id: 6
+    slot: 0
+    demo: false

--
Gitblit v1.9.1