From 7f1ee24bca80d28851a95ee2019ea6faeb70d81c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 29 十二月 2025 17:34:39 +0800
Subject: [PATCH] 1.新增agv状态反馈
---
src/main/resources/application.yml | 499 ++++++++++++++++++------------------------------------
1 files changed, 170 insertions(+), 329 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c000ded..917f1c4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 9093
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=lfdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jnejc-ljqwms
username: sa
password: sa@123
mvc:
@@ -34,21 +34,36 @@
enable: false
wms:
- url: localhost:8080/lfdwms
+ url: 127.0.0.1:8083/ljqwms
+
+#娴峰悍瀵规帴
+hik:
+ switch: false
+ url: http://172.26.11.98:80/rcs/rtas/
+
+zyHikUrl: 10.10.10.200:9091/hik
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 9,12,15,18
+ doubleLocs: 1
+ # 宸︽繁搴撲綅鎺掑彿
+# doubleLocsLeft: 4,7,11,15,19,23
+ # 鍙虫繁搴撲綅鎺掑彿
+ doubleLocsRight: 1
+ # 宸︽祬搴撲綅鎺掑彿
+ shallowLocsLeft: 2
+ # 鍙虫祬搴撲綅鎺掑彿
+ shallowLocsRight: 2
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 4
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1
- port: 6000
+ ip: 172.26.1.131
+ port: 102
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -57,298 +72,143 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 1
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+ staNo: 301
row: 2
- bay: 1
+ bay: 2
lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.10.10.2
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
+ staNo: 307
+ row: 1
+ bay: 16
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 304
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 4
+ staNo: 304
+ row: 3
bay: 1
lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.3
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 121
- row: 5
- bay: 1
+ staNo: 307
+ row: 1
+ bay: 16
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
+ crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 122
- row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.4
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 129
- row: 7
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 130
- row: 8
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�5
- crn[4]:
- id: 5
- ip: 10.10.10.5
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�6
- crn[5]:
- id: 6
- ip: 10.10.10.6
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 208
- row: 13
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 209
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�7
- crn[6]:
- id: 7
- ip: 10.10.10.7
- port: 6000
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 214
- row: 16
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 215
- row: 17
+ staNo: 301
+ row: 2
bay: 1
lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.100
+ ip: 172.26.1.141
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 302
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 109
+ staNo: 304
barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
+ backSta: 305
led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�3
inSta[2]:
- staNo: 117
+ staNo: 307
barcode: ${wcs-slave.barcode[2].id}
- backSta: 116
+ backSta: 307
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 302
led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 109
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[1]:
- staNo: 109
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
- pickSta[2]:
- staNo: 117
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
-
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 126
- led: ${wcs-slave.led[3].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 134
- led: ${wcs-slave.led[4].id}
- # 鍑哄簱鍙�2
- outSta[2]:
- staNo: 100
- led: ${wcs-slave.led[0].id}
-
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 10.10.10.110
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 200
- led: ${wcs-slave.led[5].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 206
- led: ${wcs-slave.led[7].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- backSta: 212
- led: ${wcs-slave.led[9].id}
# 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
- # 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[7].id}
- # 绌烘澘鍏ュ簱鍙�3
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[9].id}
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[3].id}
- led: ${wcs-slave.led[5].id}
- # 鎷ｆ枡鍏ュ簱鍙�2
+ staNo: 301
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 302
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[7].id}
- # 鎷ｆ枡鍏ュ簱鍙�3
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[9].id}
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 205
- led: ${wcs-slave.led[6].id}
- # 鍑哄簱鍙�2
+ staNo: 303
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�1
outSta[1]:
- staNo: 211
- led: ${wcs-slave.led[8].id}
- # 鍑哄簱鍙�3
+ staNo: 306
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
outSta[2]:
- staNo: 217
- led: ${wcs-slave.led[10].id}
-
+ staNo: 307
+ led: ${wcs-slave.led[2].id}
+# # 杈撻�佺嚎2
+# devp[1]:
+# id: 2
+# ip: 172.17.60.118
+# port: 102
+# rack: 0
+# slot: 0
+## # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 307
+# barcode: ${wcs-slave.barcode[1].id}
+# backSta: 307
+# led: ${wcs-slave.led[2].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
@@ -357,102 +217,83 @@
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
- ip: 10.10.10.122
+ ip: 10.10.10.121
port: 51236
- # 鏉＄爜鎵弿浠�3
+ # 鏉＄爜鎵弿浠�2
barcode[2]:
id: 3
- ip: 10.10.10.123
+ ip: 10.10.10.121
port: 51236
- # 鏉＄爜鎵弿浠�4
- barcode[3]:
- id: 4
- ip: 10.10.10.124
- port: 51236
- # 鏉＄爜鎵弿浠�5
- barcode[4]:
- id: 5
- ip: 10.10.10.125
- port: 51236
- # 鏉＄爜鎵弿浠�6
- barcode[5]:
- id: 6
- ip: 10.10.10.126
- port: 51236
+# # 鏉＄爜鎵弿浠�3
+# barcode[2]:
+# id: 3
+# ip: 10.10.10.121
+# port: 51236
+# # 鏉＄爜鎵弿浠�4
+# barcode[3]:
+# id: 4
+# ip: 10.10.10.121
+# port: 51236
# LED1
led[0]:
id: 1
- ip: 10.10.10.249
+ ip: 127.0.0.1
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
+ staArr: 302
# LED2
led[1]:
id: 2
- ip: 10.10.10.248
+ ip: 172.17.60.183
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109
- # LED3
+ staArr: 306
+# # LED3
led[2]:
id: 3
- ip: 10.10.10.247
+ ip: 172.17.60.181
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
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.244
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 201
- # LED7
- led[6]:
- id: 7
- ip: 10.10.10.243
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 205
- # LED8
- led[7]:
- id: 8
- ip: 10.10.10.242
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 207
- # LED9
- led[8]:
- id: 9
- ip: 10.10.10.241
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 211
- # LED10
- led[9]:
- id: 10
- ip: 10.10.10.240
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 213
- # LED11
- led[10]:
- id: 11
- ip: 10.10.10.239
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 217
\ No newline at end of file
+ staArr: 307
+# # LED4
+# led[3]:
+# id: 4
+# ip: 172.17.60.184
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1064
+# # LED5
+# led[4]:
+# id: 5
+# ip: 172.17.60.185
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1068
+# # LED6
+# led[5]:
+# id: 6
+# ip: 172.17.60.186
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1071
+# # LED7
+# led[6]:
+# id: 7
+# ip: 172.17.60.182
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 1074
+# # LED8
+# led[7]:
+# id: 8
+# ip: 172.17.60.187
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 1001
+# # LED9
+# led[8]:
+# id: 9
+# ip: 172.17.60.188
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 1007
\ No newline at end of file
--
Gitblit v1.9.1