From 193858eb60a59f57c28dc5fb81ba693ad91b7ce3 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 26 二月 2025 15:18:00 +0800 Subject: [PATCH] * --- src/main/resources/application.yml | 365 +-------------------------------------------------- 1 files changed, 13 insertions(+), 352 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b392c89..28b3051 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,7 +8,8 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrs +# url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrs + url: jdbc:sqlserver://127.0.0.1:50948;databasename=lfdasrs username: sa password: sa@123 mvc: @@ -41,7 +42,7 @@ # 鍙屾繁 doubleDeep: true # 鍙屾繁搴撲綅鎺掑彿 - doubleLocs: 9,12,15,18 + doubleLocs: 31,34 # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� groupCount: 4 # 鍫嗗灈鏈�1 @@ -57,159 +58,15 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 105 - row: 1 + staNo: 102 + row: 33 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 + staNo: 102 + row: 33 bay: 1 lev: 1 # 杈撻�佺嚎1 @@ -221,156 +78,30 @@ slot: 0 # 鍏ュ簱鍙�1 inSta[0]: - staNo: 101 + staNo: 102 barcode: ${wcs-slave.barcode[0].id} - backSta: 100 + backSta: 101 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 + staNo: 102 barcode: ${wcs-slave.barcode[0].id} - backSta: 100 + backSta: 101 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 + staNo: 102 led: ${wcs-slave.led[0].id} - # 鍑哄簱鍙�2 - outSta[3]: - staNo: 108 - led: ${wcs-slave.led[1].id} - - # 杈撻�佺嚎2 - devp[1]: - id: 2 - ip: 10.10.10.110 - port: 102 - rack: 0 - slot: 0 - # 鍏ュ簱鍙�1 - inSta[0]: - staNo: 201 - barcode: ${wcs-slave.barcode[3].id} - backSta: 200 - led: ${wcs-slave.led[5].id} - # 鍏ュ簱鍙�2 - 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} - # 绌烘澘鍏ュ簱鍙�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} - # 鎷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} - # 鍑哄簱鍙�1 - outSta[0]: - staNo: 205 - led: ${wcs-slave.led[6].id} - # 鍑哄簱鍙�2 - outSta[1]: - staNo: 211 - led: ${wcs-slave.led[8].id} - # 鍑哄簱鍙�3 - outSta[2]: - staNo: 217 - led: ${wcs-slave.led[10].id} - # 鏉$爜鎵弿浠�1 barcode[0]: id: 1 ip: 10.10.10.121 - port: 51236 - # 鏉$爜鎵弿浠�2 - barcode[1]: - id: 2 - ip: 10.10.10.122 - port: 51236 - # 鏉$爜鎵弿浠�3 - barcode[2]: - id: 3 - ip: 10.10.10.123 - port: 51236 - # 鏉$爜鎵弿浠�4 - barcode[3]: - id: 4 - ip: 10.10.10.124 - port: 51236 - # 鏉$爜鎵弿浠�5 - barcode[4]: - id: 5 - ip: 10.10.10.125 - port: 51236 - # 鏉$爜鎵弿浠�6 - barcode[5]: - id: 6 - ip: 10.10.10.126 port: 51236 # LED1 led[0]: @@ -378,74 +109,4 @@ ip: 10.10.10.249 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} - staArr: 101 - # LED2 - led[1]: - id: 2 - ip: 10.10.10.248 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 108 - # LED3 - led[2]: - id: 3 - ip: 10.10.10.247 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 117 - # LED4 - led[3]: - id: 4 - ip: 10.10.10.246 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 126 - # LED5 - led[4]: - id: 5 - ip: 10.10.10.245 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 134 - # LED6 - led[5]: - id: 6 - ip: 10.10.10.244 - port: 5005 - devpPlcId: ${wcs-slave.devp[1].id} - staArr: 201 - # LED7 - led[6]: - id: 7 - ip: 10.10.10.243 - port: 5005 - devpPlcId: ${wcs-slave.devp[1].id} - staArr: 205 - # LED8 - led[7]: - id: 8 - ip: 10.10.10.242 - 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 + staArr: 101 \ No newline at end of file -- Gitblit v1.9.1