From 7ec18552d3a3d1350191f85a25851beb925b7441 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 01 十一月 2024 11:39:05 +0800
Subject: [PATCH] 出库呼叫agv修改
---
src/main/resources/application.yml | 414 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 239 insertions(+), 175 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eae7162..ff09f59 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9091
+ port: 8088
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://localhost:1433;databasename=gdykasrs
+ url: jdbc:sqlserver://10.0.100.130:1433;databasename=jxgtasrs
username: sa
password: sa@123
mvc:
@@ -34,20 +34,20 @@
enable: false
wms:
- url: 127.0.0.1:8080/ykwms
+ url: 10.0.100.130:8080/wms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.200.51.180
port: 102
rack: 0
slot: 0
@@ -57,21 +57,75 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 1017
row: 2
- bay: 1
+ bay: 47
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2003
+ row: 3
+ bay: 47
+ lev: 2
+
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
+ staNo: 1029
+ row: 3
+ bay: 47
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2003
+ row: 3
+ bay: 47
+ lev: 2
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1043
row: 3
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1043
+ row: 3
+ bay: 1
+ lev: 1
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2013
+ row: 3
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2013
+ row: 3
+ bay: 1
+ lev: 2
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3013
+ row: 3
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3013
+ row: 3
+ bay: 1
+ lev: 3
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.20
+ ip: 10.200.51.189
port: 102
rack: 0
slot: 0
@@ -81,227 +135,237 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 12
- bay: 1
+ staNo: 1021
+ row: 7
+ bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 13
- bay: 1
+ staNo: 1030
+ row: 6
+ bay: 47
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.30
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
- row: 22
- bay: 1
- lev: 1
+ staNo: 2004
+ row: 6
+ bay: 47
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 23
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.40
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
+ staNo: 2004
+ row: 6
+ bay: 47
+ lev: 2
# 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
- row: 22
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1044
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 23
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1044
+ row: 6
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2014
+ row: 6
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2014
+ row: 6
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3014
+ row: 6
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3014
+ row: 6
+ bay: 1
+ lev: 3
- # 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: 10.10.10.50
+ ip: 10.200.51.47
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ staNo: 1001
+ backSta: 1000
+ led: ${wcs-slave.led[1].id}
+ inSta[1]:
+ staNo: 2001
+ backSta: 2000
led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ staNo: 1001
+ backSta: 1000
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 1025
+ backSta: 1000
+ led: ${wcs-slave.led[1].id}
+
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 2001
+ backSta: 200
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 124
+ led: ${wcs-slave.led[0].id}
+
+
+ devp[1]:
+ id: 2
+ ip: 10.200.51.10
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1041
+ backSta: 1040
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 2011
+ backSta: 2010
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�1
+ inSta[2]:
+ staNo: 3011
+ backSta: 3010
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 1041
+ backSta: 1040
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 2011
+ backSta: 2010
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 3011
+ backSta: 3010
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- backSta: 105
+ staNo: 1041
+ led: ${wcs-slave.led[5].id}
+ backSta: 1040
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 2011
+ led: ${wcs-slave.led[5].id}
+ backSta: 2010
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[2]:
+ staNo: 3011
+ led: ${wcs-slave.led[5].id}
+ backSta: 3010
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
+ staNo: 1040
led: ${wcs-slave.led[0].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
+ outSta[1]:
+ staNo: 1042
+ led: ${wcs-slave.led[3].id}
+ outSta[2]:
+ staNo: 2010
+ led: ${wcs-slave.led[3].id}
+ outSta[3]:
+ staNo: 2012
+ led: ${wcs-slave.led[3].id}
+ outSta[4]:
+ staNo: 3010
+ led: ${wcs-slave.led[3].id}
+ outSta[5]:
+ staNo: 3012
+ led: ${wcs-slave.led[3].id}
+ agvOutSta[0]:
+ staNo: 1040
+ agvOutSta[1]:
+ staNo: 1042
+ agvOutSta[2]:
+ staNo: 2010
+ agvOutSta[3]:
+ staNo: 2012
+ agvOutSta[4]:
+ staNo: 3010
+ agvOutSta[5]:
+ staNo: 3012
+ agvOutSta[6]:
+ staNo: 2000
+ agvOutSta[7]:
+ staNo: 2012
# LED1
led[0]:
id: 1
- ip: 10.10.10.249
+ ip: 10.10.10.101
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.248
+ ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 108
+ staArr: 106
# LED3
led[2]:
id: 3
- ip: 10.10.10.247
+ ip: 10.10.10.103
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 107
# LED4
led[3]:
id: 4
- ip: 10.10.10.246
+ ip: 10.10.10.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 126
+ staArr: 152
# LED5
led[4]:
id: 5
- ip: 10.10.10.245
+ ip: 10.10.10.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 134
\ No newline at end of file
+ staArr: 156
+ # LED6
+ led[5]:
+ id: 6
+ ip: 10.10.10.106
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 160,159
\ No newline at end of file
--
Gitblit v1.9.1