From 69d413866c7f646cc74a23d99e33787bbe53b96a Mon Sep 17 00:00:00 2001
From: pjb <1@qq.com>
Date: 星期二, 04 十一月 2025 08:23:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2
src/main/java/com/zy/common/constant/AgvSiteConstant.java | 60 +++++++++++++++++++
src/main/resources/application.yml | 82 ++++++++++++++++++++++++--
3 files changed, 135 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3bb0665..f05621a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2124,6 +2124,8 @@
sourceSite = "c";
} else if(staNo == 2000 || staNo ==2002) {
sourceSite = "d";
+ }else if (staNo == 1028){
+ sourceSite = "f";
}
List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList(
//璧峰浣�
diff --git a/src/main/java/com/zy/common/constant/AgvSiteConstant.java b/src/main/java/com/zy/common/constant/AgvSiteConstant.java
index cc02b17..4bbf4f1 100644
--- a/src/main/java/com/zy/common/constant/AgvSiteConstant.java
+++ b/src/main/java/com/zy/common/constant/AgvSiteConstant.java
@@ -207,7 +207,6 @@
put("d75","840075RB501013");
put("d76","840076RB501013");
put("d77","840077EE501013");
- put("1028","900003YB501013");
put("d78","840078EE501013");
put("d79","840079EE501013");
put("d80","840080EE501013");
@@ -218,6 +217,65 @@
put("d85","840085EE501013");
+ put("e1","300000EE501013");
+ put("e2","300001EE501013");
+ put("e3","300002EE501013");
+ put("e4","300003EE501013");
+ put("e5","300004EE501013");
+ put("e6","300005EE501013");
+ put("e7","300006EE501013");
+ put("e8","300007EE501013");
+ put("e9","300008EE501013");
+ put("e10","300009EE501013");
+ put("e11","300010EE501013");
+ put("e12","300011EE501013");
+ put("e13","300012EE501013");
+ put("e14","300013EE501013");
+ put("e15","300014EE501013");
+ put("e16","300015EE501013");
+ put("e17","300016EE501013");
+ put("e18","300017EE501013");
+ put("e19","300018EE501013");
+ put("e20","300019EE501013");
+ put("e21","300020EE501013");
+ put("e22","300021EE501013");
+ put("e23","300022EE501013");
+ put("e24","300023EE501013");
+ put("e25","300024EE501013");
+ put("e26","300025EE501013");
+ put("e27","300026EE501013");
+ put("e28","300027EE501013");
+ put("e29","300028EE501013");
+ put("e30","300029EE501013");
+ put("e31","300030EE501013");
+ put("e32","300031EE501013");
+ put("e33","300032EE501013");
+ put("e34","300033EE501013");
+ put("e35","300034EE501013");
+ put("e36","300035EE501013");
+ put("e37","300036EE501013");
+ put("e38","300037EE501013");
+ put("e39","300038EE501013");
+ put("e40","300039EE501013");
+ put("e41","300040EE501013");
+ put("e42","300041EE501013");
+ put("e43","300042EE501013");
+ put("e44","300043EE501013");
+ put("e45","300044EE501013");
+ put("e46","300045EE501013");
+ put("e47","300046EE501013");
+ put("1000","900002EB501013");
+ put("1028","900003YB501013");
+ put("1035","900001EB501013");
+
+
+
+ put("a54","700053EB501013");
+ put("a55","700054EB501013");
+ put("a56","700055EB501013");
+ put("a57","700056EB501013");
+ put("a58","700057EB501013");
+
}};
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index af1bf10..5104d26 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,7 +41,7 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8
+ doubleLocs: 1,4,5,8,9,12
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -205,7 +205,7 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.200.51.189
+ ip: 10.200.51.200
port: 102
rack: 0
slot: 0
@@ -214,32 +214,74 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1033
row: 11
bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 1031
row: 10
bay: 47
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 2008
row: 11
bay: 47
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
+ devpPlcId: ${wcs-slave.devp[0].id}
staNo: 2008
- row: 10
+ row: 11
bay: 47
lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1048
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 1048
+ row: 11
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2018
+ row: 11
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 2018
+ row: 11
+ bay: 1
+ lev: 2
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3018
+ row: 11
+ bay: 1
+ lev: 3
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[4]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3018
+ row: 11
+ bay: 1
+ lev: 3
# 杈撻�佺嚎1
devp[0]:
id: 1
@@ -256,6 +298,10 @@
staNo: 2001
backSta: 2000
led: ${wcs-slave.led[5].id}
+ inSta[2]:
+ staNo: 1002
+ backSta: 1035
+ led: ${wcs-slave.led[11].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1001
@@ -272,6 +318,11 @@
staNo: 2001
backSta: 2000
led: ${wcs-slave.led[5].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[3]:
+ staNo: 1002
+ backSta: 1035
+ led: ${wcs-slave.led[11].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 1024
@@ -290,6 +341,14 @@
staNo: 2001
led: ${wcs-slave.led[5].id}
backSta: 2000
+ pickSta[1]:
+ staNo: 1001
+ led: ${wcs-slave.led[0].id}
+ backSta: 1000
+ pickSta[2]:
+ staNo: 1002
+ led: ${wcs-slave.led[11].id}
+ backSta: 1035
devp[1]:
id: 2
@@ -450,4 +509,11 @@
ip: 10.10.10.111
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 3012
\ No newline at end of file
+ staArr: 3012
+ # LED6
+ led[11]:
+ id: 12
+ ip: 10.10.10.111
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1002
\ No newline at end of file
--
Gitblit v1.9.1