From 91869e644595198cab3e8f9a364bb1a6722e148e Mon Sep 17 00:00:00 2001
From: pjb <1@qq.com>
Date: 星期二, 19 八月 2025 16:45:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 1
src/main/webapp/views/console.html | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 11 +++--
src/main/resources/application.yml | 72 ++++++++++++++++++++----------------
4 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index aa555ad..3702701 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -81,6 +81,7 @@
list.add(vo);
StaProtocol staProtocol = station.get(devp.getDevNo());
if (null == staProtocol) { continue; }
+ vo.setWorkNo(staProtocol.getWorkNo());
vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N"); // 鑷姩
vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.requestType == DevpRequestType.IN?"Y":"N"); // 鍙叆
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 96f6cde..0272ab9 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -52,14 +52,15 @@
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(1000); add(1001); add(1002); add(1003); add(1004); add(1005); add(1006); add(1007); add(1008); add(1009); add(1010);
add(1011); add(1012); add(1013); add(1014); add(1015); add(1016); add(1017); add(1018); add(1019); add(1020); add(1021);
- add(1022); add(1023); add(1024); add(1025); add(1026); add(1027); add(1028); add(1029); add(1030);
- add(2000); add(2001); add(2002); add(2003); add(2004);add(2005); add(2006); add(2007);
+ add(1022); add(1023); add(1024); add(1025); add(1026); add(1027); add(1028); add(1029); add(1030); add(1031);
+ add(1032);add(1033);add(1034);add(1035);
+ add(2000); add(2001); add(2002); add(2003); add(2004);add(2005); add(2006); add(2007); add(2008); add(2009);
// add(200);add(201);add(202);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(1040);add(1041);add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);
- add(2010);add(2011);add(2012);add(2013);add(2014);add(2015);add(2016);add(2017);
- add(3010);add(3011);add(3012);add(3013);add(3014);add(3015);add(3016);add(3017);
+ add(1040);add(1041);add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);add(1048);add(1049);
+ add(2010);add(2011);add(2012);add(2013);add(2014);add(2015);add(2016);add(2017);add(2018);add(2019);
+ add(3010);add(3011);add(3012);add(3013);add(3014);add(3015);add(3016);add(3017);add(3018);add(3019);
// add(200);add(201);add(202);
}};
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5e452aa..92fae25 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,7 +52,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
@@ -130,7 +130,7 @@
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
+ offset: 0
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
@@ -214,32 +214,43 @@
inSta[0]:
staNo: 1001
backSta: 1000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
inSta[1]:
staNo: 2001
backSta: 2000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1001
backSta: 1000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
staNo: 1025
backSta: 1000
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
staNo: 2001
- backSta: 200
- led: ${wcs-slave.led[1].id}
+ backSta: 2000
+ led: ${wcs-slave.led[5].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 124
- led: ${wcs-slave.led[0].id}
-
+ staNo: 1024
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 1028
+ led: ${wcs-slave.led[2].id}
+ agvOutSta[0]:
+ staNo: 2000
+ agvOutSta[1]:
+ staNo: 2002
+ pickSta[0]:
+ staNo: 2001
+ led: ${wcs-slave.led[5].id}
+ backSta: 2000
devp[1]:
id: 2
@@ -251,27 +262,27 @@
inSta[0]:
staNo: 1041
backSta: 1040
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 2011
backSta: 2010
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[7].id}
# 鍏ュ簱鍙�1
inSta[2]:
staNo: 3011
backSta: 3010
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[9].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 1041
backSta: 1040
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
staNo: 2011
backSta: 2010
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[7].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[2]:
staNo: 3011
@@ -285,32 +296,33 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[1]:
staNo: 2011
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[7].id}
backSta: 2010
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[2]:
staNo: 3011
- led: ${wcs-slave.led[5].id}
+ led: ${wcs-slave.led[9].id}
backSta: 3010
+
# 鍑哄簱鍙�1
outSta[0]:
staNo: 1040
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[3].id}
outSta[1]:
staNo: 1042
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[4].id}
outSta[2]:
staNo: 2010
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[7].id}
outSta[3]:
staNo: 2012
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[8].id}
outSta[4]:
staNo: 3010
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[9].id}
outSta[5]:
staNo: 3012
- led: ${wcs-slave.led[3].id}
+ led: ${wcs-slave.led[10].id}
agvOutSta[0]:
staNo: 1040
agvOutSta[1]:
@@ -323,10 +335,6 @@
staNo: 3010
agvOutSta[5]:
staNo: 3012
- agvOutSta[6]:
- staNo: 2000
- agvOutSta[7]:
- staNo: 2012
# LED1
led[0]:
id: 1
@@ -354,7 +362,7 @@
ip: 10.10.10.104
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 1040
+ staArr: 1040,1041
# LED5
led[4]:
id: 5
@@ -368,7 +376,7 @@
ip: 10.10.10.106
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 2001
+ staArr: 2001,2000
# LED6
led[6]:
id: 7
@@ -382,7 +390,7 @@
ip: 10.10.10.108
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 2011
+ staArr: 2010,2011
# LED6
led[8]:
id: 9
@@ -396,7 +404,7 @@
ip: 10.10.10.110
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 3011
+ staArr: 3010,3011
# LED6
led[10]:
id: 11
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index dcbc329..2c11293 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -608,7 +608,7 @@
case 1:
case 2:
case 3:
- unit = 35;
+ unit = 20;
offSet = 500;
break;
case 5:
--
Gitblit v1.9.1