From f0429051895816ebadc50bbc409021e23e4d1a3a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 16:43:06 +0800
Subject: [PATCH] #

---
 src/main/resources/application.yml |  864 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 540 insertions(+), 324 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e4e7ec5..e37ff6a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,13 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://192.168.4.15:1433;databasename=sxlktasrs
+#    url: jdbc:sqlserver://localhost:1433;databasename=jshdasrs
+    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
     username: sa
     password: sa@123
+#    url: jdbc:sqlserver://192.168.4.191:50948;databasename=jshdasrs
+#    username: sa
+#    password: sa@123
   mvc:
     static-path-pattern: /**
   redis:
@@ -34,313 +38,546 @@
   enable: false
 
 wms:
-  url: 192.168.0.17:8080/lktwms
+  url: 127.0.0.1:8081/jshdasrs
+  comb: mobile/combAuto/wcs/auth
+inventory:
+  number: 7
 
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 9,12,15,18
+  doubleLocs: 1,4,5,8,9,12,13,16,17,20
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.1
-    port: 6000
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 105
-      row: 1
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 106
-      row: 2
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�2
-  crn[1]:
-    id: 2
-    ip: 10.10.10.2
-    port: 6000
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 113
-      row: 3
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 114
-      row: 4
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�3
-  crn[2]:
-    id: 3
-    ip: 10.10.10.3
-    port: 6000
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 121
-      row: 5
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 122
-      row: 6
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�4
-  crn[3]:
-    id: 4
-    ip: 10.10.10.4
-    port: 6000
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 129
-      row: 7
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 130
-      row: 8
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�5
-  crn[4]:
-    id: 5
-    ip: 10.10.10.5
-    port: 6000
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 202
-      row: 10
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 203
-      row: 11
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�6
-  crn[5]:
-    id: 6
-    ip: 10.10.10.6
-    port: 6000
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 208
-      row: 13
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 209
-      row: 14
-      bay: 1
-      lev: 1
-  # 鍫嗗灈鏈�7
-  crn[6]:
-    id: 7
-    ip: 10.10.10.7
-    port: 6000
-    rack: 0
-    slot: 0
-    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-    offset: 2
-    demo: false
-    # 鍫嗗灈鏈哄叆搴撶珯鐐�
-    crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 214
-      row: 16
-      bay: 1
-      lev: 1
-    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-    crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[1].id}
-      staNo: 215
-      row: 17
-      bay: 1
-      lev: 1
-  # 杈撻�佺嚎1
-  devp[0]:
-    id: 1
     ip: 10.10.10.100
     port: 102
     rack: 0
     slot: 0
-    # 鍏ュ簱鍙�1
-    inSta[0]:
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
-      led: ${wcs-slave.led[0].id}
-    # 鍏ュ簱鍙�3
-    inSta[1]:
-      staNo: 117
-      barcode: ${wcs-slave.barcode[2].id}
-      backSta: 100
-      led: ${wcs-slave.led[2].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-      backSta: 100
-      led: ${wcs-slave.led[0].id}
-    # 绌烘澘鍏ュ簱鍙�3
-    emptyInSta[1]:
-      staNo: 117
-      barcode: ${wcs-slave.barcode[2].id}
-      backSta: 100
-      led: ${wcs-slave.led[2].id}
-    # 鎷f枡鍏ュ簱鍙�1
-    pickSta[0]:
-      staNo: 101
-      barcode: ${wcs-slave.barcode[0].id}
-      led: ${wcs-slave.led[0].id}
-    # 鎷f枡鍏ュ簱鍙�2
-    pickSta[1]:
-      staNo: 117
-      barcode: ${wcs-slave.barcode[2].id}
-      led: ${wcs-slave.led[2].id}
-
-    # 鍑哄簱鍙�1
-    outSta[0]:
-      staNo: 126
-      led: ${wcs-slave.led[3].id}
-    # 鍑哄簱鍙�2
-    outSta[1]:
-      staNo: 134
-      led: ${wcs-slave.led[4].id}
-    # 鍑哄簱鍙�2
-    outSta[2]:
-      staNo: 100
-      led: ${wcs-slave.led[0].id}
-    # 鍑哄簱鍙�2
-    outSta[3]:
-      staNo: 108
-      led: ${wcs-slave.led[1].id}
-
-  # 杈撻�佺嚎2
-  devp[1]:
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1001
+      staNo2: 1002
+      row: 2
+      bay: 52
+      lev: 1
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2004
+      staNo2: 2006
+      row: 3
+      bay: 52
+      lev: 2
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1005
+      row: 3
+      bay: 52
+      lev: 1
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2001
+      row: 2
+      bay: 52
+      lev: 2
+  # 鍫嗗灈鏈�2
+  crn[1]:
     id: 2
     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: 1011
+      staNo2: 1012
+      row: 7
+      bay: 52
+      lev: 1
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2010
+      staNo2: 2012
+      row: 7
+      bay: 52
+      lev: 2
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1008
+      row: 6
+      bay: 52
+      lev: 1
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2007
+      row: 6
+      bay: 52
+      lev: 2
+  # 鍫嗗灈鏈�3
+  crn[2]:
+    id: 3
+    ip: 10.10.10.120
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1015
+      staNo2: 1016
+      row: 9
+      bay: 52
+      lev: 1
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2016
+      staNo2: 2018
+      row: 11
+      bay: 52
+      lev: 2
+    crnInStn[2]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 4001
+      row: 9
+      bay: 52
+      lev: 3
+
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1019
+      row: 11
+      bay: 52
+      lev: 1
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2013
+      row: 9
+      bay: 52
+      lev: 2
+    crnOutStn[2]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 4004
+      row: 11
+      bay: 52
+      lev: 3
+  # 鍫嗗灈鏈�4
+  crn[3]:
+    id: 4
+    ip: 10.10.10.130
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1025
+      staNo2: 1026
+      row: 15
+      bay: 52
+      lev: 1
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2022
+      staNo2: 2024
+      row: 15
+      bay: 52
+      lev: 2
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1022
+      row: 14
+      bay: 52
+      lev: 1
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2019
+      row: 14
+      bay: 52
+      lev: 2
+  # 鍫嗗灈鏈�4
+  crn[4]:
+    id: 5
+    ip: 10.10.10.140
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+    offset: 2
+    demo: false
+    # 鍫嗗灈鏈哄叆搴撶珯鐐�
+    crnInStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1032
+      staNo2: 1033
+      row: 19
+      bay: 52
+      lev: 1
+    crnInStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2028
+      staNo2: 2030
+      row: 19
+      bay: 52
+      lev: 2
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1029
+      row: 18
+      bay: 52
+      lev: 1
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2025
+      row: 18
+      bay: 52
+      lev: 2
+
+  # RGV绌挎杞�1
+  rgv[0]:
+    id: 1
+    ip: 10.10.10.190
+    port: 502
+    rack: 0
+    slot: 0
+    #RGV鍏ュ簱鍙栬揣绔欑偣
+    rgvInTStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1042
+      staNo2: 1043
+    rgvInTStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1105
+      staNo2: 1104
+    rgvInTStn[2]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1038
+    rgvInTStn[3]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1036
+    #RGV鍏ュ簱鏀捐揣绔欑偣
+    rgvInPStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1004
+    rgvInPStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1014
+    rgvInPStn[2]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1018
+    rgvInPStn[3]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1028
+    rgvInPStn[4]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1035
+    #RGV鍑哄簱鍙栬揣绔欑偣
+    rgvOutTStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1007
+      staNo2: 1005
+    rgvOutTStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1010
+      staNo2: 1008
+    rgvOutTStn[2]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1021
+      staNo2: 1019
+    rgvOutTStn[3]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1024
+      staNo2: 1022
+    rgvOutTStn[4]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1031
+      staNo2: 1029
+    #RGV鍑哄簱鏀捐揣绔欑偣
+    rgvOutPStn[0]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1106
+    rgvOutPStn[1]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1041
+    rgvOutPStn[2]:
+      devpPlcId: ${wcs-slave.devp[0].id}
+      staNo: 1036
+
+  # RGV绌挎杞�2
+  rgv[1]:
+    id: 2
+    ip: 10.10.10.193
+    port: 502
+    rack: 0
+    slot: 0
+    #RGV鍏ュ簱鍙栬揣绔欑偣
+    rgvInTStn[0]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2037
+    #RGV鍏ュ簱鏀捐揣绔欑偣
+    rgvInPStn[0]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2006
+    rgvInPStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2012
+    rgvInPStn[2]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2018
+    rgvInPStn[3]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2024
+    rgvInPStn[4]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2030
+    #RGV鍑哄簱鍙栬揣绔欑偣
+    rgvOutTStn[0]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2003
+      staNo2: 2001
+    rgvOutTStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2009
+      staNo2: 2007
+
+    rgvOutTStn[2]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2015
+      staNo2: 2013
+
+    rgvOutTStn[3]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2021
+      staNo2: 2019
+
+    rgvOutTStn[4]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2027
+      staNo2: 2025
+
+    #RGV鍑哄簱鏀捐揣绔欑偣
+    rgvOutPStn[0]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 2031
+  # 杈撻�佺嚎1
+  devp[0]:
+    id: 1
+    ip: 10.10.10.51
+    port: 102
+    rack: 0
+    slot: 0
+    # 鐮佸灈浣�
+    armSta[0]:
+      staNo: 1098
+      armNo: 1
+      sortingLine: 8
+      staNoEnd: 1103
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+    # 鐮佸灈浣�
+    armSta[1]:
+      staNo: 1093
+      armNo: 1
+      sortingLine: 7
+      staNoEnd: 1093
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+    # 鐮佸灈浣�
+    armSta[2]:
+      staNo: 1087
+      armNo: 2
+      sortingLine: 6
+      staNoEnd: 1087
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+    # 鐮佸灈浣�
+    armSta[3]:
+      staNo: 1082
+      armNo: 2
+      sortingLine: 5
+      staNoEnd: 1082
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+    # 鐮佸灈浣�
+    armSta[4]:
+      staNo: 1074
+      armNo: 3
+      sortingLine: 4
+      staNoEnd: 1074
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+    # 鐮佸灈浣�
+    armSta[5]:
+      staNo: 1071
+      armNo: 3
+      sortingLine: 3
+      staNoEnd: 1071
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+    # 鐮佸灈浣�
+    armSta[6]:
+      staNo: 1061
+      armNo: 4
+      sortingLine: 2
+      staNoEnd: 1061
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+    # 鐮佸灈浣�
+    armSta[7]:
+      staNo: 1058
+      armNo: 4
+      sortingLine: 1
+      staNoEnd: 1058
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 201
-      barcode: ${wcs-slave.barcode[3].id}
-      backSta: 200
-      led: ${wcs-slave.led[5].id}
-    # 鍏ュ簱鍙�2
+      staNo: 1047
+      barcode: ${wcs-slave.barcode[1].id}
+      backSta: 1041
+      led: ${wcs-slave.led[1].id}
     inSta[1]:
-      staNo: 207
-      barcode: ${wcs-slave.barcode[4].id}
-      backSta: 206
-      led: ${wcs-slave.led[7].id}
-    # 鍏ュ簱鍙�3
-    inSta[2]:
-      staNo: 213
-      barcode: ${wcs-slave.barcode[5].id}
-      backSta: 212
-      led: ${wcs-slave.led[9].id}
+      staNo: 1036
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 1037
+      led: ${wcs-slave.led[1].id}
     # 绌烘澘鍏ュ簱鍙�1
     emptyInSta[0]:
-      staNo: 201
-      barcode: ${wcs-slave.barcode[3].id}
-      backSta: 200
-      led: ${wcs-slave.led[5].id}
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 207
-      barcode: ${wcs-slave.barcode[4].id}
-      backSta: 206
-      led: ${wcs-slave.led[7].id}
-    # 绌烘澘鍏ュ簱鍙�3
-    emptyInSta[2]:
-      staNo: 213
-      barcode: ${wcs-slave.barcode[5].id}
-      backSta: 212
-      led: ${wcs-slave.led[9].id}
+      staNo: 1038
+      barcode: ${wcs-slave.barcode[0].id}
+      backSta: 1038
+      led: ${wcs-slave.led[1].id}
     # 鎷f枡鍏ュ簱鍙�1
     pickSta[0]:
-      staNo: 201
-      barcode: ${wcs-slave.barcode[3].id}
-      led: ${wcs-slave.led[5].id}
-    # 鎷f枡鍏ュ簱鍙�2
-    pickSta[1]:
-      staNo: 207
-      barcode: ${wcs-slave.barcode[4].id}
-      led: ${wcs-slave.led[7].id}
-    # 鎷f枡鍏ュ簱鍙�3
-    pickSta[2]:
-      staNo: 213
-      barcode: ${wcs-slave.barcode[5].id}
-      led: ${wcs-slave.led[9].id}
+      staNo: 1036
+      barcode: ${wcs-slave.barcode[0].id}
+      led: ${wcs-slave.led[1].id}
+      backSta: 1037
+    # 鍏ュ簱鍙�1
+    inSta[2]:
+      staNo: 1103
+      barcode: ${wcs-slave.barcode[2].id}
+      backSta: 1041
+      led: ${wcs-slave.led[2].id}
+#    inSta[2]:
+#      staNo: 159
+#      barcode: ${wcs-slave.barcode[2].id}
+#      barcodeMat: ${wcs-slave.barcode[5].id}
+#      backSta: 160
+#      led: ${wcs-slave.led[5].id}
     # 鍑哄簱鍙�1
     outSta[0]:
-      staNo: 205
-      led: ${wcs-slave.led[6].id}
-    # 鍑哄簱鍙�2
+      staNo: 1041
+      led: ${wcs-slave.led[1].id}
+    outStaAgvFull[0]:
+      staNo: 1041
+      led: ${wcs-slave.led[1].id}
+    inStaAgv[0]:
+      staNo: 1037
+      led: ${wcs-slave.led[0].id}
+
+
+  # 杈撻�佺嚎1
+  devp[1]:
+    id: 2
+    ip: 10.10.10.71
+    port: 102
+    rack: 0
+    slot: 0
+    # 鍏ュ簱鍙�1
+    inSta[0]:
+      staNo: 2037
+      barcode: ${wcs-slave.barcode[3].id}
+      backSta: 2034
+      led: ${wcs-slave.led[5].id}
+#    # 绌烘澘鍏ュ簱鍙�1
+#    emptyInSta[0]:
+#      staNo: 106
+#      barcode: ${wcs-slave.barcode[0].id}
+#      backSta: 105
+#      led: ${wcs-slave.led[1].id}
+    # 鎷f枡鍏ュ簱鍙�1
+    pickSta[0]:
+      staNo: 4001
+      barcode: ${wcs-slave.barcode[4].id}
+      led: ${wcs-slave.led[4].id}
+      backSta: 4003
+    # 鍏ュ簱鍙�1
+    inSta[1]:
+      staNo: 4001
+      barcode: ${wcs-slave.barcode[4].id}
+      backSta: 4003
+      led: ${wcs-slave.led[4].id}
+#    # 绌烘澘鍏ュ簱鍙�1
+#    emptyInSta[1]:
+#      staNo: 107
+#      barcode: ${wcs-slave.barcode[1].id}
+#      backSta: 108
+#      led: ${wcs-slave.led[2].id}
+#    inSta[2]:
+#      staNo: 159
+#      barcode: ${wcs-slave.barcode[2].id}
+#      barcodeMat: ${wcs-slave.barcode[5].id}
+#      backSta: 160
+#      led: ${wcs-slave.led[5].id}
+    #    # 鎷f枡鍏ュ簱鍙�1
+    #    pickSta[1]:
+    #      staNo: 107
+    #      barcode: ${wcs-slave.barcode[1].id}
+    #      led: ${wcs-slave.led[1].id}
+    #      backSta: 108
+    # 鍑哄簱鍙�1
+    outSta[0]:
+      staNo: 2031
+#      led: ${wcs-slave.led[0].id}
     outSta[1]:
-      staNo: 211
-      led: ${wcs-slave.led[8].id}
-    # 鍑哄簱鍙�3
-    outSta[2]:
-      staNo: 217
-      led: ${wcs-slave.led[10].id}
+      staNo: 4006
+      led: ${wcs-slave.led[5].id}
+
+    # 鍏ュ簱鍙�1
+    inStaAgv[0]:
+      staNo: 2034
+      led: ${wcs-slave.led[5].id}
+    outStaAgvEmpty[0]:
+      staNo: 2033
+      led: ${wcs-slave.led[5].id}
+    outStaAgvFull[0]:
+      staNo: 4006
+      led: ${wcs-slave.led[5].id}
+#    outSta[2]:
+#      staNo: 156
+#      led: ${wcs-slave.led[4].id}
+    # 鎷嗗灈浣�
+    armStaTwo[0]:
+      staNo: 2110
+      armNo: 5
+    # 鎷嗗灈浣�
+    armStaTwo[1]:
+      staNo: 2120
+      armNo: 6
+
 
   # 鏉$爜鎵弿浠�1
   barcode[0]:
@@ -357,17 +594,17 @@
     id: 3
     ip: 10.10.10.123
     port: 51236
-  # 鏉$爜鎵弿浠�4
+  # 鏉$爜鎵弿浠�1mat
   barcode[3]:
     id: 4
     ip: 10.10.10.124
     port: 51236
-  # 鏉$爜鎵弿浠�5
+  # 鏉$爜鎵弿浠�2mat
   barcode[4]:
     id: 5
     ip: 10.10.10.125
     port: 51236
-  # 鏉$爜鎵弿浠�6
+  # 鏉$爜鎵弿浠�3mat
   barcode[5]:
     id: 6
     ip: 10.10.10.126
@@ -375,77 +612,56 @@
    # LED1
   led[0]:
     id: 1
-    ip: 10.10.10.249
+    ip: 10.10.10.212
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 101
+    staArr: 1036
   # LED2
   led[1]:
     id: 2
-    ip: 10.10.10.248
+    ip: 10.10.10.213
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 108
+    staArr: 1041
   # LED3
   led[2]:
     id: 3
-    ip: 10.10.10.247
+    ip: 10.10.10.214
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 117
+    staArr: 1103
   # LED4
   led[3]:
     id: 4
-    ip: 10.10.10.246
+    ip: 10.10.10.216
     port: 5005
     devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 126
-  # LED5
+    staArr: 1047
+  # LED4
   led[4]:
     id: 5
-    ip: 10.10.10.245
+    ip: 10.10.10.215
     port: 5005
-    devpPlcId: ${wcs-slave.devp[0].id}
-    staArr: 134
-  # LED6
+    devpPlcId: ${wcs-slave.devp[1].id}
+    staArr: 2037
+  # LED5
   led[5]:
     id: 6
-    ip: 10.10.10.244
+    ip: 10.10.10.217
     port: 5005
     devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 201
-  # LED7
+    staArr: 4001
+  # LED6
   led[6]:
     id: 7
-    ip: 10.10.10.243
+    ip: 10.10.10.218
     port: 5005
     devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 205
-  # LED8
+    staArr: 4006
+  # LED7
   led[7]:
     id: 8
-    ip: 10.10.10.242
+    ip: 10.10.10.219
     port: 5005
-    devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 207
-  # LED9
-  led[8]:
-    id: 9
-    ip: 10.10.10.241
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 211
-  # LED10
-  led[9]:
-    id: 10
-    ip: 10.10.10.240
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 213
-  # LED11
-  led[10]:
-    id: 11
-    ip: 10.10.10.239
-    port: 5005
-    devpPlcId: ${wcs-slave.devp[1].id}
-    staArr: 217
\ No newline at end of file
+    devpPlcId: ${wcs-slave.devp[0].id}
+    staArr: 1041
\ No newline at end of file

--
Gitblit v1.9.1