From ffc3b1151655f258fb1db0b24c3434bd294b0598 Mon Sep 17 00:00:00 2001 From: dubin <bindu_bean@163.com> Date: 星期日, 05 十月 2025 10:35:32 +0800 Subject: [PATCH] 联调 --- src/main/resources/application.yml | 46 ++++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ea24669..d85a713 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -38,7 +38,7 @@ enable: false wms: - url: 127.0.0.1:8080/wcs + url: 127.0.0.1:8080/czkhasrs # 涓嬩綅鏈洪厤缃� wcs-slave: @@ -53,7 +53,7 @@ # 鍫嗗灈鏈�1 crn[0]: id: 1 - ip: 10.10.10.100 + ip: 192.168.7.210 port: 102 rack: 0 slot: 0 @@ -63,31 +63,31 @@ # 鍫嗗灈鏈哄叆搴撶珯鐐� crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 1105 + staNo: 1006 row: 2 bay: 11 - lev: 2 + lev: 1 # 鍫嗗灈鏈哄嚭搴撶珯鐐� crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 1101 + staNo: 1001 row: 2 bay: 14 - lev: 2 + lev: 1 # plc devp[0]: id: 1 - ip: 10.10.10.120 + ip: 192.168.7.230 port: 102 rack: 0 slot: 0 # 鍏ュ簱鍙�1 inSta[0]: - staNo: 1106 + staNo: 1006 barcode: ${wcs-slave.barcode[0].id} - backSta: 1105 + backSta: 1005 led: ${wcs-slave.led[0].id} # # 鍏ュ簱鍙�2 # inSta[1]: @@ -97,10 +97,10 @@ # led: ${wcs-slave.led[1].id} # 鎷f枡鍏ュ簱鍙�1 pickSta[0]: - staNo: 1106 + staNo: 1006 barcode: ${wcs-slave.barcode[0].id} led: ${wcs-slave.led[0].id} - backSta: 1105 + backSta: 1005 # # 鎷f枡鍏ュ簱鍙�2 # pickSta[1]: # staNo: 225 @@ -109,9 +109,9 @@ # backSta: 224 # 绌烘澘鍏ュ簱鍙�1 emptyInSta[0]: - staNo: 1106 + staNo: 1006 barcode: ${wcs-slave.barcode[0].id} - backSta: 1105 + backSta: 1005 led: ${wcs-slave.led[0].id} # 绌烘澘鍏ュ簱鍙�2 #emptyInSta[1]: @@ -121,7 +121,7 @@ #led: ${wcs-slave.led[1].id} # 鍑哄簱鍙�1 outSta[0]: - staNo: 1101 + staNo: 1001 # 鏉$爜鎵弿浠�1 barcode[0]: id: 1 @@ -130,15 +130,17 @@ # LED1 led[0]: id: 121 - ip: 10.10.10.51 + ip: 192.168.7.241 port: 5005 devpPlcId: ${wcs-slave.devp[0].id} - staArr: 1104 + staArr: 1004 + crnId: 1 # # LED2 -# led[1]: -# id: 123 -# ip: 10.10.10.52 -# port: 5005 -# devpPlcId: ${wcs-slave.devp[0].id} -# staArr: 104 + led[1]: + id: 123 + ip: 192.168.7.240 + port: 5005 + devpPlcId: ${wcs-slave.devp[0].id} + staArr: 1004 + crnId: 1 -- Gitblit v1.9.1