From 8e01a40be0a7ba61ece12870332b35a1fa3bfcd5 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 02 一月 2026 10:26:41 +0800
Subject: [PATCH] 1.新增agv状态请求离开 2.修复无法自动生成移库任务
---
src/main/resources/application.yml | 157 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 114 insertions(+), 43 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1b6f999..7e9fa0b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,20 +34,34 @@
enable: false
wms:
- url: 127.0.0.1:8080/wms
+ url: 127.0.0.1:8083/ljqwms
+
+#mes瀵规帴
+mes:
+
+ url: http://192.9.100.173:8088/prod-api/basicmodel/WmsFit/Api/
+ #榛樿鎺ュ彛鎿嶄綔浜哄憳id
+ defaultUserId: 30
+
+#娴峰悍瀵规帴
+hik:
+ switch: false
+ url: http://172.26.11.98:80/rcs/rtas/
+
+zyHikUrl: 10.10.10.200:9091/hik
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 3
+ doubleLocs: 1
# 宸︽繁搴撲綅鎺掑彿
# doubleLocsLeft: 4,7,11,15,19,23
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 3
+ doubleLocsRight: 1
# 宸︽祬搴撲綅鎺掑彿
- shallowLocsLeft: 1
+ shallowLocsLeft: 2
# 鍙虫祬搴撲綅鎺掑彿
shallowLocsRight: 2
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
@@ -71,24 +85,38 @@
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
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: 304
- row: 1
- bay: 2
+ row: 3
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 307
row: 1
bay: 16
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 301
+ row: 2
+ bay: 1
lev: 1
# 杈撻�佺嚎1
devp[0]:
@@ -99,57 +127,95 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 302
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 302
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 1076
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 1075
-# led: ${wcs-slave.led[1].id}
+ inSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 302
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 302
led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 302
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
- backSta: 303
+ backSta: 302
led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 304
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 305
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[2]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
+ staNo: 303
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
staNo: 306
led: ${wcs-slave.led[1].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 172.17.60.118
- port: 102
- rack: 0
- slot: 0
-# # 鍏ュ簱鍙�1
- inSta[0]:
+ # 鍑哄簱鍙�1
+ outSta[2]:
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}
+# # 杈撻�佺嚎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
@@ -158,6 +224,11 @@
# 鏉＄爜鎵弿浠�2
barcode[1]:
id: 2
+ ip: 10.10.10.121
+ port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[2]:
+ id: 3
ip: 10.10.10.121
port: 51236
# # 鏉＄爜鎵弿浠�3
@@ -189,7 +260,7 @@
id: 3
ip: 172.17.60.181
port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staArr: 307
# # LED4
# led[3]:
--
Gitblit v1.9.1