From 52ad49fed7108445edc8178a98cf4cca36fe0eb0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 20 十一月 2025 19:54:33 +0800
Subject: [PATCH] agv相关接口流程修改
---
src/main/resources/application.yml | 309 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 206 insertions(+), 103 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6bd3e0b..b925959 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9091
+ port: 9090
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=gdykasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=yhfzasrs
username: sa
password: sa@123
mvc:
@@ -34,20 +34,21 @@
enable: false
wms:
- url: 127.0.0.1:8080/lktwms
+ url: 127.0.0.1:8080/yhfzwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,11,14,21,24
+ doubleLocs: 1,4,5,8,9,12,13,16,17,20,21,24,25,28,29,32
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
+
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 192.168.5.10
port: 102
rack: 0
slot: 0
@@ -56,22 +57,22 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 2
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 104
row: 3
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 102
+ row: 2
+ bay: 1
+ lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.4.250
+ ip: 192.168.5.20
port: 102
rack: 0
slot: 0
@@ -81,21 +82,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 12
+ staNo: 106
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 13
+ staNo: 108
+ row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.10
+ ip: 192.168.5.20
port: 102
rack: 0
slot: 0
@@ -105,21 +106,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
- row: 22
+ staNo: 106
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 23
+ staNo: 108
+ row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.10
+ ip: 192.168.5.20
port: 102
rack: 0
slot: 0
@@ -129,150 +130,252 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
- row: 22
+ staNo: 106
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 23
+ staNo: 108
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�5
+ crn[4]:
+ id: 5
+ ip: 192.168.5.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 106
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 108
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�6
+ crn[5]:
+ id: 6
+ ip: 192.168.5.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 106
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 108
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�7
+ crn[6]:
+ id: 7
+ ip: 192.168.5.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 106
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 108
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�8
+ crn[7]:
+ id: 8
+ ip: 192.168.5.20
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 106
+ row: 6
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 108
+ row: 7
bay: 1
lev: 1
- # RGV绌挎杞�1
- rgv[0]:
- id: 1
- ip: 192.168.4.250
- 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: 192.168.4.250
- 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: 192.168.5.40
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 103
led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 105
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 103
led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 105
+ led: ${wcs-slave.led[2].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 101
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 105
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 106
+ staNo: 101
led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 107
+ led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
- ip: 10.10.10.121
+ ip: 192.168.5.42
port: 51236
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 192.168.5.43
port: 51236
# 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
- ip: 10.10.10.123
+ ip: 192.168.5.43
port: 51236
- # LED1
+ # 鏉＄爜鎵弿浠�4
+ barcode[3]:
+ id: 4
+ ip: 192.168.5.43
+ port: 51236
+ # 鏉＄爜鎵弿浠�5
+ barcode[4]:
+ id: 5
+ ip: 192.168.5.43
+ port: 51236
+ # 鏉＄爜鎵弿浠�6
+ barcode[5]:
+ id: 6
+ ip: 192.168.5.43
+ port: 51236
+ # 鏉＄爜鎵弿浠�7
+ barcode[6]:
+ id: 7
+ ip: 192.168.5.43
+ port: 51236
+ # 鏉＄爜鎵弿浠�8
+ barcode[7]:
+ id: 8
+ ip: 192.168.5.43
+ port: 51236
+
+ # LED1
led[0]:
id: 1
- ip: 10.10.10.249
+ ip: 192.168.5.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 101
+ crnId: 1
# LED2
led[1]:
id: 2
- ip: 10.10.10.248
+ ip: 192.168.5.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 108
+ staArr: 104
+ crnId: 1
# LED3
led[2]:
id: 3
- ip: 10.10.10.247
+ ip: 192.168.5.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 106
+ crnId: 2
# LED4
led[3]:
id: 4
- ip: 10.10.10.246
+ ip: 192.168.5.107
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 126
+ staArr: 107
+ crnId: 2
# LED5
led[4]:
id: 5
- ip: 10.10.10.245
+ ip: 192.168.5.107
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 134
\ No newline at end of file
+ staArr: 107
+ crnId: 2
+ # LED6
+ led[5]:
+ id: 6
+ ip: 192.168.5.107
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 107
+ crnId: 2
\ No newline at end of file
--
Gitblit v1.9.1