From d103ee6b414eb772b36bd05f6bebe9e844d1f723 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 06 七月 2024 13:11:28 +0800
Subject: [PATCH] 基础配置修改
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 157 ++++
src/main/webapp/views/index.html | 2
src/main/webapp/static/js/console.map.js | 820 ++-------------------------
src/main/java/com/zy/core/MainProcess.java | 115 +--
pom.xml | 2
src/main/resources/application.yml | 535 +++++++++---------
src/main/java/com/zy/core/ServerBootstrap.java | 91 +-
7 files changed, 574 insertions(+), 1,148 deletions(-)
diff --git a/pom.xml b/pom.xml
index 01ecc09..a186ffc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>jtwcs</finalName>
+ <finalName>ghjtwcs</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 47b2ce4..bb9c5bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
@@ -21,7 +20,6 @@
import com.zy.common.utils.CollectionUtils;
import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.RedisUtil;
-import com.zy.common.utils.RgvUtils;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -881,6 +879,48 @@
}
}
}
+ /**
+ * 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
+ */
+ public synchronized void crnStnToOutStn1() {
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ // 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
+ for (CrnSlave.CrnStn crnStn : crnSlave.getCrnOutStn()) {
+ // 鏌ヨ宸ヤ綔妗�
+ WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(crnStn.getStaNo());
+ if (wrkMast == null) {
+ continue;
+ }
+ // 鍒ゆ柇宸ヤ綔妗ｆ潯浠�
+ if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
+ continue;
+ }
+ // 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol.statusType == CrnStatusType.FETCHING || crnProtocol.statusType == CrnStatusType.PUTTING) {
+ // 绉诲姩涓�
+ continue;
+ }
+ // 鍒ゆ柇鍫嗗灈鏈虹姸鎬佺瓑寰呯‘璁�
+ if (crnProtocol.modeType == CrnModeType.AUTO && crnProtocol.getTaskNo().equals(wrkMast.getWrkNo().shortValue())
+ && crnProtocol.statusType == CrnStatusType.WAITING
+ && crnProtocol.forkPosType == CrnForkPosType.HOME) {
+
+ // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
+ // 鏇存柊宸ヤ綔妗ｇ姸鎬佷负14
+ wrkMast.setWrkSts(13L);
+ wrkMast.setCrnEndTime(new Date());
+ if (wrkMastMapper.updateById(wrkMast) != 0) {
+ // 澶嶄綅鍫嗗灈鏈�
+ crnThread.setResetFlag(true);
+ } else {
+ log.error("鏇存柊宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负14澶辫触锛侊紒锛� [宸ヤ綔鍙�:{}]", wrkMast.getWrkNo());
+ }
+ }
+ }
+ }
+ }
/**
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
@@ -1275,28 +1315,28 @@
continue;
}
- boolean flag = false;
+ boolean flag = true;
// 鑾峰彇鍫嗗灈鏈哄叆搴撶珯淇℃伅
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
- StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- // 鏌ヨ绔欑偣璇︾粏淇℃伅
- BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
- if (staDetl == null) {
- log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
- continue;
- }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
- && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
- flag = true;
- }
- if (!flag) {
- continue;
- }
+// DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
+// StaProtocol staProtocol = devpThread.getStation().get(crnStn.getStaNo());
+// if (staProtocol == null) {
+// continue;
+// } else {
+// staProtocol = staProtocol.clone();
+// }
+// // 鏌ヨ绔欑偣璇︾粏淇℃伅
+// BasDevp staDetl = basDevpService.selectById(crnStn.getStaNo());
+// if (staDetl == null) {
+// log.error("鍏ュ簱 ===>> 鍫嗗灈鏈虹珯鐐瑰湪鏁版嵁搴撲笉瀛樺湪, 绔欑偣缂栧彿={}", crnStn.getStaNo());
+// continue;
+// }
+// if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
+// && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
+// flag = true;
+// }
+// if (!flag) {
+// continue;
+// }
// 鑾峰彇搴撲綅淇℃伅
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
@@ -1530,6 +1570,11 @@
public synchronized void locToCrnStn1(CrnSlave slave, CrnProtocol crnProtocol) {
List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep12(slave.getId());
for (WrkMast wrkMast : wrkMasts) {
+ // 鍒ゆ柇鍫嗗灈鏈虹珯鐐规槸鍚﹀彲鐢�
+ if (!crnEnabled(wrkMast)){
+ continue;
+ }
+
if (wrkMast == null) {
continue;
}
@@ -1678,6 +1723,72 @@
}
/**
+ * 纭鍑哄簱鐮佸ご鏄惁鍙敤
+ * @param wrkMast 宸ヤ綔妗�
+ * @return 鏄惁鍙敤
+ */
+ private boolean crnEnabled(WrkMast wrkMast) {
+
+ String url = "127.0.0.1";
+ String path = "/ghwcs/ca";
+
+ // 鑾峰彇璇锋眰澶�
+ Map<String,Object> headers = new HashMap<>();
+ headers.put("digi-type","sync ");
+ headers.put("digi-protocol","raw");
+ headers.put("digi-datakey"," XCommon.ImportData");
+
+ // 鏋勯�犺姹備綋
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("staNo", wrkMast.getSourceStaNo());
+ jsonObject.put("workNo", wrkMast.getWrkNo());
+ String body = jsonObject.toJSONString();
+
+ boolean success;
+ String response;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url)
+ .setPath(path)
+ .setHeaders(headers)
+ .setJson(body)
+ .build()
+ .doPost();
+ if (!Cools.isEmpty(response)) {
+ JSONObject jsonObject1 = JSONObject.parseObject(response);
+ if ((Integer) jsonObject1.get("code") == 200 && (Integer) jsonObject1.get("data") == 1){
+ success = true;
+ }else {
+ success = false;
+ }
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + path, body, response);
+ throw new CoolException("涓嬪彂鍑哄簱浠诲姟缁橤WCS(浠庡嚭搴撶爜澶村埌鍑哄簱鍙�)澶辫触");
+ }
+ } catch (Exception e) {
+ success = false;
+ log.error("纭鍑哄簱鐮佸ご鏄惁鍙敤寮傚父锛屽伐浣滃彿锛歿}锛寋}", wrkMast.getWrkNo(),e.getMessage());
+ } finally {
+
+// try {
+// // 淇濆瓨鎺ュ彛鏃ュ織
+// apiLogService.save(
+// "浠庡嚭搴撶爜澶村埌鍑哄簱鍙�",
+// MesConstant.URL + MesConstant.PAKIN_URL,
+// null,
+// "127.0.0.1",
+// jsonObject.toJSONString(),
+// response,
+// success
+// );
+// } catch (Exception e) {
+// log.error("鎺ュ彛鏃ュ織淇濆瓨寮傚父", e);
+// }
+ }
+ return success;
+ }
+
+ /**
* 鏌ユ壘宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級,涓擱GV鍏ュ簱鎺ラ┏绔欑鍚堢殑鐨勫叆搴撳伐浣滄。锛屾彁鍙栧嚭鏈�澶�2绗�
* @param slave
* @return
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index e86a7d6..eaec6a4 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -5,11 +5,9 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
-import java.util.ArrayList;
/**
* WCS涓绘祦绋�
@@ -48,24 +46,25 @@
//鍒濆鍖朢GV鍦板浘
// mainService.initRgvMap();
//鍒锋柊RGV鍦板浘
- mainService.refreshRgvMap();
+// mainService.refreshRgvMap();
// 婕旂ず
// mainService.crnDemoOfLocMove1();
// 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁�
// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile(); // 缁勬墭
+// mainService.generateStoreWrkFile(); // 缁勬墭
// 鍏ュ簱 ===>> 鐮佸灈浣嶈幏鍙栫┖鏉挎潯鐮佷俊鎭�
- mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
- mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+// mainService.generateStoreWrkFileFull2LouM(); // 缁勬墭
+// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
+// mainService.stnToCrnStnPick();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃�
- mainService.stnToCrnStnPick2();
+// mainService.stnToCrnStnPick2();
// 2妤�212鍛煎彨绌烘澘
- mainService.stnToCrnStnPick3Auto(i);
+// mainService.stnToCrnStnPick3Auto(i);
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
+ mainService.crnStnToOutStn1();
+// mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
// 鍏ュ嚭搴撳寮� ===>> 鍫嗗灈鏈哄懡浠や笅鍙戝悗锛屽紓姝ヤ慨鏀瑰伐浣滄。鐘舵��
@@ -74,42 +73,42 @@
mainService.storeFinished();
/////////////////////////////////////RGV璋冨害/////////////////////////////////////
- i++;
- k++;
- if (i<7) {
- // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
- try{
- boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
- if (rgvIoExecuteSign){
- k = 0;
- } else if (k>7){
- k = 0;
- mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
- }
- }catch (Exception e){
- log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
- }
- }else {
- i = 0;
- }
- //瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
- /////////////////////////////////////RGV璋冨害/////////////////////////////////////
-
- // 寮傚父淇℃伅璁板綍
- mainService.recErr();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� 2妤�
- mainService.storeEmptyPlt();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
- mainService.storeEmptyPlt3();
- // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
- mainService.storeEmptyPlt2();
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃� 绌烘澘鍙犵洏
- mainService.storeEmptyPlt4();
- // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
- mainService.ledExecute();
- // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
- mainService.ledReset();
+// i++;
+// k++;
+// if (i<7) {
+// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
+// try{
+// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);
+// if (rgvIoExecuteSign){
+// k = 0;
+// } else if (k>7){
+// k = 0;
+// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
+// }
+// }catch (Exception e){
+// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
+// }
+// }else {
+// i = 0;
+// }
+// //瀹屾垚灏忚溅浠诲姟
+// mainService.rgvCompleteWrkMastSta();
+// /////////////////////////////////////RGV璋冨害/////////////////////////////////////
+//
+// // 寮傚父淇℃伅璁板綍
+// mainService.recErr();
+// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� 2妤�
+// mainService.storeEmptyPlt();
+// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満绌烘澘鍏ュ簱
+// mainService.storeEmptyPlt3();
+// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,1妤煎彔鐩樻満鍙犵洏
+// mainService.storeEmptyPlt2();
+// // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱鎷嗙洏鍖� 1妤兼媶鍨涗綅缃� 绌烘澘鍙犵洏
+// mainService.storeEmptyPlt4();
+// // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+// mainService.ledExecute();
+// // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+// mainService.ledReset();
// // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
// i++;
@@ -124,18 +123,18 @@
// //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
// mainService.scanBarcodeEmptyBoard();
- //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
- mainService.stackingCompletionDriveTray();
- //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 鍑哄簱鑷虫湀鍙板嚭搴撳彛
- mainService.stackingCompletionDriveTray2();
- //璐存爣瀹屾垚缁х画涓嬩竴姝�
-// mainService.stackingCompletionDriveTray3();
- //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 杩愯閫斾腑鑷姩閬胯绌烘澘
- mainService.stackingCompletionDriveTray4();
- //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
- mainService.stackingCompletionDriveTrayOk2();
- //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
- mainService.stackingCompletionDriveTrayOk3();
+// //鐮佸灈瀹屾垚椹卞姩鎵樼洏涓嬩竴姝ユ壂鐮佸叆搴�
+// mainService.stackingCompletionDriveTray();
+// //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 鍑哄簱鑷虫湀鍙板嚭搴撳彛
+// mainService.stackingCompletionDriveTray2();
+// //璐存爣瀹屾垚缁х画涓嬩竴姝�
+//// mainService.stackingCompletionDriveTray3();
+// //鎷嗗灈瀹屾垚缁х画涓嬩竴姝� 杩愯閫斾腑鑷姩閬胯绌烘澘
+// mainService.stackingCompletionDriveTray4();
+// //鎷嗗灈瀹屾垚鎵樼洏缁х画涓嬩竴姝�
+// mainService.stackingCompletionDriveTrayOk2();
+// //閫�璐х爜鍨涘畬鎴愭墭鐩樼户缁笅涓�姝�
+// mainService.stackingCompletionDriveTrayOk3();
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 7a274af..959edfe 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -4,11 +4,8 @@
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
-import com.zy.core.model.DevpSlave;
-import com.zy.core.model.LedSlave;
-import com.zy.core.model.RgvSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.SiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -61,25 +58,25 @@
MessageQueue.init(SlaveType.Crn, crn);
}
// 鍒濆鍖栧爢鍨涙満mq
- for (Slave rgv : slaveProperties.getRgv()) {
- MessageQueue.init(SlaveType.Rgv, rgv);
- }
- // 鍒濆鍖栬緭閫佺嚎mq
- for (Slave devp : slaveProperties.getDevp()) {
- MessageQueue.init(SlaveType.Devp, devp);
- }
- // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
- for (Slave barcode : slaveProperties.getBarcode()) {
- MessageQueue.init(SlaveType.Barcode, barcode);
- }
- // 鍒濆鍖朙ed鐏痬q
- for (Slave led : slaveProperties.getLed()) {
- MessageQueue.init(SlaveType.Led, led);
- }
- // 鍒濆鍖栫绉癿q
- for (Slave scale : slaveProperties.getScale()) {
- MessageQueue.init(SlaveType.Scale, scale);
- }
+// for (Slave rgv : slaveProperties.getRgv()) {
+// MessageQueue.init(SlaveType.Rgv, rgv);
+// }
+// // 鍒濆鍖栬緭閫佺嚎mq
+// for (Slave devp : slaveProperties.getDevp()) {
+// MessageQueue.init(SlaveType.Devp, devp);
+// }
+// // 鍒濆鍖栨潯鐮佹壂鎻忎华mq
+// for (Slave barcode : slaveProperties.getBarcode()) {
+// MessageQueue.init(SlaveType.Barcode, barcode);
+// }
+// // 鍒濆鍖朙ed鐏痬q
+// for (Slave led : slaveProperties.getLed()) {
+// MessageQueue.init(SlaveType.Led, led);
+// }
+// // 鍒濆鍖栫绉癿q
+// for (Slave scale : slaveProperties.getScale()) {
+// MessageQueue.init(SlaveType.Scale, scale);
+// }
// // 鍒濆鍖栧彴杞q
// for (Slave car : slaveProperties.getCar()) {
// MessageQueue.init(SlaveType.Car, car);
@@ -97,34 +94,34 @@
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
// 鍒濆鍖栫┛姊溅绾跨▼
- log.info("鍒濆鍖朢GV绾跨▼...................................................");
- for (RgvSlave rgv : slaveProperties.getRgv()) {
- RgvThread rgvThread = new RgvThread(rgv);
- new Thread((Runnable) rgvThread).start();
- SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
- }
+// log.info("鍒濆鍖朢GV绾跨▼...................................................");
+// for (RgvSlave rgv : slaveProperties.getRgv()) {
+// RgvThread rgvThread = new RgvThread(rgv);
+// new Thread((Runnable) rgvThread).start();
+// SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
+// }
// 鍒濆鍖栬緭閫佺嚎绾跨▼
- log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = new SiemensDevpThread(devp);
- new Thread((Runnable) devpThread).start();
- SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
- }
+// log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
+// for (DevpSlave devp : slaveProperties.getDevp()) {
+// DevpThread devpThread = new SiemensDevpThread(devp);
+// new Thread((Runnable) devpThread).start();
+// SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
+// }
// 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
- log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
- for (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = new BarcodeThread(barcode);
-// new Thread(barcodeThread).start();
- SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
- }
+// log.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+// for (Slave barcode : slaveProperties.getBarcode()) {
+// BarcodeThread barcodeThread = new BarcodeThread(barcode);
+//// new Thread(barcodeThread).start();
+// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+// }
// 鍒濆鍖朙ED绾跨▼
- log.info("鍒濆鍖朙ED绾跨▼...................................................");
- for (LedSlave led : slaveProperties.getLed()) {
- LedThread ledThread = new LedThread(led);
- new Thread(ledThread).start();
- SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
- }
+// log.info("鍒濆鍖朙ED绾跨▼...................................................");
+// for (LedSlave led : slaveProperties.getLed()) {
+// LedThread ledThread = new LedThread(led);
+// new Thread(ledThread).start();
+// SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
+// }
// 鍒濆鍖栫绉ょ嚎绋�
// log.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
// for (Slave scale : slaveProperties.getScale()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 489881e..cfeeadf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
+# url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghjtasrs
username: sa
password: sa@123
mvc:
@@ -36,7 +37,7 @@
enable: false
wms:
- url: 127.0.0.1:8080/jtwms
+ url: 127.0.0.1:8080/ghjtwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -58,29 +59,29 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2061
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 201
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3001
row: 3
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2062
row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 200
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3002
row: 2
bay: 1
lev: 2
@@ -96,29 +97,29 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2064
row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 203
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3004
row: 7
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2065
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 202
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3003
row: 6
bay: 1
lev: 2
@@ -134,29 +135,29 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2067
row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 205
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3005
row: 11
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2068
row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 204
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3006
row: 10
bay: 1
lev: 2
@@ -172,29 +173,29 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2071
row: 15
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 207
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3007
row: 15
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 109
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2070
row: 14
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 206
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3008
row: 14
bay: 1
lev: 2
@@ -210,29 +211,29 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2074
row: 19
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 209
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3010
row: 19
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2073
row: 18
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 208
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3009
row: 18
bay: 1
lev: 2
@@ -248,254 +249,254 @@
demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 117
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2077
row: 23
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 211
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3011
row: 23
bay: 1
lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 115
+# devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 2076
row: 22
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 210
+# devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 3012
row: 22
bay: 1
lev: 2
# RGV绌挎杞�1
- rgv[0]:
- id: 1
- ip: 192.168.18.77
- 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[0]:
+# id: 1
+# ip: 192.168.18.77
+# 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: 192.168.18.79
- 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[1]:
+# id: 2
+# ip: 192.168.18.79
+# 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
# 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 192.168.18.71
- port: 102
- rack: 0
- slot: 0
- # WMS鍏ュ簱鍙�1
- inWmsSta[0]:
- staNo: 145
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 122
- # 鎷嗗灈鍙犵洏鍙�1
- emptyInSta2[0]:
- staNo: 118
- # 鎷嗗灈鍙犵洏鍙�2
- emptyInSta2[1]:
- staNo: 119
- # 鎷嗗灈鍙犵洏鍙�3
- emptyInSta2[2]:
- staNo: 120
- # 鎷嗗灈鍙犵洏鍙�4
- emptyInSta2[3]:
- staNo: 121
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 122
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[0]:
- staNo: 118
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[1]:
- staNo: 119
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[2]:
- staNo: 120
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta2[3]:
- staNo: 121
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 122
- # Rgv鍑哄簱鍙�1
- outRgvSta[0]:
- staNo: 102
- # Rgv鍑哄簱鍙�1
- outRgvSta[1]:
- staNo: 105
- # Rgv鍑哄簱鍙�1
- outRgvSta[2]:
- staNo: 108
- # Rgv鍑哄簱鍙�1
- outRgvSta[3]:
- staNo: 111
- # Rgv鍑哄簱鍙�1
- outRgvSta[4]:
- staNo: 114
- # Rgv鍑哄簱鍙�1
- outRgvSta[5]:
- staNo: 117
- # Rgv鍏ュ簱鍙�1
- inRgvSta[0]:
- staNo: 118
- # Rgv鍏ュ簱鍙�1
- inRgvSta[1]:
- staNo: 119
- # Rgv鍏ュ簱鍙�1
- inRgvSta[2]:
- staNo: 120
- # Rgv鍏ュ簱鍙�1
- inRgvSta[3]:
- staNo: 121
- # Rgv鍏ュ簱鍙�1
- inRgvSta[4]:
- staNo: 122
- # Rgv鍏ュ簱鍙�1
- inRgvSta[5]:
- staNo: 123
+# devp[0]:
+# id: 1
+# ip: 192.168.18.71
+# port: 102
+# rack: 0
+# slot: 0
+# # WMS鍏ュ簱鍙�1
+# inWmsSta[0]:
+# staNo: 145
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 122
+# # 鎷嗗灈鍙犵洏鍙�1
+# emptyInSta2[0]:
+# staNo: 118
+# # 鎷嗗灈鍙犵洏鍙�2
+# emptyInSta2[1]:
+# staNo: 119
+# # 鎷嗗灈鍙犵洏鍙�3
+# emptyInSta2[2]:
+# staNo: 120
+# # 鎷嗗灈鍙犵洏鍙�4
+# emptyInSta2[3]:
+# staNo: 121
+# # 鍑哄簱鍙�1
+# outSta[0]:
+# staNo: 122
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta2[0]:
+# staNo: 118
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta2[1]:
+# staNo: 119
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta2[2]:
+# staNo: 120
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta2[3]:
+# staNo: 121
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 122
+# # Rgv鍑哄簱鍙�1
+# outRgvSta[0]:
+# staNo: 102
+# # Rgv鍑哄簱鍙�1
+# outRgvSta[1]:
+# staNo: 105
+# # Rgv鍑哄簱鍙�1
+# outRgvSta[2]:
+# staNo: 108
+# # Rgv鍑哄簱鍙�1
+# outRgvSta[3]:
+# staNo: 111
+# # Rgv鍑哄簱鍙�1
+# outRgvSta[4]:
+# staNo: 114
+# # Rgv鍑哄簱鍙�1
+# outRgvSta[5]:
+# staNo: 117
+# # Rgv鍏ュ簱鍙�1
+# inRgvSta[0]:
+# staNo: 118
+# # Rgv鍏ュ簱鍙�1
+# inRgvSta[1]:
+# staNo: 119
+# # Rgv鍏ュ簱鍙�1
+# inRgvSta[2]:
+# staNo: 120
+# # Rgv鍏ュ簱鍙�1
+# inRgvSta[3]:
+# staNo: 121
+# # Rgv鍏ュ簱鍙�1
+# inRgvSta[4]:
+# staNo: 122
+# # Rgv鍏ュ簱鍙�1
+# inRgvSta[5]:
+# staNo: 123
# 杈撻�佺嚎
- devp[1]:
- id: 2
- ip: 192.168.18.81
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 217
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[2].id}
- # 鍏ュ簱鍙�1
- inSta[1]:
- staNo: 221
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # WMS鍏ュ簱鍙�1
- inWmsSta[0]:
- staNo: 212
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 212
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 212
- # 鍑哄簱鍙�1
- outSta[1]:
- staNo: 213
- # 鎷ｆ枡鍏ュ簱鍙�1
- pickSta[0]:
- staNo: 212
- # 2妤肩爜鍨涗綅缃�
- driveSta[0]:
- staNo: 215
- barcode: ${wcs-slave.barcode[3].id}
- # 2妤肩爜鍨涗綅缃�
- driveSta[1]:
- staNo: 219
- barcode: ${wcs-slave.barcode[4].id}
+# devp[1]:
+# id: 2
+# ip: 192.168.18.81
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍏ュ簱鍙�1
+# inSta[0]:
+# staNo: 217
+# barcode: ${wcs-slave.barcode[0].id}
+# led: ${wcs-slave.led[2].id}
+# # 鍏ュ簱鍙�1
+# inSta[1]:
+# staNo: 221
+# barcode: ${wcs-slave.barcode[1].id}
+# led: ${wcs-slave.led[1].id}
+# # WMS鍏ュ簱鍙�1
+# inWmsSta[0]:
+# staNo: 212
+# # 绌烘澘鍏ュ簱鍙�1
+# emptyInSta[0]:
+# staNo: 212
+# # 鍑哄簱鍙�1
+# outSta[0]:
+# staNo: 212
+# # 鍑哄簱鍙�1
+# outSta[1]:
+# staNo: 213
+# # 鎷ｆ枡鍏ュ簱鍙�1
+# pickSta[0]:
+# staNo: 212
+# # 2妤肩爜鍨涗綅缃�
+# driveSta[0]:
+# staNo: 215
+# barcode: ${wcs-slave.barcode[3].id}
+# # 2妤肩爜鍨涗綅缃�
+# driveSta[1]:
+# staNo: 219
+# barcode: ${wcs-slave.barcode[4].id}
- # 鏉＄爜鎵弿浠�
- barcode[0]:
- id: 1
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[2]:
- id: 3
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[3]:
- id: 4
- ip: 10.10.10.52
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[4]:
- id: 5
- ip: 10.10.10.52
- port: 51236
- # LED1
- led[0]:
- id: 1
- ip: 192.168.18.5
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 144
- # LED2
- led[1]:
- id: 2
- ip: 192.168.18.6
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 221
- # LED3
- led[2]:
- id: 3
- ip: 192.168.18.7
- port: 5005
- devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 217
\ No newline at end of file
+# # 鏉＄爜鎵弿浠�
+# barcode[0]:
+# id: 1
+# ip: 10.10.10.52
+# port: 51236
+# # 鏉＄爜鎵弿浠�
+# barcode[1]:
+# id: 2
+# ip: 10.10.10.52
+# port: 51236
+# # 鏉＄爜鎵弿浠�
+# barcode[2]:
+# id: 3
+# ip: 10.10.10.52
+# port: 51236
+# # 鏉＄爜鎵弿浠�
+# barcode[3]:
+# id: 4
+# ip: 10.10.10.52
+# port: 51236
+# # 鏉＄爜鎵弿浠�
+# barcode[4]:
+# id: 5
+# ip: 10.10.10.52
+# port: 51236
+# # LED1
+# led[0]:
+# id: 1
+# ip: 192.168.18.5
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staArr: 144
+# # LED2
+# led[1]:
+# id: 2
+# ip: 192.168.18.6
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 221
+# # LED3
+# led[2]:
+# id: 3
+# ip: 192.168.18.7
+# port: 5005
+# devpPlcId: ${wcs-slave.devp[1].id}
+# staArr: 217
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index cf748bb..b5b32e0 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -10,8 +10,8 @@
"type": "rack",
"id": "rack1",
"top": 45,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -19,8 +19,8 @@
"type": "rack",
"id": "rack2",
"top": 67,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -28,8 +28,8 @@
"type": "rack",
"id": "rack3",
"top": 115,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -37,8 +37,8 @@
"type": "rack",
"id": "rack4",
"top": 137,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -46,8 +46,8 @@
"type": "rack",
"id": "rack5",
"top": 159,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -55,8 +55,8 @@
"type": "rack",
"id": "rack6",
"top": 181,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -64,8 +64,8 @@
"type": "rack",
"id": "rack7",
"top": 229,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -73,8 +73,8 @@
"type": "rack",
"id": "rack8",
"top": 251,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -82,8 +82,8 @@
"type": "rack",
"id": "rack9",
"top": 273,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -91,8 +91,8 @@
"type": "rack",
"id": "rack10",
"top": 295,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -100,8 +100,8 @@
"type": "rack",
"id": "rack11",
"top": 343,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -109,8 +109,8 @@
"type": "rack",
"id": "rack12",
"top": 365,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -118,8 +118,8 @@
"type": "rack",
"id": "rack13",
"top": 387,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -127,8 +127,8 @@
"type": "rack",
"id": "rack14",
"top": 409,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -136,8 +136,8 @@
"type": "rack",
"id": "rack15",
"top": 457,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -145,8 +145,8 @@
"type": "rack",
"id": "rack16",
"top": 479,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -154,8 +154,8 @@
"type": "rack",
"id": "rack17",
"top": 501,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -163,8 +163,8 @@
"type": "rack",
"id": "rack18",
"top": 523,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -172,8 +172,8 @@
"type": "rack",
"id": "rack19",
"top": 571,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -181,8 +181,8 @@
"type": "rack",
"id": "rack20",
"top": 593,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -190,8 +190,8 @@
"type": "rack",
"id": "rack21",
"top": 615,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -199,8 +199,8 @@
"type": "rack",
"id": "rack22",
"top": 637,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -208,8 +208,8 @@
"type": "rack",
"id": "rack23",
"top": 685,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -217,8 +217,8 @@
"type": "rack",
"id": "rack24",
"top": 707,
- "left": 650,
- "width": 917,
+ "left": 350,
+ "width": 1220,
"height": 22,
"minBayNo": 2,
"maxBayNo": 29
@@ -244,7 +244,7 @@
"id": "lb_desc100",
"text": "<=鍑哄簱<=",
"top": 48,
- "left": 550,
+ "left": 260,
"width": 100,
"height": 23
}, {
@@ -252,31 +252,7 @@
"id": "lb_desc103",
"text": "=>鍏ュ簱=>",
"top": 138,
- "left": 550,
- "width": 100,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc117",
- "text": "=>鍏ュ簱=>",
- "top": 707,
- "left": 550,
- "width": 100,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc103",
- "text": "<=鍑哄簱<=",
- "top": 162,
- "left": 550,
- "width": 100,
- "height": 23
- }, {
- "type": "rackDescs",
- "id": "lb_desc105",
- "text": "=>鍏ュ簱=>",
- "top": 252,
- "left": 550,
+ "left": 260,
"width": 100,
"height": 23
}],
@@ -285,7 +261,7 @@
"id": "crn-1",
"text": "1",
"top": 96,
- "left": 739,
+ "left": 350,
"width": 93,
"height": 22
}, {
@@ -293,15 +269,15 @@
"id": "lb_track1",
"text": "",
"top": 106,
- "left": 573,
- "width": 1042,
+ "left": 350,
+ "width": 1220,
"height": 2
}, {
"type": "crane",
"id": "crn-2",
"text": "2",
"top": 210,
- "left": 739,
+ "left": 350,
"width": 93,
"height": 22
}, {
@@ -309,15 +285,15 @@
"id": "lb_track2",
"text": "",
"top": 220,
- "left": 573,
- "width": 1042,
+ "left": 350,
+ "width": 1220,
"height": 2
}, {
"type": "crane",
"id": "crn-3",
"text": "3",
"top": 324,
- "left": 739,
+ "left": 350,
"width": 93,
"height": 22
}, {
@@ -325,15 +301,15 @@
"id": "lb_track3",
"text": "",
"top": 334,
- "left": 573,
- "width": 1042,
+ "left": 350,
+ "width": 1220,
"height": 2
}, {
"type": "crane",
"id": "crn-4",
"text": "4",
"top": 438,
- "left": 739,
+ "left": 350,
"width": 93,
"height": 22
}, {
@@ -341,15 +317,15 @@
"id": "lb_track4",
"text": "",
"top": 448,
- "left": 573,
- "width": 1042,
+ "left": 350,
+ "width": 1220,
"height": 2
}, {
"type": "crane",
"id": "crn-5",
"text": "5",
"top": 552,
- "left": 739,
+ "left": 350,
"width": 93,
"height": 22
}, {
@@ -357,15 +333,15 @@
"id": "lb_track5",
"text": "",
"top": 562,
- "left": 573,
- "width": 1042,
+ "left": 350,
+ "width": 1220,
"height": 2
}, {
"type": "crane",
"id": "crn-6",
"text": "6",
"top": 666,
- "left": 739,
+ "left": 350,
"width": 93,
"height": 22
}, {
@@ -373,8 +349,8 @@
"id": "lb_track6",
"text": "",
"top": 676,
- "left": 573,
- "width": 1042,
+ "left": 350,
+ "width": 1220,
"height": 2
}],
"areas": [{
@@ -393,665 +369,7 @@
"left": 22,
"width": 1374,
"height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 69,
- "left": 601,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 69,
- "left": 550,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 117,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 183,
- "left": 601,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 183,
- "left": 550,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 231,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-106",
- "text": "106",
- "top": 297,
- "left": 601,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-107",
- "text": "107",
- "top": 297,
- "left": 550,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-108",
- "text": "108",
- "top": 345,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-109",
- "text": "109",
- "top": 411,
- "left": 601,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-110",
- "text": "110",
- "top": 411,
- "left": 550,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 459,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-112",
- "text": "112",
- "top": 525,
- "left": 601,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 525,
- "left": 550,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 573,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-1142",
- "text": "1142",
- "top": 600,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-115",
- "text": "115",
- "top": 639,
- "left": 601,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-116",
- "text": "116",
- "top": 639,
- "left": 550,
- "width": 49,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-117",
- "text": "117",
- "top": 687,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "track",
- "id": "lb_trCart21",
- "text": "",
- "top": 45,
- "left": 473,
- "width": 6,
- "height": 684
- }, {
- "type": "track",
- "id": "lb_trCart22",
- "text": "",
- "top": 45,
- "left": 527,
- "width": 6,
- "height": 684
- }, {
- "type": "stn",
- "id": "site-1",
- "text": "1",
- "top": 257,
- "left": 469,
- "width": 69,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-2",
- "text": "2",
- "top": 457,
- "left": 469,
- "width": 69,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 297,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-131",
- "text": "131",
- "top": 319,
- "left": 266,
- "width": 100,
- "height": 34
- }, {
- "type": "stn",
- "id": "site-145",
- "text": "145",
- "top": 319,
- "left": 173,
- "width": 30,
- "height": 34
- }, {
- "type": "stn",
- "id": "site-146",
- "text": "146",
- "top": 319,
- "left": 204,
- "width": 30,
- "height": 34
- }, {
- "type": "stn",
- "id": "site-147",
- "text": "147",
- "top": 319,
- "left": 235,
- "width": 30,
- "height": 34
- }, {
- "type": "stn",
- "id": "site-132",
- "text": "132",
- "top": 355,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-133",
- "text": "133",
- "top": 377,
- "left": 266,
- "width": 100,
- "height": 42
- }, {
- "type": "stn",
- "id": "site-134",
- "text": "134",
- "top": 421,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-135",
- "text": "135",
- "top": 443,
- "left": 266,
- "width": 100,
- "height": 34
- }, {
- "type": "stn",
- "id": "site-136",
- "text": "136",
- "top": 479,
- "left": 266,
- "width": 100,
- "height": 39
- }, {
- "type": "stn",
- "id": "site-137",
- "text": "137",
- "top": 520,
- "left": 266,
- "width": 100,
- "height": 34
- }, {
- "type": "stn",
- "id": "site-138",
- "text": "138",
- "top": 556,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-139",
- "text": "139",
- "top": 578,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-140",
- "text": "140",
- "top": 600,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-141",
- "text": "141",
- "top": 622,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-142",
- "text": "142",
- "top": 644,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-143",
- "text": "143",
- "top": 666,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-144",
- "text": "144",
- "top": 688,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-118",
- "text": "118",
- "top": 297,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-119",
- "text": "119",
- "top": 355,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-120",
- "text": "120",
- "top": 421,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-121",
- "text": "121",
- "top": 479,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-122",
- "text": "122",
- "top": 183,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-123",
- "text": "123",
- "top": 556,
- "left": 368,
- "width": 100,
- "height": 20
- }]
- }, {
- "type": "floor",
- "id": "page_floor2",
- "text": "1F2c",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-130",
- "text": "130",
- "top": 297,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-153",
- "text": "153",
- "top": 402,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-152",
- "text": "152",
- "top": 424,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-151",
- "text": "151",
- "top": 446,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-150",
- "text": "150",
- "top": 468,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-149",
- "text": "149",
- "top": 490,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-148",
- "text": "148",
- "top": 512,
- "left": 266,
- "width": 100,
- "height": 20
- }]
- }, {
- "type": "floor",
- "id": "page_floor2",
- "text": "2F",
- "top": 4,
- "left": 22,
- "width": 1374,
- "height": 672,
- "stns": [{
- "type": "stn",
- "id": "site-200",
- "text": "200",
- "top": 69,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-201",
- "text": "201",
- "top": 117,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-202",
- "text": "202",
- "top": 183,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 231,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-204",
- "text": "204",
- "top": 297,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-205",
- "text": "205",
- "top": 345,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-206",
- "text": "206",
- "top": 411,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-207",
- "text": "207",
- "top": 459,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-208",
- "text": "208",
- "top": 525,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-209",
- "text": "209",
- "top": 573,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-210",
- "text": "210",
- "top": 639,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-211",
- "text": "211",
- "top": 687,
- "left": 550,
- "width": 100,
- "height": 20
- }, {
- "type": "track",
- "id": "lb_trCart21",
- "text": "",
- "top": 45,
- "left": 473,
- "width": 6,
- "height": 684
- }, {
- "type": "track",
- "id": "lb_trCart22",
- "text": "",
- "top": 45,
- "left": 527,
- "width": 6,
- "height": 684
- }, {
- "type": "stn",
- "id": "site-2000",
- "text": "2000",
- "top": 457,
- "left": 469,
- "width": 69,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-212",
- "text": "212",
- "top": 45,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-213",
- "text": "213",
- "top": 600,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-214",
- "text": "214",
- "top": 600,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-215",
- "text": "215",
- "top": 578,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-216",
- "text": "216",
- "top": 556,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-217",
- "text": "217",
- "top": 556,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-218",
- "text": "218",
- "top": 622,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-219",
- "text": "219",
- "top": 644,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-220",
- "text": "220",
- "top": 666,
- "left": 266,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-221",
- "text": "221",
- "top": 666,
- "left": 368,
- "width": 100,
- "height": 20
- }, {
- "type": "stn",
- "id": "site-222",
- "text": "222",
- "top": 688,
- "left": 266,
- "width": 100,
- "height": 20
- }]
+ "stns": []
}]
}]
}
\ No newline at end of file
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index f79598b..c42dd6a 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -27,7 +27,7 @@
<!-- 涓讳綋鍐呭 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
- Copyright 漏 2023 All Rights Reserved. <a href="https://www.zoneyung.com" target="_blank">寰愬伐姹変簯</a> 淇濈暀鎵�鏈夋潈鍒�
+ Copyright 漏 2023 All Rights Reserved. <a href="https://www.zoneyung.com" target="_blank">鍐犻缚姹熼摐</a> 淇濈暀鎵�鏈夋潈鍒�
</footer>
</body>
<script>
--
Gitblit v1.9.1