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 | 339 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 248 insertions(+), 91 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index de99545..b925959 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.243:1433;databasename=ghlnasrs
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghlnasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=yhfzasrs
username: sa
password: sa@123
mvc:
@@ -35,21 +34,21 @@
enable: false
wms:
- url: 10.10.10.243:8080/ghlnwms
+ url: 127.0.0.1:8080/yhfzwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ 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.1
+ ip: 192.168.5.10
port: 102
rack: 0
slot: 0
@@ -59,45 +58,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 2
+ staNo: 104
+ row: 3
bay: 1
lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 2
- bay: 1
- lev: 6
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 102
row: 2
bay: 1
lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 2
- bay: 4
- lev: 1
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 1
- bay: 28
- lev: 1
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 2
- bay: 1
- lev: 2
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.10
+ ip: 192.168.5.20
port: 102
rack: 0
slot: 0
@@ -107,118 +82,300 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 106
row: 6
bay: 1
lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
- lev: 6
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 6
+ staNo: 108
+ row: 7
bay: 1
lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
- lev: 2
- crnOutStn[2]:
+ # 鍫嗗灈鏈�3
+ crn[2]:
+ id: 3
+ 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: 28
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 108
+ row: 7
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[3]:
+ id: 4
+ 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
+ # 鍫嗗灈鏈�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
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.18
+ 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
- led: ${wcs-slave.led[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 103
+ staNo: 106
barcode: ${wcs-slave.barcode[1].id}
- backSta: 102
- led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
+ backSta: 105
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
-# emptyInSta[0]:
-# staNo: 101
-# barcode: ${wcs-slave.barcode[0].id}
-# backSta: 100
-# led: ${wcs-slave.led[0].id}
-# emptyInSta[1]:
-# staNo: 103
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 102
-# led: ${wcs-slave.led[1].id}
+ emptyInSta[0]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ 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: 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: 100
+ staNo: 101
led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 102
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 104
- led: ${wcs-slave.led[2].id}
- # 鍑哄簱鍙�4
- outSta[3]:
staNo: 107
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 305
+ 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: 192.168.5.43
+ port: 51236
+ # 鏉＄爜鎵弿浠�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.190
+ ip: 192.168.5.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101,100
-
+ staArr: 101
+ crnId: 1
# LED2
led[1]:
id: 2
- ip: 10.10.10.191
+ ip: 192.168.5.105
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102,103
+ staArr: 104
+ crnId: 1
# LED3
led[2]:
id: 3
- ip: 10.10.10.192
+ ip: 192.168.5.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104
\ No newline at end of file
+ staArr: 106
+ crnId: 2
+ # LED4
+ led[3]:
+ id: 4
+ ip: 192.168.5.107
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 107
+ crnId: 2
+ # LED5
+ led[4]:
+ id: 5
+ ip: 192.168.5.107
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ 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