From 619b2e06d034769364ceab0b6a23588a3da98dcb Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期一, 08 十二月 2025 10:02:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/CrnTaskModeType.java | 6
src/main/java/com/zy/core/thread/RgvThread.java | 4
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4
src/main/java/com/zy/common/config/AdminInterceptor.java | 2
src/main/webapp/static/js/console.map.js | 654 ++++++++-----------------------
src/main/resources/application.yml | 520 ++++++++++---------------
6 files changed, 390 insertions(+), 800 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 39aec0b..cd48e57 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1119,7 +1119,7 @@
}
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
- if (crnProtocol.getTaskNo() == 32222) {
+ if (crnProtocol.getTaskNo() == 32222 || crnProtocol.getTaskNo() == 999) {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
} else {
@@ -1202,7 +1202,7 @@
crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
crnCommand.setTaskNo((short)999); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
- crnCommand.setTaskMode(CrnTaskModeType.X_MOVE); // 浠诲姟妯″紡: 绔欎綅绉昏浆4
+ crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡: 绔欎綅绉昏浆4
crnCommand.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
crnCommand.setSourcePosY((short) 1); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index ac45067..cd7bdef 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -51,7 +51,7 @@
if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
// System.out.println("鉁� 鏀捐 OPTIONS 棰勬璇锋眰");
// 鎵嬪姩璁剧疆 CORS 澶�
- response.setHeader("Access-Control-Allow-Origin", "http://127.0.0.1:8080");
+ response.setHeader("Access-Control-Allow-Origin", "http://10.10.10.250:8080");
response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
response.setHeader("Access-Control-Allow-Headers", "Content-Type, Access-Token, token");
response.setHeader("Access-Control-Allow-Credentials", "true");
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index be4761d..3a5a80f 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -6,10 +6,10 @@
PAKIN(1), // 鍏ュ簱
PAKOUT(2), // 鍑哄簱
LOC_MOVE(3), // 搴撲綅绉昏浆
- X_MOVE(4), // 绔欎綅绉昏浆
- Y_MOVE(5), // 绔欎綅绉昏浆
+// X_MOVE(4), // 绔欎綅绉昏浆
+// Y_MOVE(5), // 绔欎綅绉昏浆
XY_MOVE(6), // 绔欎綅绉昏浆
- GO_ORIGIN(7), // 鍥炲師鐐�
+ GO_ORIGIN(5), // 鍥炲師鐐�
BACK_ORIGIN(8), // 鍥炲弽鍘熺偣
CLEAR(9), // 娓呴敊
;
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index caea4ec..f1c5e9a 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -48,11 +48,11 @@
// private RgvProtocol rgvProtocol;
private TaskProtocolCache taskProtocolCache = new TaskProtocolCache();
// # 杞ㄩ亾鎬婚暱
- private Long trackEntireLength = 224000L;
+ private Long trackEntireLength = 246600L;
//# 杞ㄩ亾鍩哄噯鐐�
private Long trackBenchmark = 1L;
// # 閬胯璺濈
- private Long avoidDistance = 5000L;
+ private Long avoidDistance = 7000L;
private String errorRgv = "-";
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2895ce2..e70d52a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,12 +9,12 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://localhost:1433;databasename=zzgtasrs
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=zzgtasrs
-# username: sa
-# password: sa@123
- url: jdbc:sqlserver://192.168.4.191:50948;databasename=zzgtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=zzgtasrs
username: sa
password: sa@123
+# url: jdbc:sqlserver://192.168.4.191:50948;databasename=zzgtasrs
+# username: sa
+# password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -39,7 +39,7 @@
wms:
rgvOpen: false
- url: 127.0.0.1:8081/zzgtasrs
+ url: 127.0.0.1:8080/zzgtasrs
comb: mobile/combAuto/wcs/auth
#License鐩稿叧閰嶇疆
@@ -53,13 +53,13 @@
constant-parameters:
# 杞ㄩ亾鎬婚暱
- trackEntireLength: 224000
+ trackEntireLength: 246600
# 杞ㄩ亾鍩哄噯鐐�
trackBenchmark: 1
# 杞ㄩ亾杞崲涓虹背姣斾緥
trackProportion: 10000
# 閬胯璺濈
- avoidDistance: 4000
+ avoidDistance: 6000
inventory:
number: 7
@@ -84,22 +84,22 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1001
+ staNo: 101
row: 2
- bay: 52
+ bay: 1
lev: 1
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2004
+ staNo: 1031
row: 3
- bay: 52
+ bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1005
+ staNo: 103
row: 3
- bay: 52
+ bay: 1
lev: 1
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
@@ -110,7 +110,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.110
+ ip: 10.10.10.120
port: 102
rack: 0
slot: 0
@@ -146,7 +146,7 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.120
+ ip: 10.10.10.140
port: 102
rack: 0
slot: 0
@@ -195,7 +195,7 @@
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.130
+ ip: 10.10.10.160
port: 102
rack: 0
slot: 0
@@ -228,462 +228,352 @@
row: 14
bay: 52
lev: 2
- # 鍫嗗灈鏈�4
- crn[4]:
- id: 5
- ip: 10.10.10.140
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1032
- row: 19
- bay: 52
- lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2028
- row: 19
- bay: 52
- lev: 2
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1029
- row: 18
- bay: 52
- lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 2025
- row: 18
- bay: 52
- lev: 2
# RGV绌挎杞�1
rgv[1]:
id: 2
- ip: 27.172.2.70
+ ip: 10.10.10.176
port: 502
rack: 0
slot: 0
otherId: 1
- carBodyJiaoMing: 2800
- carBodyKunPeng: 13500
+ carBodyJiaoMing: 13500
+ carBodyKunPeng: 2800
#RGV婧愮珯鐐�
rgvInSta[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1004
- #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: true
- staNoOther: 1005
+ staNo: 117
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶�===> 鍚� 鍓峵rue鍚巉alse锛� true:宸� false:鍙�
+ direction: false
+ staNoOther: 117
directionOther: false
rgvInSta[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1014
+ staNo: 120
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: true
- staNoOther: 1016
- directionOther: true
+ direction: false
+ staNoOther: 120
+ directionOther: false
rgvInSta[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1020
+ staNo: 123
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
direction: true
- staNoOther: 1021
+ staNoOther: 123
directionOther: false
rgvInSta[3]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1003
+ staNo: 104
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1003
+ direction: true
+ staNoOther: 104
directionOther: false
rgvInSta[4]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1007
+ staNo: 108
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1007
+ direction: true
+ staNoOther: 108
directionOther: false
rgvInSta[5]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1013
+ staNo: 112
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1013
+ direction: true
+ staNoOther: 112
directionOther: false
rgvInSta[6]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1018
+ staNo: 114
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1018
- directionOther: false
- rgvInSta[7]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1019
- #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1019
+ direction: true
+ staNoOther: 114
directionOther: false
#RGV鐩爣绔欑偣
rgvOutSta[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1002
- direction: true
- staNoOther: 1002
+ staNo: 117
+ direction: false
+ staNoOther: 117
directionOther: false
rgvOutSta[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1009
+ staNo: 120
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: true
- staNoOther: 1009
+ direction: false
+ staNoOther: 120
directionOther: false
rgvOutSta[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1001
+ staNo: 123
direction: false
- staNoOther: 1001
+ staNoOther: 123
directionOther: false
rgvOutSta[3]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1006
- direction: false
- staNoOther: 1006
+ staNo: 102
+ direction: true
+ staNoOther: 102
directionOther: false
rgvOutSta[4]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1008
- direction: false
- staNoOther: 1008
+ staNo: 106
+ direction: true
+ staNoOther: 106
directionOther: false
rgvOutSta[5]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1017
- direction: false
- staNoOther: 1017
+ staNo: 110
+ direction: true
+ staNoOther: 110
directionOther: false
rgvSuperSta[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1001
- direction: false
- staNoOther: 1001
- directionOther: false
- rgvSuperSta[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1002
- direction: false
- staNoOther: 1002
+ staNo: 102
+ direction: true
+ staNoOther: 102
directionOther: false
# RGV绌挎杞�2
rgv[0]:
id: 1
- ip: 27.172.2.71
+ ip: 10.10.10.178
port: 502
rack: 0
slot: 0
otherId: 2
- carBodyJiaoMing: 2800
- carBodyKunPeng: 13500
+ carBodyJiaoMing: 13500
+ carBodyKunPeng: 2800
#RGV婧愮珯鐐�
rgvInSta[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1004
- direction: true
- staNoOther: 1005
+ staNo: 117
+ #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶�===> 鍚� 鍓峵rue鍚巉alse锛� true:宸� false:鍙�
+ direction: false
+ staNoOther: 117
directionOther: false
rgvInSta[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1014
+ staNo: 120
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: true
- staNoOther: 1016
- directionOther: true
+ direction: false
+ staNoOther: 120
+ directionOther: false
rgvInSta[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1020
+ staNo: 123
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
direction: true
- staNoOther: 1021
+ staNoOther: 123
directionOther: false
rgvInSta[3]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1003
+ staNo: 104
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1003
+ direction: true
+ staNoOther: 104
directionOther: false
rgvInSta[4]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1007
+ staNo: 108
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1007
+ direction: true
+ staNoOther: 108
directionOther: false
rgvInSta[5]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1013
+ staNo: 112
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1013
+ direction: true
+ staNoOther: 112
directionOther: false
rgvInSta[6]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1018
+ staNo: 114
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1018
- directionOther: false
- rgvInSta[7]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1019
- #鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: false
- staNoOther: 1019
+ direction: true
+ staNoOther: 114
directionOther: false
#RGV鐩爣绔欑偣
rgvOutSta[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1023
- direction: true
- staNoOther: 1023
+ staNo: 117
+ direction: false
+ staNoOther: 117
directionOther: false
rgvOutSta[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1009
+ staNo: 120
#鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
- direction: true
- staNoOther: 1009
+ direction: false
+ staNoOther: 120
directionOther: false
rgvOutSta[2]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1022
+ staNo: 123
direction: false
- staNoOther: 1022
+ staNoOther: 123
directionOther: false
rgvOutSta[3]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1006
- direction: false
- staNoOther: 1006
+ staNo: 116
+ direction: true
+ staNoOther: 116
directionOther: false
rgvOutSta[4]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1008
- direction: false
- staNoOther: 1008
+ staNo: 106
+ direction: true
+ staNoOther: 106
directionOther: false
rgvOutSta[5]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1017
- direction: false
- staNoOther: 1017
+ staNo: 110
+ direction: true
+ staNoOther: 110
directionOther: false
rgvSuperSta[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1023
- direction: false
- staNoOther: 1023
- directionOther: false
- rgvSuperSta[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1022
- direction: false
- staNoOther: 1022
+ staNo: 116
+ direction: true
+ staNoOther: 116
directionOther: false
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.51
+ ip: 10.10.10.170
port: 102
rack: 0
slot: 0
- # 鐮佸灈浣�
- armSta[0]:
- staNo: 1098
- armNo: 1
- sortingLine: 8
- staNoEnd: 1103
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鐮佸灈浣�
- armSta[1]:
- staNo: 1093
- armNo: 1
- sortingLine: 7
- staNoEnd: 1093
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鐮佸灈浣�
- armSta[2]:
- staNo: 1087
- armNo: 2
- sortingLine: 6
- staNoEnd: 1087
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鐮佸灈浣�
- armSta[3]:
- staNo: 1082
- armNo: 2
- sortingLine: 5
- staNoEnd: 1082
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鐮佸灈浣�
- armSta[4]:
- staNo: 1074
- armNo: 3
- sortingLine: 4
- staNoEnd: 1074
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鐮佸灈浣�
- armSta[5]:
- staNo: 1071
- armNo: 3
- sortingLine: 3
- staNoEnd: 1071
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鐮佸灈浣�
- armSta[6]:
- staNo: 1061
- armNo: 4
- sortingLine: 2
- staNoEnd: 1061
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
- # 鐮佸灈浣�
- armSta[7]:
- staNo: 1058
- armNo: 4
- sortingLine: 1
- staNoEnd: 1058
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 1047
+ staNo: 118
barcode: ${wcs-slave.barcode[1].id}
- backSta: 1041
+ backSta: 119
led: ${wcs-slave.led[1].id}
inSta[1]:
- staNo: 1036
+ staNo: 121
barcode: ${wcs-slave.barcode[0].id}
- backSta: 1037
+ backSta: 122
+ led: ${wcs-slave.led[1].id}
+ inSta[2]:
+ staNo: 124
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 125
led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 1038
+ staNo: 118
barcode: ${wcs-slave.barcode[0].id}
- backSta: 1038
+ backSta: 119
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 121
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 122
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 124
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 125
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 1036
+ staNo: 118
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[5].id}
- backSta: 1037
- # 鍏ュ簱鍙�1
- inSta[2]:
- staNo: 1103
+ backSta: 119
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 121
barcode: ${wcs-slave.barcode[2].id}
- backSta: 1041
- led: ${wcs-slave.led[2].id}
-# inSta[2]:
-# staNo: 159
-# barcode: ${wcs-slave.barcode[2].id}
-# barcodeMat: ${wcs-slave.barcode[5].id}
-# backSta: 160
-# led: ${wcs-slave.led[5].id}
-
+ led: ${wcs-slave.led[5].id}
+ backSta: 122
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[2]:
+ staNo: 124
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 125
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 1041
+ staNo: 119
led: ${wcs-slave.led[0].id}
-
- outStaAgvFull[0]:
- staNo: 1041
+ outSta[1]:
+ staNo: 122
led: ${wcs-slave.led[0].id}
-
-
+ outSta[2]:
+ staNo: 125
+ led: ${wcs-slave.led[0].id}
# 杈撻�佺嚎1
devp[1]:
id: 2
- ip: 10.10.10.71
+ ip: 10.10.10.182
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 2037
- barcode: ${wcs-slave.barcode[3].id}
- backSta: 2034
- led: ${wcs-slave.led[5].id}
-# # 绌烘澘鍏ュ簱鍙�1
-# emptyInSta[0]:
-# staNo: 106
-# barcode: ${wcs-slave.barcode[0].id}
-# backSta: 105
-# led: ${wcs-slave.led[1].id}
+ staNo: 218
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 219
+ led: ${wcs-slave.led[1].id}
+ inSta[1]:
+ staNo: 221
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 222
+ led: ${wcs-slave.led[1].id}
+ inSta[2]:
+ staNo: 224
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 225
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 218
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 219
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 221
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 222
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[2]:
+ staNo: 224
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 225
+ led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 4001
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[4].id}
- backSta: 4003
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 4001
- barcode: ${wcs-slave.barcode[4].id}
- backSta: 4003
- led: ${wcs-slave.led[4].id}
-# # 绌烘澘鍏ュ簱鍙�1
-# emptyInSta[1]:
-# staNo: 107
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 108
-# led: ${wcs-slave.led[2].id}
-# inSta[2]:
-# staNo: 159
-# barcode: ${wcs-slave.barcode[2].id}
-# barcodeMat: ${wcs-slave.barcode[5].id}
-# backSta: 160
-# led: ${wcs-slave.led[5].id}
- # # 鎷ｆ枡鍏ュ簱鍙�1
- # pickSta[1]:
- # staNo: 107
- # barcode: ${wcs-slave.barcode[1].id}
- # led: ${wcs-slave.led[1].id}
- # backSta: 108
+ staNo: 218
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 219
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 221
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 222
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[2]:
+ staNo: 224
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 225
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 2031
-# led: ${wcs-slave.led[0].id}
+ staNo: 219
+ led: ${wcs-slave.led[0].id}
outSta[1]:
- staNo: 4006
- led: ${wcs-slave.led[5].id}
-
- # 鍏ュ簱鍙�1
- inStaAgv[0]:
- staNo: 2034
- led: ${wcs-slave.led[5].id}
- outStaAgvEmpty[0]:
- staNo: 2033
- led: ${wcs-slave.led[5].id}
- outStaAgvFull[0]:
- staNo: 4006
- led: ${wcs-slave.led[5].id}
-# outSta[2]:
-# staNo: 156
-# led: ${wcs-slave.led[4].id}
+ staNo: 222
+ led: ${wcs-slave.led[0].id}
+ outSta[2]:
+ staNo: 225
+ led: ${wcs-slave.led[0].id}
# 鏉＄爜鎵弿浠�1
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index da4b31f..8fbca8c 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -55,159 +55,107 @@
"height": 22,
"minBayNo": 2,
"maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 188,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 236,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 257,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack9",
- "top": 280,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack10",
- "top": 301,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack11",
- "top": 349,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack12",
- "top": 370,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack13",
- "top": 393,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack14",
- "top": 414,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack15",
- "top": 462,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack16",
- "top": 483,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack17",
- "top": 506,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack18",
- "top": 527,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack19",
- "top": 575,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }, {
- "type": "rack",
- "id": "rack20",
- "top": 596,
- "left": 120,
- "width": 750,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 52
- }],
+ }, {
+ "type": "rack",
+ "id": "rack6",
+ "top": 188,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack7",
+ "top": 236,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack8",
+ "top": 257,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack10",
+ "top": 301,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack11",
+ "top": 349,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack13",
+ "top": 393,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack14",
+ "top": 414,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack15",
+ "top": 462,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }, {
+ "type": "rack",
+ "id": "rack16",
+ "top": 483,
+ "left": 120,
+ "width": 750,
+ "height": 22,
+ "minBayNo": 2,
+ "maxBayNo": 52
+ }
+ ],
"rackDescs": [{
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 61,
- "left": 870,
- "width": 30,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc2",
- "text": "#20",
- "top": 596,
- "left": 870,
- "width": 30,
- "height": 23
- }],
+ "type": "rackDescs",
+ "id": "lb_desc1",
+ "text": "#1",
+ "top": 61,
+ "left": 870,
+ "width": 30,
+ "height": 23
+ }, {
+ "type": "rackDescs",
+ "id": "lb_desc2",
+ "text": "#14",
+ "top": 483,
+ "left": 870,
+ "width": 30,
+ "height": 23
+ }
+ ],
"crns": [
{
"type": "track",
@@ -226,70 +174,55 @@
"width": 93,
"height": 22
},{
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 226,
- "left": 120,
- "width": 750,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 213,
- "left": 120,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 338,
- "left": 120,
- "width": 750,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 325,
- "left": 120,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 451,
- "left": 120,
- "width": 750,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-4",
- "text": "4",
- "top": 438,
- "left": 120,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track5",
- "text": "",
- "top": 564,
- "left": 120,
- "width": 750,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-5",
- "text": "5",
- "top": 553,
- "left": 120,
- "width": 93,
- "height": 22
- }],
+ "type": "track",
+ "id": "lb_track2",
+ "text": "",
+ "top": 226,
+ "left": 120,
+ "width": 750,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 213,
+ "left": 120,
+ "width": 93,
+ "height": 22
+ },{
+ "type": "track",
+ "id": "lb_track3",
+ "text": "",
+ "top": 338,
+ "left": 120,
+ "width": 750,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-3",
+ "text": "3",
+ "top": 325,
+ "left": 120,
+ "width": 93,
+ "height": 22
+ },{
+ "type": "track",
+ "id": "lb_track4",
+ "text": "",
+ "top": 451,
+ "left": 120,
+ "width": 750,
+ "height": 2
+ }, {
+ "type": "crane",
+ "id": "crn-4",
+ "text": "4",
+ "top": 438,
+ "left": 120,
+ "width": 93,
+ "height": 22
+ }
+ ],
"areas": [{
"type": "Control_floor",
"id": "tabControl_floor1",
@@ -309,126 +242,36 @@
"stns": [
{"type": "track", "id": "lb_trCart11", "text": "", "top": 65, "left": 1000, "width": 6, "height": 560},
{"type": "track", "id": "lb_trCart12", "text": "", "top": 65, "left": 1020, "width": 6, "height": 560},
- { "type": "stn", "id": "site-2", "text": "2", "top": 84, "left": 984, "width": 30, "height": 20 },
- { "type": "stn", "id": "site-1", "text": "1", "top": 84, "left": 1016, "width": 30, "height": 20 },
+ { "type": "stn", "id": "site-2", "text": "2", "top": 384, "left": 984, "width": 62, "height": 20 },
+ { "type": "stn", "id": "site-1", "text": "1", "top": 84, "left": 984, "width": 62, "height": 20 },
- { "type": "stn", "id": "site-1001", "text": "1001", "top": 84, "left": 870, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1002", "text": "1002", "top": 84, "left": 907, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1004", "text": "1004", "top": 84, "left": 944, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1005", "text": "1005", "top": 128, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1007", "text": "1007", "top": 128, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1008", "text": "1008", "top": 190, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1010", "text": "1010", "top": 190, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1011", "text": "1011", "top": 240, "left": 870, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1012", "text": "1012", "top": 240, "left": 907, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1014", "text": "1014", "top": 240, "left": 944, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1015", "text": "1015", "top": 300, "left": 870, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1016", "text": "1016", "top": 300, "left": 907, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1018", "text": "1018", "top": 300, "left": 944, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1019", "text": "1019", "top": 350, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1021", "text": "1021", "top": 350, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1025", "text": "1025", "top": 465, "left": 870, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1026", "text": "1026", "top": 465, "left": 907, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1028", "text": "1028", "top": 465, "left": 944, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1022", "text": "1022", "top": 415, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1024", "text": "1024", "top": 415, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1029", "text": "1029", "top": 530, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1031", "text": "1031", "top": 530, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1032", "text": "1032", "top": 580, "left": 870, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1033", "text": "1033", "top": 580, "left": 907, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1035", "text": "1035", "top": 580, "left": 944, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-101", "text": "101", "top": 84, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-102", "text": "102", "top": 84, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-103", "text": "103", "top": 128, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-104", "text": "104", "top": 128, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-105", "text": "105", "top": 190, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-106", "text": "106", "top": 190, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-107", "text": "107", "top": 238, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-108", "text": "108", "top": 238, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-109", "text": "109", "top": 304, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-110", "text": "110", "top": 304, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-111", "text": "111", "top": 352, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-112", "text": "112", "top": 352, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-113", "text": "113", "top": 416, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-114", "text": "114", "top": 416, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-115", "text": "115", "top": 465, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-116", "text": "116", "top": 465, "left": 926, "width": 54, "height": 20 },
-
- { "type": "stn", "id": "site-1042", "text": "1042", "top": 84, "left": 1050, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-1043", "text": "1043", "top": 84, "left": 1124, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-1044", "text": "1044", "top": 84, "left": 1198, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-1045", "text": "1045", "top": 84, "left": 1272, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-1046", "text": "1046", "top": 84, "left": 1346, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-1047", "text": "1047", "top": 84, "left": 1420, "width": 90, "height": 20 },
- { "type": "stn", "id": "site-1048", "text": "1048", "top": 84, "left": 1513, "width": 90, "height": 20 },
- // { "type": "stn", "id": "site-1049", "text": "1049", "top": 84, "left": 1346, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1050", "text": "1050", "top": 84, "left": 1605, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1051", "text": "1051", "top": 84, "left": 1642, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1052", "text": "1052", "top": 84, "left": 1679, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1053", "text": "1053", "top": 84, "left": 1716, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1054", "text": "1054", "top": 84, "left": 1753, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1055", "text": "1055", "top": 84, "left": 1790, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1056", "text": "1056", "top": 84, "left": 1827, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1057", "text": "1057", "top": 84, "left": 1864, "width": 35, "height": 20 },
-
- { "type": "stn", "id": "site-1073", "text": "1073", "top": 105, "left": 1642, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1074", "text": "1074", "top": 134, "left": 1642, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1075", "text": "1075", "top": 162, "left": 1642, "width": 35, "height": 25 },
-
- { "type": "stn", "id": "site-1072", "text": "1072", "top": 105, "left": 1716, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1071", "text": "1071", "top": 134, "left": 1716, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1070", "text": "1070", "top": 162, "left": 1716, "width": 35, "height": 25 },
-
- { "type": "stn", "id": "site-1061", "text": "1061", "top": 105, "left": 1790, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1062", "text": "1062", "top": 134, "left": 1790, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1063", "text": "1063", "top": 162, "left": 1790, "width": 35, "height": 25 },
-
- { "type": "stn", "id": "site-1058", "text": "1058", "top": 105, "left": 1864, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1059", "text": "1059", "top": 134, "left": 1864, "width": 35, "height": 25 },
- { "type": "stn", "id": "site-1060", "text": "1060", "top": 162, "left": 1864, "width": 35, "height": 25 },
-
- { "type": "stn", "id": "site-1105", "text": "1105", "top": 128, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1104", "text": "1104", "top": 128, "left": 1087, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1103", "text": "1103", "top": 128, "left": 1124, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1101", "text": "1101", "top": 128, "left": 1162, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-1097", "text": "1097", "top": 128, "left": 1235, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1096", "text": "1096", "top": 128, "left": 1272, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1095", "text": "1095", "top": 128, "left": 1309, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1094", "text": "1094", "top": 128, "left": 1346, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1085", "text": "1085", "top": 128, "left": 1383, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1086", "text": "1086", "top": 128, "left": 1420, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1084", "text": "1084", "top": 128, "left": 1457, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1083", "text": "1083", "top": 128, "left": 1494, "width": 35, "height": 20 },
-
- { "type": "stn", "id": "site-1098", "text": "1098", "top": 149, "left": 1235, "width": 35, "height": 40 },
- { "type": "stn", "id": "site-1093", "text": "1093", "top": 149, "left": 1309, "width": 35, "height": 40 },
- { "type": "stn", "id": "site-1087", "text": "1087", "top": 149, "left": 1420, "width": 35, "height": 40 },
- { "type": "stn", "id": "site-1082", "text": "1082", "top": 149, "left": 1494, "width": 35, "height": 40 },
-
-
-
- { "type": "stn", "id": "site-1106", "text": "1106", "top": 190, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1107", "text": "1107", "top": 190, "left": 1087, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1108", "text": "1108", "top": 190, "left": 1124, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1109", "text": "1109", "top": 190, "left": 1161, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1099", "text": "1099", "top": 190, "left": 1198, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1100", "text": "1100", "top": 190, "left": 1235, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1091", "text": "1091", "top": 190, "left": 1272, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1092", "text": "1092", "top": 190, "left": 1309, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1090", "text": "1090", "top": 190, "left": 1346, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1088", "text": "1088", "top": 190, "left": 1383, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1089", "text": "1089", "top": 190, "left": 1420, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1080", "text": "1080", "top": 190, "left": 1457, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1081", "text": "1081", "top": 190, "left": 1494, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1079", "text": "1079", "top": 190, "left": 1531, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1078", "text": "1078", "top": 190, "left": 1568, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1076", "text": "1076", "top": 190, "left": 1605, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1077", "text": "1077", "top": 190, "left": 1642, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1068", "text": "1068", "top": 190, "left": 1679, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1069", "text": "1069", "top": 190, "left": 1716, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1066", "text": "1066", "top": 190, "left": 1753, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1067", "text": "1067", "top": 190, "left": 1790, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1064", "text": "1064", "top": 190, "left": 1827, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1065", "text": "1065", "top": 190, "left": 1864, "width": 35, "height": 20 },
-
-
- { "type": "stn", "id": "site-1041", "text": "1041", "top": 415, "left": 1050, "width": 35, "height": 20 },
- // { "type": "stn", "id": "site-178", "text": "178", "top": 415, "left": 1337, "width": 35, "height": 20 },
-
- { "type": "stn", "id": "site-1038", "text": "1038", "top": 465, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1039", "text": "1039", "top": 465, "left": 1087, "width": 35, "height": 20 },
-
- { "type": "stn", "id": "site-1036", "text": "1036", "top": 580, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1037", "text": "1037", "top": 580, "left": 1087, "width": 35, "height": 20 },
-
-
-
- ],
+ { "type": "stn", "id": "site-117", "text": "117", "top": 238, "left": 1050, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-118", "text": "118", "top": 238, "left": 1106, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-119", "text": "119", "top": 238, "left": 1162, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-120", "text": "120", "top": 304, "left": 1050, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-121", "text": "121", "top": 304, "left": 1106, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-122", "text": "122", "top": 304, "left": 1162, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-123", "text": "123", "top": 416, "left": 1050, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-124", "text": "124", "top": 416, "left": 1106, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-125", "text": "125", "top": 416, "left": 1162, "width": 54, "height": 20 },
+ ],
"barcode":[
// {"type": "barcode", "id": "barcode-1", "text": "", "top": 749, "left": 470, "width": 80, "height": 20},
// {"type": "barcode", "id": "barcode-2", "text": "", "top": 684, "left": 470, "width": 80, "height": 20},
@@ -446,152 +289,9 @@
"width": 2900,
"height": 600,
"stns": [
- { "type": "stn", "id": "site-4", "text": "2", "top": 84, "left": 984, "width": 30, "height": 20 },
- { "type": "stn", "id": "site-3", "text": "1", "top": 84, "left": 1016, "width": 30, "height": 20 },
- {"type": "track", "id": "lb_trCart21", "text": "", "top": 65, "left": 1000, "width": 6, "height": 560},
- {"type": "track", "id": "lb_trCart22", "text": "", "top": 65, "left": 1020, "width": 6, "height": 560},
- { "type": "stn", "id": "site-2003", "text": "2003", "top": 84, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2001", "text": "2001", "top": 84, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2006", "text": "2006", "top": 128, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2004", "text": "2004", "top": 128, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2009", "text": "2009", "top": 190, "left": 926, "width": 54, "height": 20 },
-
- { "type": "stn", "id": "site-2007", "text": "2007", "top": 190, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2012", "text": "2012", "top": 240, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2010", "text": "2010", "top": 240, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2015", "text": "2015", "top": 300, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2013", "text": "2013", "top": 300, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2018", "text": "2018", "top": 350, "left": 926, "width": 54, "height": 20 },
-
- { "type": "stn", "id": "site-2016", "text": "2016", "top": 350, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2021", "text": "2021", "top": 415, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2019", "text": "2019", "top": 415, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2024", "text": "2024", "top": 465, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2022", "text": "2022", "top": 465, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2027", "text": "2027", "top": 530, "left": 926, "width": 54, "height": 20 },
- //
- { "type": "stn", "id": "site-2025", "text": "2025", "top": 530, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2030", "text": "2030", "top": 580, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2028", "text": "2028", "top": 580, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-2037", "text": "2037", "top": 128, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2035", "text": "2035", "top": 128, "left": 1087, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-2034", "text": "2034", "top": 128, "left": 1160, "width": 35, "height": 20 },
-
- { "type": "stn", "id": "site-2031", "text": "2031", "top": 300, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2033", "text": "2033", "top": 300, "left": 1087, "width": 35, "height": 20 },
-
-
- { "type": "stn", "id": "site-2110", "text": "2110", "top": 190, "left": 1407, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2109", "text": "2109", "top": 190, "left": 1444, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2108", "text": "2108", "top": 190, "left": 1481, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2107", "text": "2107", "top": 190, "left": 1518, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2106", "text": "2106", "top": 190, "left": 1555, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2105", "text": "2105", "top": 190, "left": 1592, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2104", "text": "2104", "top": 168, "left": 1518, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2103", "text": "2103", "top": 146, "left": 1518, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2102", "text": "2102", "top": 146, "left": 1555, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2101", "text": "2101", "top": 146, "left": 1592, "width": 35, "height": 20 },
-
- { "type": "stn", "id": "site-2042", "text": "2042", "top": 168, "left": 1318, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2041", "text": "2041", "top": 168, "left": 1278, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2043", "text": "2043", "top": 212, "left": 1318, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2044", "text": "2044", "top": 212, "left": 1278, "width": 35, "height": 20 },
-
-
- { "type": "stn", "id": "site-2120", "text": "2120", "top": 300, "left": 1407, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2119", "text": "2119", "top": 300, "left": 1444, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2118", "text": "2118", "top": 300, "left": 1481, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2117", "text": "2117", "top": 300, "left": 1518, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2116", "text": "2116", "top": 300, "left": 1555, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2115", "text": "2115", "top": 300, "left": 1592, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2114", "text": "2114", "top": 278, "left": 1518, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2113", "text": "2113", "top": 256, "left": 1518, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2112", "text": "2112", "top": 256, "left": 1555, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2111", "text": "2111", "top": 256, "left": 1592, "width": 35, "height": 20 },
-
- { "type": "stn", "id": "site-2046", "text": "2046", "top": 278, "left": 1318, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2045", "text": "2045", "top": 278, "left": 1278, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2047", "text": "2047", "top": 322, "left": 1318, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-2048", "text": "2048", "top": 322, "left": 1278, "width": 35, "height": 20 },
-
],
"barcode": []
},
- {
- "type": "floor",
- "id": "page_floor3",
- "text": "3F",
- "top": 0,
- "left": 0,
- "width": 2900,
- "height": 600,
- "stns": [
- // { "type": "stn", "id": "site-300", "text": "300", "top": 80, "left": 94, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-301", "text": "301", "top": 80, "left": 52, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-302", "text": "302", "top": 80, "left": 10, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-303", "text": "303", "top": 80, "left": 1742, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-304", "text": "304", "top": 80, "left": 1784, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-305", "text": "305", "top": 80, "left": 1826, "width": 40, "height": 23 },
- //
- // { "type": "stn", "id": "site-306", "text": "306", "top": 130, "left": 94, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-307", "text": "307", "top": 130, "left": 52, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-308", "text": "308", "top": 130, "left": 10, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-309", "text": "309", "top": 130, "left": 1742, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-310", "text": "310", "top": 130, "left": 1784, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-311", "text": "311", "top": 130, "left": 1826, "width": 40, "height": 23 },
- //
- // { "type": "stn", "id": "site-312", "text": "312", "top": 160, "left": 94, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-313", "text": "313", "top": 160, "left": 52, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-314", "text": "314", "top": 160, "left": 10, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-315", "text": "315", "top": 160, "left": 1742, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-316", "text": "316", "top": 160, "left": 1784, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-317", "text": "317", "top": 160, "left": 1826, "width": 40, "height": 23 },
- //
- // { "type": "stn", "id": "site-318", "text": "318", "top": 240, "left": 94, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-319", "text": "319", "top": 240, "left": 52, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-320", "text": "320", "top": 240, "left": 10, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-321", "text": "321", "top": 240, "left": 1742, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-322", "text": "322", "top": 240, "left": 1784, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-323", "text": "323", "top": 240, "left": 1826, "width": 40, "height": 23 },
- //
- // { "type": "stn", "id": "site-324", "text": "324", "top": 320, "left": 94, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-325", "text": "325", "top": 320, "left": 52, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-326", "text": "326", "top": 320, "left": 10, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-327", "text": "327", "top": 320, "left": 1742, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-328", "text": "328", "top": 320, "left": 1784, "width": 40, "height": 23 },
- // { "type": "stn", "id": "site-329", "text": "329", "top": 320, "left": 1826, "width": 40, "height": 23 }
- ],
- "barcode": []
- },
- {
- "type": "floor",
- "id": "page_floor4",
- "text": "4F",
- "top": 0,
- "left": 0,
- "width": 2900,
- "height": 600,
- "stns": [
- { "type": "stn", "id": "site-4001", "text": "4001", "top": 300, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-4003", "text": "4003", "top": 300, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-4004", "text": "4004", "top": 350, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-4006", "text": "4006", "top": 350, "left": 926, "width": 54, "height": 20 },
-
-
-
- // { "type": "stn", "id": "site-401", "text": "401", "top": 80, "left": 10, "width": 120, "height": 23 },
- // { "type": "stn", "id": "site-402", "text": "402", "top": 160, "left": 10, "width": 120, "height": 23 },
- // { "type": "stn", "id": "site-403", "text": "403", "top": 240, "left": 10, "width": 120, "height": 23 },
- // { "type": "stn", "id": "site-404", "text": "404", "top": 320, "left": 10, "width": 120, "height": 23 },
- //
- // { "type": "stn", "id": "site-411", "text": "411", "top": 80, "left": 1742, "width": 120, "height": 23 },
- //
- // { "type": "stn", "id": "site-412", "text": "412", "top": 160, "left": 1742, "width": 120, "height": 23 },
- // { "type": "stn", "id": "site-413", "text": "413", "top": 240, "left": 1742, "width": 120, "height": 23 },
- // { "type": "stn", "id": "site-414", "text": "414", "top": 320, "left": 1742, "width": 120, "height": 23 }
- ],
- "barcode": []
- }
]
}]
}
\ No newline at end of file
--
Gitblit v1.9.1