From 16e508d2b0d38d2d063ab3767adc79d2d96c0dd9 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 13 一月 2024 16:10:49 +0800 Subject: [PATCH] # --- src/main/resources/application.yml | 198 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 161 insertions(+), 37 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9dc6cb8..eae7162 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 9090 + port: 9091 servlet: context-path: /@pom.build.finalName@ @@ -8,7 +8,7 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.4.15:1433;databasename=stasrs + url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs username: sa password: sa@123 mvc: @@ -34,7 +34,7 @@ enable: false wms: - url: localhost:8080/stwms + url: 127.0.0.1:8080/ykwms # 涓嬩綅鏈洪厤缃� wcs-slave: @@ -47,7 +47,7 @@ # 鍫嗗灈鏈�1 crn[0]: id: 1 - ip: 10.10.10.101 + ip: 10.10.10.10 port: 102 rack: 0 slot: 0 @@ -57,21 +57,21 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 001 + staNo: 103 row: 2 bay: 1 lev: 1 - # 鍫嗗灈鏈哄叆搴撶珯鐐� - crnInStn[1]: + # 鍫嗗灈鏈哄嚭搴撶珯鐐� + crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 002 + staNo: 104 row: 3 bay: 1 lev: 1 # 鍫嗗灈鏈�2 crn[1]: id: 2 - ip: 10.10.10.111 + ip: 10.10.10.20 port: 102 rack: 0 slot: 0 @@ -81,21 +81,21 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 003 - row: 6 + staNo: 203 + row: 12 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 004 - row: 7 + staNo: 204 + row: 13 bay: 1 lev: 1 # 鍫嗗灈鏈�3 crn[2]: id: 3 - ip: 10.10.10.121 + ip: 10.10.10.30 port: 102 rack: 0 slot: 0 @@ -105,21 +105,21 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 005 - row: 10 + staNo: 303 + row: 22 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 006 - row: 11 + staNo: 304 + row: 23 bay: 1 lev: 1 # 鍫嗗灈鏈�4 crn[3]: id: 4 - ip: 10.10.10.121 + ip: 10.10.10.40 port: 102 rack: 0 slot: 0 @@ -129,55 +129,179 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 007 - row: 14 + staNo: 303 + row: 22 bay: 1 lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 008 - row: 15 + staNo: 304 + row: 23 bay: 1 lev: 1 - # 杈撻�佺嚎 + + # RGV绌挎杞�1 + rgv[0]: + id: 1 + ip: 10.10.10.60 + port: 502 + rack: 0 + slot: 0 + #RGV鍏ュ簱婧愮珯鐐� + rgvInSStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 100 + rgvInSStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 101 + #RGV鍑哄簱婧愮珯鐐� + rgvOutSStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 110 + rgvOutSStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 112 + #RGV鐩爣绔欑偣 + rgvDestStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 102 + rgvDestStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 103 + # RGV绌挎杞�2 + rgv[1]: + id: 2 + ip: 10.10.10.63 + port: 502 + rack: 0 + slot: 0 + #RGV鍏ュ簱婧愮珯鐐� + rgvInSStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 100 + rgvInSStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 101 + #RGV鍑哄簱婧愮珯鐐� + rgvOutSStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 110 + rgvOutSStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 112 + #RGV鐩爣绔欑偣 + rgvDestStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 102 + rgvDestStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 103 + # RGV绌挎杞�2 + rgv[2]: + id: 3 + ip: 10.10.10.66 + port: 502 + rack: 0 + slot: 0 + #RGV鍏ュ簱婧愮珯鐐� + rgvInSStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 100 + rgvInSStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 101 + #RGV鍑哄簱婧愮珯鐐� + rgvOutSStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 110 + rgvOutSStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 112 + #RGV鐩爣绔欑偣 + rgvDestStn[0]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 102 + rgvDestStn[1]: + devpPlcId: ${wcs-slave.devp[0].id} + staNo: 103 + # 杈撻�佺嚎1 devp[0]: id: 1 - ip: 192.168.4.250 + ip: 10.10.10.50 port: 102 rack: 0 slot: 0 # 鍏ュ簱鍙�1 inSta[0]: - staNo: 015 + staNo: 106 barcode: ${wcs-slave.barcode[0].id} + backSta: 105 + led: ${wcs-slave.led[1].id} # 绌烘澘鍏ュ簱鍙�1 emptyInSta[0]: - staNo: 012 - # 鍑哄簱鍙�1 - outSta[0]: - staNo: 011 + staNo: 106 + barcode: ${wcs-slave.barcode[0].id} + backSta: 105 + led: ${wcs-slave.led[1].id} # 鎷f枡鍏ュ簱鍙�1 pickSta[0]: - staNo: 011 + staNo: 106 barcode: ${wcs-slave.barcode[0].id} + led: ${wcs-slave.led[1].id} + backSta: 105 + # 鍑哄簱鍙�1 + outSta[0]: + staNo: 100 + led: ${wcs-slave.led[0].id} - # 鏉$爜鎵弿浠� + # 鏉$爜鎵弿浠�1 barcode[0]: id: 1 - ip: 10.10.10.52 + 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 # LED1 led[0]: id: 1 - ip: 10.10.10.201 + ip: 10.10.10.249 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} - staArr: 015 + staArr: 101 # LED2 led[1]: id: 2 - ip: 10.10.10.202 + ip: 10.10.10.248 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} - staArr: 011 \ No newline at end of file + 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 \ No newline at end of file -- Gitblit v1.9.1