From 1fcbc05db63b43c549a317eeb1baede94f4b7030 Mon Sep 17 00:00:00 2001
From: lfdMem <1>
Date: 星期一, 10 三月 2025 08:16:35 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 2
src/main/webapp/static/js/console.map.js | 870 +-----------------------------------------------------
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2
src/main/resources/application.yml | 14
7 files changed, 34 insertions(+), 871 deletions(-)
diff --git a/pom.xml b/pom.xml
index 00a1c27..7d9876d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>lfdwcs</finalName>
+ <finalName>lfdwcsMem</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
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 09132d4..3940f88 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -145,7 +145,8 @@
}
}
if (staProtocol.isAutoing() && staProtocol.isInEnable()
- && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() > 9990)
+ && !staProtocol.isEmptyMk() && staProtocol.getWorkNo() > 9990
+ && staProtocol.getWorkNo()!=9999 && staProtocol.getWorkNo()!=9992 && staProtocol.getWorkNo()!=0
&& staProtocol.isPakMk() && staProtocol.getStamp()>=2 && staProtocol.getStamp()!=3) {// && !Cools.isEmpty(barcode)) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛�");
// try {
@@ -156,7 +157,7 @@
if(!Cools.isEmpty(barcode)) {
News.info(""+mark+" - 1"+" - {}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
- staProtocol.setWorkNo((short) 9999);
+ staProtocol.setWorkNo((short) 9992);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -170,7 +171,7 @@
continue;
}
} else {
- staProtocol.setWorkNo((short) 9999);
+ staProtocol.setWorkNo((short) 9992);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -195,7 +196,7 @@
}
if (wrkMast != null) {
News.error(""+mark+" - 4"+" - 宸ヤ綔妗ｄ腑宸插瓨鍦ㄨ绔欑姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
- staProtocol.setWorkNo((short)9999);
+ staProtocol.setWorkNo((short)9992);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -255,7 +256,7 @@
}
} else {
News.error(""+mark+" - 5"+" - 璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
- staProtocol.setWorkNo((short)9999);
+ staProtocol.setWorkNo((short)9992);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -1511,7 +1512,7 @@
// ledThread.errorReset();
}
} else {
- staProtocol.setWorkNo((short)9999);
+ staProtocol.setWorkNo((short)9992);
staProtocol.setStaNo(emptyInSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index e2265ce..649fe9b 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -110,7 +110,7 @@
} catch (Exception e) {
e.printStackTrace();
}
- System.out.println("绗�"+slave.getId()+"涓爢鍨涙満绾跨▼杩愯涓�杞細"+(System.currentTimeMillis()-sign));
+// System.out.println("绗�"+slave.getId()+"涓爢鍨涙満绾跨▼杩愯涓�杞細"+(System.currentTimeMillis()-sign));
sign = System.currentTimeMillis();
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6092201..e091d24 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -222,7 +222,7 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.100", (short) (staNoSize * 2));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB102.0", (short) (staNoSize * 2));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 77acf91..99628ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrs
- url: jdbc:sqlserver://127.0.0.1:50948;databasename=lfdasrs
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrsMem
+ url: jdbc:sqlserver://192.168.0.17:1433;databasename=lfdasrsMem
username: sa
password: sa@123
mvc:
@@ -35,7 +35,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/lfdwms
+ url: 127.0.0.1:8080/wms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -48,7 +48,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.1
+ ip: 10.10.11.7
port: 6000
rack: 0
slot: 0
@@ -72,7 +72,7 @@
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.10.10.100
+ ip: 10.10.11.10
port: 102
rack: 0
slot: 0
@@ -107,7 +107,7 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.249
+ ip: 10.10.11.210
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
\ No newline at end of file
+ staArr: 102
\ No newline at end of file
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index be24a86..99f1fa8 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/lfdwcs";
+var baseUrl = "/lfdwcsMem";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 3b9aad2..3cdf413 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,5 +1,5 @@
mapInfo = {
- "mapName": "LFDWCS",
+ "mapName": "LFDWCSMEM",
"rackCount": 18,
"crnCount": 7,
"stbCount": 77,
@@ -8,52 +8,7 @@
"floors": 1,
"racks": [{
"type": "rack",
- "id": "rack16",
- "top": 596,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack17",
- "top": 644,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack18",
- "top": 665,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack13",
- "top": 503,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack14",
- "top": 551,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack10",
+ "id": "rack32",
"top": 410,
"left": 639,
"width": 1072,
@@ -62,7 +17,7 @@
"maxBayNo": 62
}, {
"type": "rack",
- "id": "rack11",
+ "id": "rack33",
"top": 458,
"left": 639,
"width": 1072,
@@ -71,88 +26,7 @@
"maxBayNo": 62
}, {
"type": "rack",
- "id": "rack7",
- "top": 309,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 357,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack5",
- "top": 237,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 285,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 165,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 213,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack1",
- "top": 93,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 141,
- "left": 639,
- "width": 1223,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 145
- }, {
- "type": "rack",
- "id": "rack15",
- "top": 575,
- "left": 639,
- "width": 1072,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 62
- }, {
- "type": "rack",
- "id": "rack12",
+ "id": "rack34",
"top": 479,
"left": 639,
"width": 1072,
@@ -161,7 +35,7 @@
"maxBayNo": 62
}, {
"type": "rack",
- "id": "rack9",
+ "id": "rack31",
"top": 389,
"left": 639,
"width": 1072,
@@ -171,24 +45,8 @@
}],
"rackDescs": [{
"type": "rackDescs",
- "id": "lb_desc8",
- "text": "#8",
- "top": 357,
- "left": 1866,
- "width": 33,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 93,
- "left": 1867,
- "width": 30,
- "height": 23
- }, {
- "type": "rackDescs",
"id": "lb_desc9",
- "text": "#9",
+ "text": "#31",
"top": 388,
"left": 1716,
"width": 33,
@@ -196,7 +54,7 @@
}, {
"type": "rackDescs",
"id": "lb_desc18",
- "text": "#18",
+ "text": "#34",
"top": 663,
"left": 1716,
"width": 41,
@@ -204,39 +62,7 @@
}],
"crns": [{
"type": "track",
- "id": "lb_track7",
- "text": "",
- "top": 634,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-7",
- "text": "7",
- "top": 621,
- "left": 805,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track6",
- "text": "",
- "top": 538,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-6",
- "text": "6",
- "top": 528,
- "left": 805,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track5",
+ "id": "lb_track1",
"text": "",
"top": 448,
"left": 559,
@@ -244,73 +70,9 @@
"height": 2
}, {
"type": "crane",
- "id": "crn-5",
- "text": "5",
- "top": 435,
- "left": 805,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track4",
- "text": "",
- "top": 344,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-4",
- "text": "4",
- "top": 334,
- "left": 805,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 272,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 262,
- "left": 805,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track2",
- "text": "",
- "top": 200,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 190,
- "left": 805,
- "width": 93,
- "height": 22
- }, {
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 128,
- "left": 559,
- "width": 1345,
- "height": 2
- }, {
- "type": "crane",
"id": "crn-1",
"text": "1",
- "top": 118,
+ "top": 435,
"left": 805,
"width": 93,
"height": 22
@@ -331,621 +93,21 @@
"left": 22,
"width": 1819,
"height": 668,
- "stns": [{
- "type": "stn",
- "id": "site-215",
- "text": "215",
- "top": 646,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-216",
- "text": "216",
- "top": 646,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-217",
- "text": "217",
- "top": 646,
- "left": 368,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-214",
- "text": "214",
- "top": 598,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-213",
- "text": "213",
- "top": 598,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-212",
- "text": "212",
- "top": 598,
- "left": 368,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-209",
- "text": "209",
- "top": 553,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-210",
- "text": "210",
- "top": 553,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-211",
- "text": "211",
- "top": 553,
- "left": 368,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-208",
- "text": "208",
- "top": 505,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-207",
- "text": "207",
- "top": 505,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 505,
- "left": 368,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 460,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 460,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 460,
- "left": 368,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 412,
- "left": 548,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 412,
- "left": 458,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 412,
- "left": 368,
- "width": 89,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 287,
- "left": 445,
- "width": 128,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-136",
- "text": "136",
- "top": 118,
- "left": 380,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-157",
- "text": "157",
- "top": 118,
- "left": 315,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-139",
- "text": "139",
- "top": 190,
- "left": 380,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-154",
- "text": "154",
- "top": 190,
- "left": 315,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-145",
- "text": "145",
- "top": 334,
- "left": 380,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-148",
- "text": "148",
- "top": 334,
- "left": 315,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-142",
- "text": "142",
- "top": 262,
- "left": 380,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-151",
- "text": "151",
- "top": 262,
- "left": 315,
- "width": 63,
- "height": 22
- }, {
- "type": "stn",
- "id": "site-140",
- "text": "140",
- "top": 215,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 215,
- "left": 445,
- "width": 128,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-153",
- "text": "153",
- "top": 215,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 215,
- "left": 574,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-137",
- "text": "137",
- "top": 143,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 143,
- "left": 445,
- "width": 128,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-156",
- "text": "156",
- "top": 143,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 143,
- "left": 574,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-146",
- "text": "146",
- "top": 359,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-131",
- "text": "131",
- "top": 359,
- "left": 445,
- "width": 128,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-147",
- "text": "147",
- "top": 359,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-132",
- "text": "132",
- "top": 359,
- "left": 250,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-133",
- "text": "133",
- "top": 359,
- "left": 186,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-134",
- "text": "134",
- "top": 359,
- "left": 122,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 359,
- "left": 574,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 311,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-128",
- "text": "128",
- "top": 311,
- "left": 509,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-127",
- "text": "127",
- "top": 311,
- "left": 445,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-149",
- "text": "149",
- "top": 311,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-129",
- "text": "129",
- "top": 311,
- "left": 574,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-143",
- "text": "143",
- "top": 287,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-150",
- "text": "150",
- "top": 287,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-124",
- "text": "124",
- "top": 287,
- "left": 250,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-125",
- "text": "125",
- "top": 287,
- "left": 186,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-126",
- "text": "126",
- "top": 287,
- "left": 122,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 287,
- "left": 574,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-141",
- "text": "141",
- "top": 239,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 239,
- "left": 509,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 239,
- "left": 445,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-152",
- "text": "152",
- "top": 239,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 239,
- "left": 250,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 239,
- "left": 186,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 239,
- "left": 122,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 239,
- "left": 574,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-138",
- "text": "138",
- "top": 167,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 167,
- "left": 509,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 167,
- "left": 445,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-155",
- "text": "155",
- "top": 167,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 167,
- "left": 250,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 167,
- "left": 186,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 167,
- "left": 122,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 167,
- "left": 574,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-135",
- "text": "135",
- "top": 95,
- "left": 380,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 95,
- "left": 509,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 95,
- "left": 445,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-158",
- "text": "158",
- "top": 95,
- "left": 315,
- "width": 63,
- "height": 20
- }, {
+ "stns": [ {
"type": "stn",
"id": "site-102",
"text": "102",
- "top": 95,
- "left": 250,
- "width": 63,
+ "top": 460,
+ "left": 548,
+ "width": 89,
"height": 20
}, {
"type": "stn",
"id": "site-101",
"text": "101",
- "top": 95,
- "left": 186,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 95,
- "left": 122,
- "width": 63,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 95,
- "left": 574,
- "width": 63,
+ "top": 460,
+ "left": 458,
+ "width": 89,
"height": 20
}]
}]
--
Gitblit v1.9.1