From 056cf9d0311e1345017ab4c52c5946144fb4ccb8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 十月 2024 15:03:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 17
src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java | 32
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10
src/main/webapp/static/js/console.map.js | 910 +++++++++++++--------------------------
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/asrs/controller/CrnController.java | 26
src/main/java/com/zy/core/model/command/CrnCommand.java | 2
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 74 ++-
src/main/resources/application.yml | 249 +---------
src/main/java/com/zy/core/ServerBootstrap.java | 14
12 files changed, 453 insertions(+), 887 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0e0b3b6..443049b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>ykwcs</finalName>
+ <finalName>gtwcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index e4fcfca..e6c8399 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -249,7 +249,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- boolean locSts = isLocSts(param.getRow().toString(), param.getBay().toString(), param.getLev().toString());
+ short locSts = isLocSts(param.getRow(), param.getBay(), param.getLev());
command.setTraySize(locSts);
return crnControl(command)?R.ok():R.error();
}
@@ -268,7 +268,7 @@
command.setDestinationPosX(param.getRow()); // 鐩爣搴撲綅鎺�
command.setDestinationPosY(param.getBay()); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ(param.getLev()); // 鐩爣搴撲綅灞�
- boolean locSts = isLocSts(param.getSourceRow().toString(), param.getSourceBay().toString(), param.getSourceLev().toString());
+ short locSts = isLocSts(param.getSourceRow(), param.getSourceBay(), param.getSourceLev());
command.setTraySize(locSts);
return crnControl(command)?R.ok():R.error();
}
@@ -294,7 +294,12 @@
if (sourceLoc.getLocType1() != loc.getLocType1()){
return R.error("搴撲綅绫诲瀷涓嶄竴鑷�");
}
- command.setTraySize(loc.getLocType1() == 2);
+ short locSts1 = isLocSts(param.getRow(), param.getBay(), param.getLev());
+ short locSts2 = isLocSts(param.getSourceRow(), param.getSourceBay(), param.getSourceLev());
+ if (locSts1 != locSts2){
+ return R.error("搴撲綅涓嶅尮閰�");
+ }
+ command.setTraySize(locSts1);
// VersionUtils.locMoveCheckLocType(sourceLoc, loc);
return crnControl(command)?R.ok():R.error();
}
@@ -512,16 +517,15 @@
}
}
- private boolean isLocSts(String row,String bay,String lev){
- String loc = String.format("%2d",row)+String.format("%3d",bay)+String.format("%2d",lev);
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", loc));
+ private short isLocSts(Short row,Short bay,Short lev){
+// String loc = String.format("%2d",row)+String.format("%3d",bay)+String.format("%2d",lev);
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", row).eq("bay1", bay).eq("lev1", lev));
if (Cools.isEmpty(locMast)){
- return false;
+ return 0;
}
- if (locMast.getLocType1() == 2){
- return true;
- }
- return false;
+
+ return locMast.getLocType1();
}
diff --git a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
index 849368e..ccf96a7 100644
--- a/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/SiteStatusType.java
@@ -1,6 +1,8 @@
package com.zy.asrs.domain.enums;
+import com.zy.core.enums.DevpType.DevpStateType;
+import com.zy.core.enums.DevpType.DevpWorkType;
import com.zy.core.model.protocol.StaProtocol;
/**
@@ -25,21 +27,21 @@
if (staProtocol == null) {
return null;
}
-// if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0) {
-// return SITE_AUTO_RUN_ID;
-// }
-// if (staProtocol.isAutoing() && staProtocol.isLoading()) {
-// return SITE_AUTO_RUN;
-// }
-// if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 0) {
-// return SITE_AUTO_ID;
-// }
-// if (staProtocol.isAutoing()) {
-// return SITE_AUTO;
-// }
-// if (!staProtocol.isAutoing()) {
-// return SITE_UNAUTO;
-// }
+ if (staProtocol.stateType == DevpStateType.AUTO && staProtocol.workType == DevpWorkType.BUSY && staProtocol.getWorkNo() > 0) {
+ return SITE_AUTO_RUN_ID;
+ }
+ if (staProtocol.stateType == DevpStateType.AUTO && staProtocol.workType == DevpWorkType.BUSY) {
+ return SITE_AUTO_RUN;
+ }
+ if (staProtocol.stateType == DevpStateType.AUTO && staProtocol.getWorkNo() > 0) {
+ return SITE_AUTO_ID;
+ }
+ if (staProtocol.stateType == DevpStateType.AUTO) {
+ return SITE_AUTO;
+ }
+ if (staProtocol.stateType != DevpStateType.AUTO) {
+ return SITE_UNAUTO;
+ }
return null;
}
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 d3648b2..ea31bae 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -919,7 +919,7 @@
crnCommand.setDestinationPosX(locMast.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setTraySize(locMast.getLocType1() == 2);
+ crnCommand.setTraySize(locMast.getLocType1());
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
News.error(""+mark+" - 1"+" - 16"+" - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -1081,7 +1081,7 @@
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
+ crnCommand.setTraySize(sourceSta.getLocType1()); //搴撲綅绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
News.error(""+mark+" - 2"+" - 13"+" - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -1280,7 +1280,7 @@
crnCommand.setDestinationPosX(sta.getRow1().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(sta.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(sta.getLev1().shortValue()); // 鐩爣搴撲綅灞�
- crnCommand.setTraySize(sourceSta.getLocType1() == 2); //搴撲綅绫诲瀷
+ crnCommand.setTraySize(sourceSta.getLocType1()); //搴撲綅绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
News.error(""+mark+" - 3"+" - 4"+" - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
} else {
@@ -1499,7 +1499,7 @@
&& staProtocol.requestType == DevpRequestType.IN
&& staProtocol.trayType == DevpTrayType.EMPTY
&& staProtocol.isPakMk()
- && (staProtocol.getWorkNo() !=0 && staProtocol.getWorkNo() > 9700)
+ && ((staProtocol.getWorkNo() !=0 && staProtocol.getWorkNo() > 9700) || staProtocol.getSiteId() == 1025)
) {
News.warnNoLog(""+mark+" - 0"+" - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
@@ -1522,7 +1522,7 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(dto.getWorkNo());
- staProtocol.setStaNo(staProtocol.getSiteId().shortValue());
+ staProtocol.setStaNo(dto.getStaNo().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂6锛�"+dto.getWorkNo()+","+staProtocol.getSiteId());
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 4174523..d03d661 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -54,7 +54,7 @@
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(1); // 缁勬墭
// mainService.generateStoreWrkFile0(2); // WMS鍏ュ簱
- Thread.sleep(500);
+ Thread.sleep(100);
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn(4);
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index ae2f143..8af5198 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -49,7 +49,7 @@
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
// 寮�濮嬩富娴佺▼杩涚▼
-// mainProcess.start();
+ mainProcess.start();
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
@@ -86,12 +86,12 @@
private void initThread(){
// 鍒濆鍖栧爢鍨涙満绾跨▼
-// News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
-// for (CrnSlave crn : slaveProperties.getCrn()) {
-// CrnThread crnThread = new SiemensCrnThread(crn);
-// new Thread((Runnable) crnThread).start();
-// SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
-// }
+ News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ CrnThread crnThread = new SiemensCrnThread(crn);
+ new Thread((Runnable) crnThread).start();
+ SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
+ }
// 鍒濆鍖栫┛姊溅绾跨▼
// log.info("鍒濆鍖朢GV绾跨▼...................................................");
// for (RgvSlave rgv : slaveProperties.getRgv()) {
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index 6b09a73..19b2948 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -74,7 +74,7 @@
// 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
private Short command = 0;
- private boolean traySize = false;
+ private Short traySize = 0;
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index e08db4f..ede2985 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -272,7 +272,7 @@
// convertRow(command);
command.setCrnNo(slave.getId());
// short[] array = new short[10];
- short[] array = new short[10];
+ short[] array = new short[11];
array[0] = command.getAckFinish(); // 浠诲姟瀹屾垚纭浣�
array[1] = command.getTaskNo(); // 浠诲姟鍙�
array[2] = command.getTaskMode(); // 妯″紡
@@ -283,12 +283,11 @@
array[7] = command.getDestinationPosY(); // 鐩爣浣嶇疆鍒楀彿
array[8] = command.getDestinationPosZ(); // 鐩爣浣嶇疆灞傚彿
array[9] = command.getCommand();
-// array[10] = 0; //澶囩敤1
+ array[10] = command.getTraySize(); //澶囩敤1
- boolean[] array2 = new boolean[1];
- array2[0] = command.isTraySize();
+
OperateResult result = siemensNet.Write("DB100.0", array);
- OperateResult result2 = siemensNet.Write("DB100.22", array2);
+
News.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
@@ -297,11 +296,10 @@
do {
try{
- if(!result.IsSuccess || !result2.IsSuccess){
+ if(!result.IsSuccess ){
News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
// MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
result = siemensNet.Write("DB100.0", array);
- result2 = siemensNet.Write("DB100.22", array2);
Thread.sleep(100);
writeCount1++;
continue;
@@ -317,12 +315,12 @@
one.setDestinationPosX(siemensNet.getByteTransform().TransInt16(resultRead.Content, 12));
one.setDestinationPosY(siemensNet.getByteTransform().TransInt16(resultRead.Content, 14));
one.setDestinationPosZ(siemensNet.getByteTransform().TransInt16(resultRead.Content, 16));
- one.setTraySize(siemensNet.getByteTransform().TransBool(resultRead.Content, 22));
+ one.setTraySize(siemensNet.getByteTransform().TransInt16(resultRead.Content, 20));
if (!command.getTaskNo().equals(one.getTaskNo()) || !command.getTaskMode().equals(one.getTaskMode())
|| !command.getSourcePosX().equals(one.getSourcePosX()) || !command.getSourcePosY().equals(one.getSourcePosY())
|| !command.getSourcePosZ().equals(one.getSourcePosZ()) || !command.getDestinationPosX().equals(one.getDestinationPosX())
|| !command.getDestinationPosY().equals(one.getDestinationPosY()) || !command.getDestinationPosZ().equals(one.getDestinationPosZ())
- || !command.isTraySize() == one.isTraySize()
+ || !command.getTraySize().equals(one.getTraySize())
){
try{
News.error("鍫嗗灈鏈哄懡浠ゅ湴鍧�鍐欏叆鍚庡洖璇诲け璐�==>涓嶄竴鑷碵id:{}] >>>>> 鍐欏叆[{}],===>>鍥炶[{}]", slave.getId(), JSON.toJSON(command),JSON.toJSON(one));
@@ -344,7 +342,6 @@
// MessageQueue.offer(SlaveType.Crn, slave.getId(), new Task(2, command));
News.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍥炶涓嶄竴鑷� ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(command),writeCount1);
result = siemensNet.Write("DB100.0", array);
- result2 = siemensNet.Write("DB100.22", array2);
writeCount1++;
continue;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index f107d92..9edf634 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,11 +45,19 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
private StaError1 staError1;
+ public static boolean is = true;
// public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
//
// }};
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(140);add(141);
+ 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(200);add(201);add(202);
+ }};
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(1400);
+
// add(200);add(201);add(202);
}};
@@ -91,6 +99,8 @@
switch (slave.getId()) {
case 1:
return staNos1;
+ case 2:
+ return staNos2;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -135,31 +145,43 @@
private void initSite() {
count ++;
ArrayList<Integer> staNos = getStaNo();
+ if(count > 50) {
+ // 绔欑偣缂栧彿
+ for (Integer siteId : staNos) {
+ StaProtocol staProtocol = station.get(siteId);
+ if (null == staProtocol) {
+ staProtocol = new StaProtocol();
+ staProtocol.setSiteId(siteId);
+ station.put(siteId, staProtocol);
+ }
+ staProtocol.setWorkNo(0); // 宸ヤ綔鍙�
+ staProtocol.setStaNo((short) 0); // 鐩爣绔�
+ staProtocol.setState((short) 0); // 妯″紡鐘舵�� 0鍋滄満锛�=1鎵嬪姩锛�=2鑷姩锛�=3鏁呴殰
+ staProtocol.setWorkIo((short) 0);
+ staProtocol.setRequestIo((short) 0);
+ staProtocol.setTrayIo((short) 0);
+ staProtocol.setLocIo((short) 0);
+ staProtocol.setBarcode("-");
+ staProtocol.setWeightIo(0.0);
+ staProtocol.setMode((short) 0);
- // 绔欑偣缂栧彿
- for (Integer siteId : staNos) {
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
+ if (!staProtocol.isPakMk() && staProtocol.workType == DevpWorkType.IDLE) {
+ staProtocol.setPakMk(true);
+ }
}
- staProtocol.setWorkNo(0); // 宸ヤ綔鍙�
- staProtocol.setStaNo((short) 0); // 鐩爣绔�
- staProtocol.setState((short) 0); // 妯″紡鐘舵�� 0鍋滄満锛�=1鎵嬪姩锛�=2鑷姩锛�=3鏁呴殰
- staProtocol.setWorkIo((short) 0);
- staProtocol.setRequestIo((short) 0);
- staProtocol.setTrayIo((short) 0);
- staProtocol.setLocIo((short) 0);
- staProtocol.setBarcode("-");
- staProtocol.setWeightIo(0.0);
- staProtocol.setMode((short) 0);
-
- if (!staProtocol.isPakMk() && staProtocol.workType == DevpWorkType.IDLE) {
- staProtocol.setPakMk(true);
- }
+ count = 0;
}
- count = 0;
+
+
+ }
+
+ public void initSta(){
+ if (is){
+ for (int i = 1000; i <= 1300; i++) {
+ staNos1.add(i);
+ }
+ is = false;
+ }
}
@@ -295,7 +317,7 @@
int index = staNos.indexOf(staProtocol.getSiteId());
OperateResult write1 = siemensS7Net.Write("DB100." + index*66, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- Thread.sleep(200);
+ Thread.sleep(100);
OperateResult write2 = siemensS7Net.Write("DB100." + (index*66+4), staProtocol.getStaNo()); // 鐩爣绔�
if(write1.IsSuccess && write2.IsSuccess){
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB100."+(index*66), (short) 6);
@@ -317,7 +339,9 @@
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100."+(index*66 +6), (short) 2);
short mk = siemensS7Net.getByteTransform().TransInt16(result2.Content, 0);
if (mk == 2){
- OperateResult write4 = siemensS7Net.Write("DB100." + (index*66+6), 0);
+ OperateResult write5 = siemensS7Net.Write("DB100." + index*66, 0); // 宸ヤ綔鍙�
+ OperateResult write6 = siemensS7Net.Write("DB100." + (index*66+4), (short) 0); // 鐩爣绔�
+ OperateResult write4 = siemensS7Net.Write("DB100." + (index*66+6), (short) 0);
if (write4.IsSuccess){
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1d99b37..95614e1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=jxgtasrs
username: sa
password: sa@123
mvc:
@@ -34,20 +34,20 @@
enable: false
wms:
- url: 127.0.0.1:9090/ykwms
+ url: 127.0.0.1:8080/wms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.10
+ ip: 10.200.51.180
port: 102
rack: 0
slot: 0
@@ -57,21 +57,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 123
- row: 3
- bay: 1
+ staNo: 1017
+ row: 2
+ bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 118
- row: 2
- bay: 1
+ staNo: 1029
+ row: 3
+ bay: 47
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.20
+ ip: 10.200.51.189
port: 102
rack: 0
slot: 0
@@ -81,201 +81,66 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 131
+ staNo: 1021
row: 7
- bay: 1
+ bay: 47
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 127
+ staNo: 1030
row: 6
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�3
- crn[2]:
- id: 3
- ip: 10.10.10.30
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 135
- row: 10
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 139
- row: 11
- bay: 1
- lev: 1
- # 鍫嗗灈鏈�4
- crn[3]:
- id: 4
- ip: 10.10.10.40
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 144
- row: 14
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 148
- row: 15
- bay: 1
+ bay: 47
lev: 1
- # RGV绌挎杞�1
- rgv[0]:
- id: 1
- ip: 10.10.10.60
- port: 502
- rack: 0
- slot: 0
- #RGV鍏ュ簱婧愮珯鐐�
- rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- #RGV鍑哄簱婧愮珯鐐�
- rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- #RGV鐩爣绔欑偣
- rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- # RGV绌挎杞�2
- rgv[1]:
- id: 2
- ip: 10.10.10.63
- port: 502
- rack: 0
- slot: 0
- #RGV鍏ュ簱婧愮珯鐐�
- rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- #RGV鍑哄簱婧愮珯鐐�
- rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- #RGV鐩爣绔欑偣
- rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- # RGV绌挎杞�2
- rgv[2]:
- id: 3
- ip: 10.10.10.66
- port: 502
- rack: 0
- slot: 0
- #RGV鍏ュ簱婧愮珯鐐�
- rgvInSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- rgvInSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- #RGV鍑哄簱婧愮珯鐐�
- rgvOutSStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- rgvOutSStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
- #RGV鐩爣绔欑偣
- rgvDestStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- rgvDestStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 10.200.50.10
+ ip: 10.200.51.47
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 1001
+ backSta: 1000
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 1001
+ backSta: 1000
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 1025
+ backSta: 1000
+ led: ${wcs-slave.led[1].id}
+ # 鍑哄簱鍙�1
+ outSta[0]:
+ staNo: 124
+ led: ${wcs-slave.led[0].id}
+
+ devp[1]:
+ id: 2
+ ip: 10.200.51.10
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
- barcodeMat: ${wcs-slave.barcode[3].id}
backSta: 105
led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 106
- barcode: ${wcs-slave.barcode[0].id}
backSta: 105
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 159
- barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[5].id}
backSta: 160
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 107
- barcode: ${wcs-slave.barcode[1].id}
- barcodeMat: ${wcs-slave.barcode[4].id}
- backSta: 108
- led: ${wcs-slave.led[2].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
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
@@ -287,36 +152,6 @@
staNo: 156
led: ${wcs-slave.led[4].id}
- # 鏉＄爜鎵弿浠�1
- barcode[0]:
- id: 1
- ip: 10.10.10.121
- port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
- id: 2
- ip: 10.10.10.122
- port: 51236
- # 鏉＄爜鎵弿浠�3
- barcode[2]:
- id: 3
- ip: 10.10.10.123
- port: 51236
- # 鏉＄爜鎵弿浠�1mat
- barcode[3]:
- id: 4
- ip: 10.10.10.121
- port: 51236
- # 鏉＄爜鎵弿浠�2mat
- barcode[4]:
- id: 5
- ip: 10.10.10.122
- port: 51236
- # 鏉＄爜鎵弿浠�3mat
- barcode[5]:
- id: 6
- ip: 10.10.10.123
- port: 51236
# LED1
led[0]:
id: 1
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 44e7c47..7d97770 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/ykwcs";
+var baseUrl = "/gtwcs";
// 璧嬪��
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 76f41ce..f199746 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": "YKWCS",
+ "mapName": "GTWCS",
"rackCount": 4,
"crnCount": 3,
"stbCount": 13,
@@ -11,145 +11,73 @@
"id": "rack16",
"top": 167,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}, {
"type": "rack",
"id": "rack15",
"top": 188,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}, {
"type": "rack",
"id": "rack14",
"top": 236,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}, {
"type": "rack",
"id": "rack13",
"top": 257,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}, {
"type": "rack",
"id": "rack12",
"top": 280,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}, {
"type": "rack",
"id": "rack11",
"top": 301,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}, {
"type": "rack",
"id": "rack10",
"top": 349,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}, {
"type": "rack",
"id": "rack9",
"top": 370,
"left": 529,
- "width": 1280,
+ "width": 1000,
"height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack8",
- "top": 393,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack7",
- "top": 414,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack6",
- "top": 462,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack5",
- "top": 483,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack4",
- "top": 506,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack3",
- "top": 527,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack2",
- "top": 575,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
- }, {
- "type": "rack",
- "id": "rack1",
- "top": 596,
- "left": 529,
- "width": 1280,
- "height": 22,
- "minBayNo": 2,
- "maxBayNo": 56
+ "minBayNo": 1,
+ "maxBayNo": 47
}],
"rackDescs": [{
"type": "rackDescs",
@@ -170,33 +98,17 @@
}],
"crns": [{
"type": "track",
- "id": "lb_track4",
+ "id": "lb_track1",
"text": "",
"top": 226,
"left": 490,
- "width": 1300,
+ "width": 1050,
"height": 2
}, {
"type": "crane",
- "id": "crn-4",
- "text": "4",
+ "id": "crn-1",
+ "text": "1",
"top": 213,
- "left": 490,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track3",
- "text": "",
- "top": 338,
- "left": 490,
- "width": 1300,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 325,
"left": 490,
"width": 93,
"height": 22
@@ -204,31 +116,15 @@
"type": "track",
"id": "lb_track2",
"text": "",
- "top": 451,
+ "top": 338,
"left": 490,
- "width": 1300,
+ "width": 1050,
"height": 2
}, {
"type": "crane",
"id": "crn-2",
"text": "2",
- "top": 438,
- "left": 490,
- "width": 93,
- "height": 22
- },{
- "type": "track",
- "id": "lb_track1",
- "text": "",
- "top": 564,
- "left": 490,
- "width": 1300,
- "height": 2
- }, {
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 553,
+ "top": 325,
"left": 490,
"width": 93,
"height": 22
@@ -244,530 +140,338 @@
"floors": [{
"type": "floor",
"id": "page_floor1",
- "text": "1搴�",
+ "text": "1F",
"top": 4,
"left": 22,
"width": 1819,
"height": 668,
"stns": [{
"type": "stn",
- "id": "site-148",
- "text": "148",
- "top": 190,
- "left": 468,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-147",
- "text": "147",
- "top": 190,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-146",
- "text": "146",
- "top": 190,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-149",
- "text": "149",
- "top": 190,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-150",
- "text": "150",
- "top": 169,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-151",
- "text": "151",
- "top": 148,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-153",
- "text": "153",
- "top": 148,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-152",
- "text": "152",
- "top": 148,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-154",
- "text": "154",
- "top": 127,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-155",
- "text": "155",
- "top": 106.5,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-157",
- "text": "157",
- "top": 106.5,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-156",
- "text": "156",
- "top": 106.5,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-158",
- "text": "158",
- "top": 85.5,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-159",
- "text": "159",
- "top": 64.5,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-160",
- "text": "160",
- "top": 64.5,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-161",
- "text": "161",
- "top": 64.5,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-145",
- "text": "145",
- "top": 211,
- "left": 344.5,
- "width": 60,
- "height": 26
- }, {
- "type": "stn",
- "id": "site-142",
- "text": "142",
+ "id": "site-1045",
+ "text": "1045",
"top": 239,
- "left": 344.5,
- "width": 60,
+ "left": 365,
+ "width": 80,
"height": 19
}, {
"type": "stn",
- "id": "site-143",
- "text": "143",
+ "id": "site-1043",
+ "text": "1043",
"top": 239,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 239,
- "left": 468,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-141",
- "text": "141",
- "top": 260,
- "left": 344.5,
- "width": 60,
- "height": 42
- }, {
- "type": "stn",
- "id": "site-139",
- "text": "139",
- "top": 304,
- "left": 406,
- "width": 120,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-138",
- "text": "138",
- "top": 304,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-134",
- "text": "134",
- "top": 352,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-135",
- "text": "135",
- "top": 352,
- "left": 406,
- "width": 120,
+ "left": 448,
+ "width": 80,
"height": 19
}, {
"type": "stn",
- "id": "site-137",
- "text": "137",
- "top": 324.5,
- "left": 344.5,
- "width": 60,
- "height": 25.5
- }, {
- "type": "stn",
- "id": "site-133",
- "text": "133",
- "top": 373,
- "left": 344.5,
- "width": 60,
- "height": 42.5
- }, {
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 417,
- "left": 344.5,
- "width": 60,
+ "id": "site-1046",
+ "text": "1046",
+ "top": 352,
+ "left": 365,
+ "width": 80,
"height": 19
}, {
"type": "stn",
- "id": "site-131",
- "text": "131",
- "top": 417,
- "left": 406,
- "width": 120,
+ "id": "site-1044",
+ "text": "1044",
+ "top": 352,
+ "left": 448,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "track",
+ "id": "lb_track6",
+ "text": "",
+ "top": 180,
+ "left": 350,
+ "width": 2,
+ "height": 500
+ },{
+ "type": "track",
+ "id": "lb_track7",
+ "text": "",
+ "top": 180,
+ "left": 320,
+ "width": 2,
+ "height": 500
+ }, {
+ "type": "stn",
+ "id": "site-1047",
+ "text": "1047",
+ "top": 352,
+ "left": 282,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1040",
+ "text": "1040",
+ "top": 239,
+ "left": 118,
+ "width": 80,
"height": 19
}, {
"type": "stn",
- "id": "site-129",
- "text": "129",
- "top": 438,
- "left": 344.5,
- "width": 60,
- "height": 25
- }, {
- "type": "stn",
- "id": "site-126",
- "text": "126",
- "top": 464.5,
- "left": 344.5,
- "width": 60,
+ "id": "site-1041",
+ "text": "1041",
+ "top": 239,
+ "left": 200,
+ "width": 80,
"height": 19
- }, {
- "type": "stn",
- "id": "site-127",
- "text": "127",
- "top": 464.5,
- "left": 406,
- "width": 120,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-125",
- "text": "125",
- "top": 485,
- "left": 344.5,
- "width": 60,
- "height": 42.5
- }, {
- "type": "stn",
- "id": "site-124",
- "text": "124",
- "top": 529,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 529,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 529,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 529,
- "left": 468,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 550,
- "left": 344.5,
- "width": 60,
- "height": 25
- }, {
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 464.5,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 577,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 577,
- "left": 406,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 577,
- "left": 468,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 598,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 620,
- "left": 344.5,
- "width": 60,
- "height": 19
- }, {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 620,
- "left": 283,
- "width": 60,
- "height": 19
- }, {
- "type": "track",
- "id": "lb_trCart21",
- "text": "",
- "top": 65,
- "left": 226,
- "width": 6,
- "height": 742
- }, {
- "type": "track",
- "id": "lb_trCart22",
- "text": "",
- "top": 65,
- "left": 270,
- "width": 6,
- "height": 742
},{
"type": "stn",
- "id": "site-3",
- "text": "3",
- "top": -20,
- "left": 220,
- "width": 60,
+ "id": "site-1042",
+ "text": "1042",
+ "top": 400,
+ "left": 200,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-2",
- "text": "2",
- "top": -20,
- "left": 220,
- "width": 60,
+ "id": "site-1017",
+ "text": "1017",
+ "top": 189,
+ "left": 1510,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-1",
- "text": "1",
- "top": -20,
- "left": 220,
- "width": 60,
+ "id": "site-1016",
+ "text": "1016",
+ "top": 189,
+ "left": 1592,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 642,
- "left": 283,
- "width": 184,
+ "id": "site-1015",
+ "text": "1015",
+ "top": 189,
+ "left": 1674,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-999",
- "text": "澶囩敤PGV銆丷GV缁翠慨鍖�",
- "top": 642,
- "left": 283,
- "width": 184,
+ "id": "site-1014",
+ "text": "1014",
+ "top": 209,
+ "left": 1674,
+ "width": 80,
+ "height": 42
+ },{
+ "type": "stn",
+ "id": "site-1013",
+ "text": "1013",
+ "top": 253,
+ "left": 1674,
+ "width": 80,
+ "height": 45
+ },{
+ "type": "stn",
+ "id": "site-1029",
+ "text": "1029",
+ "top": 239,
+ "left": 1510,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 663,
- "left": 406,
- "width": 60,
+ "id": "site-1018",
+ "text": "1018",
+ "top": 239,
+ "left": 1592,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 663,
- "left": 344.5,
- "width": 60,
+ "id": "site-1019",
+ "text": "1019",
+ "top": 259,
+ "left": 1592,
+ "width": 80,
+ "height": 40
+ },{
+ "type": "stn",
+ "id": "site-1030",
+ "text": "1300",
+ "top": 300,
+ "left": 1510,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 663,
- "left": 283,
- "width": 60,
+ "id": "site-1020",
+ "text": "1200",
+ "top": 300,
+ "left": 1592,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 684,
- "left": 406,
- "width": 60,
+ "id": "site-1012",
+ "text": "1012",
+ "top": 300,
+ "left": 1674,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 705,
- "left": 406,
- "width": 60,
+ "id": "site-1011",
+ "text": "1011",
+ "top": 320,
+ "left": 1674,
+ "width": 80,
+ "height": 29
+ },{
+ "type": "stn",
+ "id": "site-1023",
+ "text": "1023",
+ "top": 300,
+ "left": 1756,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 705,
- "left": 283,
- "width": 122,
+ "id": "site-1024",
+ "text": "1024",
+ "top": 300,
+ "left": 1838,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 727,
- "left": 406,
- "width": 60,
+ "id": "site-1026",
+ "text": "1026",
+ "top": 320,
+ "left": 1838,
+ "width": 80,
+ "height": 29
+ },{
+ "type": "stn",
+ "id": "site-1027",
+ "text": "1027",
+ "top": 350,
+ "left": 1838,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 727,
- "left": 283,
- "width": 122,
+ "id": "site-1028",
+ "text": "1028",
+ "top": 370,
+ "left": 1838,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 749,
- "left": 406,
- "width": 60,
+ "id": "site-1021",
+ "text": "1021",
+ "top": 350,
+ "left": 1510,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 771,
- "left": 406,
- "width": 60,
+ "id": "site-1022",
+ "text": "1022",
+ "top": 350,
+ "left": 1592,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 771,
- "left": 344.5,
- "width": 60,
+ "id": "site-1010",
+ "text": "1010",
+ "top": 350,
+ "left": 1674,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 771,
- "left": 283,
- "width": 60,
+ "id": "site-1009",
+ "text": "1009",
+ "top": 370,
+ "left": 1674,
+ "width": 80,
"height": 19
- }, {
+ },{
"type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 792,
- "left": 283,
- "width": 184,
+ "id": "site-1008",
+ "text": "1008",
+ "top": 390,
+ "left": 1674,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1007",
+ "text": "1007",
+ "top": 410,
+ "left": 1674,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1006",
+ "text": "1006",
+ "top": 430,
+ "left": 1674,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1005",
+ "text": "1005",
+ "top": 450,
+ "left": 1674,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1002",
+ "text": "1002",
+ "top": 470,
+ "left": 1674,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1001",
+ "text": "1001",
+ "top": 470,
+ "left": 1756,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1000",
+ "text": "1000",
+ "top": 470,
+ "left": 1838,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1004",
+ "text": "1004",
+ "top": 490,
+ "left": 1674,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1003",
+ "text": "1003",
+ "top": 510,
+ "left": 1674,
+ "width": 80,
+ "height": 19
+ },{
+ "type": "stn",
+ "id": "site-1025",
+ "text": "1025",
+ "top": 350,
+ "left": 1756,
+ "width": 80,
"height": 19
}],
"barcode":[
--
Gitblit v1.9.1