From ba1c668970f02bcad86561a69aca62490ae8fa33 Mon Sep 17 00:00:00 2001 From: lfdMem <1> Date: 星期一, 28 四月 2025 15:32:49 +0800 Subject: [PATCH] * --- src/main/resources/application.yml | 172 ++++++++++----------------------------------------------- 1 files changed, 31 insertions(+), 141 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3250e87..99628ad 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://localhost:1433;databasename=hylyasrs +# url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrsMem + url: jdbc:sqlserver://192.168.0.17:1433;databasename=lfdasrsMem username: sa password: sa@123 mvc: @@ -34,21 +35,21 @@ enable: false wms: - url: localhost:8081/lywms + url: 127.0.0.1:8080/wms # 涓嬩綅鏈洪厤缃� wcs-slave: # 鍙屾繁 doubleDeep: true # 鍙屾繁搴撲綅鎺掑彿 - doubleLocs: 1,4,5,8,9,12,13,16 + doubleLocs: 31,34 # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� groupCount: 4 # 鍫嗗灈鏈�1 crn[0]: id: 1 - ip: 10.10.10.101 - port: 102 + ip: 10.10.11.7 + port: 6000 rack: 0 slot: 0 # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 @@ -57,167 +58,56 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 103 - row: 3 + staNo: 102 + row: 33 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 101 - row: 2 + staNo: 102 + row: 33 bay: 1 lev: 1 - # 鍫嗗灈鏈�2 - crn[1]: - id: 2 - ip: 10.10.10.111 - port: 102 - rack: 0 - slot: 0 - # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - offset: 2 - demo: false - # 鍫嗗灈鏈哄叆搴撶珯鐐� - crnInStn[0]: - devpPlcId: ${wcs-slave.devp[0].id} - staNo: 203 - row: 7 - bay: 1 - lev: 1 - # 鍫嗗灈鏈哄嚭搴撶珯鐐� - crnOutStn[0]: - devpPlcId: ${wcs-slave.devp[0].id} - staNo: 201 - row: 6 - bay: 1 - lev: 1 - # 鍫嗗灈鏈�3 - crn[2]: - id: 3 - ip: 10.10.10.121 - port: 102 - rack: 0 - slot: 0 - # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 - offset: 2 - demo: false - # 鍫嗗灈鏈哄叆搴撶珯鐐� - crnInStn[0]: - devpPlcId: ${wcs-slave.devp[0].id} - staNo: 304 - row: 11 - bay: 1 - lev: 1 - # 鍫嗗灈鏈哄嚭搴撶珯鐐� - crnOutStn[0]: - devpPlcId: ${wcs-slave.devp[0].id} - staNo: 301 - row: 10 - bay: 1 - lev: 1 - - # 杈撻�佺嚎 + # 杈撻�佺嚎1 devp[0]: id: 1 - ip: 10.10.10.50 + ip: 10.10.11.10 port: 102 rack: 0 slot: 0 # 鍏ュ簱鍙�1 inSta[0]: - staNo: 103 + staNo: 102 barcode: ${wcs-slave.barcode[0].id} - # 鍏ュ簱鍙�2 - inSta[1]: - staNo: 203 - barcode: ${wcs-slave.barcode[1].id} - # 鍏ュ簱鍙�3 - inSta[2]: - staNo: 305 - barcode: ${wcs-slave.barcode[2].id} + backSta: 101 + led: ${wcs-slave.led[0].id} # 绌烘澘鍏ュ簱鍙�1 emptyInSta[0]: - staNo: 103 - # 绌烘澘鍏ュ簱鍙�2 - emptyInSta[1]: - staNo: 203 - # 绌烘澘鍏ュ簱鍙�3 - emptyInSta[2]: - staNo: 305 + staNo: 102 + barcode: ${wcs-slave.barcode[0].id} + backSta: 101 + led: ${wcs-slave.led[0].id} + # 鎷f枡鍏ュ簱鍙�1 + pickSta[0]: + staNo: 102 + barcode: ${wcs-slave.barcode[0].id} + backSta: 101 + led: ${wcs-slave.led[0].id} + # 鍑哄簱鍙�1 outSta[0]: staNo: 102 - # 鍑哄簱鍙�2 - outSta[1]: - staNo: 202 - # 鍑哄簱鍙�3 - outSta[2]: - staNo: 303 - # 鎷f枡鍏ュ簱鍙�1 - pickSta[0]: - staNo: 103 - barcode: ${wcs-slave.barcode[0].id} - # 鎷f枡鍏ュ簱鍙�2 - pickSta[1]: - staNo: 203 - barcode: ${wcs-slave.barcode[1].id} - # 鎷f枡鍏ュ簱鍙�3 - pickSta[2]: - staNo: 303 - barcode: ${wcs-slave.barcode[2].id} - # 鏉$爜鎵弿浠� + led: ${wcs-slave.led[0].id} + # 鏉$爜鎵弿浠�1 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 + ip: 10.10.10.121 port: 51236 # LED1 led[0]: id: 1 - ip: 10.10.10.201 + ip: 10.10.11.210 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} - staArr: 110 - # LED2 - led[1]: - id: 2 - ip: 10.10.10.202 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 117 - # LED3 - led[2]: - id: 3 - ip: 10.10.10.203 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 124 - # LED4 - led[3]: - id: 4 - ip: 10.10.10.204 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 131 - # LED5 - led[4]: - id: 5 - ip: 10.10.10.205 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 136 - # LED6 - led[5]: - id: 5 - ip: 10.10.10.206 - port: 5005 - devpPlcId: ${wcs-slave.devp[0].id} - staArr: 136 \ No newline at end of file + staArr: 102 \ No newline at end of file -- Gitblit v1.9.1