From f20522a7ecaf8789e14e083c6b2d92078f42b359 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 27 十一月 2025 16:12:16 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 270 +++++++++++++++---------------
src/main/webapp/static/js/console.map.js | 105 -----------
src/main/java/com/zy/core/MainProcess.java | 10
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 20 -
src/main/resources/application.yml | 76 +++++---
5 files changed, 194 insertions(+), 287 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index bfefac2..cfda377 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -136,7 +136,7 @@
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
&& staProtocol.getWorkNo() == 9999
- && staProtocol.isPakMk() && (staProtocol.getEmptyInType() != 1 && staProtocol.getEmptyInType() != 2)) {
+ && staProtocol.isPakMk()) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
String barcode = barcodeThread.getBarcode();
@@ -197,17 +197,17 @@
continue;
}
- if (inSta.getStaNo() == 1002 || inSta.getStaNo() == 1007) {
- //妫�娴嬫槸鍚︽湁鍑哄簱浠诲姟
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 101, 103, 107)
- .in("sta_no", 1003, 1004)
- );
- if (!wrkMasts.isEmpty()) {
- News.error("" + mark + " - 4" + " - 鍏ュ簱锛屾娴嬪瓨鍦ㄥ嚭搴撲换鍔★紝绛夊緟鍑哄簱浠诲姟鎵ц瀹屾垚,鎵樼洏鐮�={}", barcode);
- continue;
- }
- }
+// if (inSta.getStaNo() == 1002 || inSta.getStaNo() == 1007) {
+// //妫�娴嬫槸鍚︽湁鍑哄簱浠诲姟
+// List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("io_type", 101, 103, 107)
+// .in("sta_no", 1003, 1004)
+// );
+// if (!wrkMasts.isEmpty()) {
+// News.error("" + mark + " - 4" + " - 鍏ュ簱锛屾娴嬪瓨鍦ㄥ嚭搴撲换鍔★紝绛夊緟鍑哄簱浠诲姟鎵ц瀹屾垚,鎵樼洏鐮�={}", barcode);
+// continue;
+// }
+// }
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
@@ -232,14 +232,14 @@
short staNo = dto.getStaNo().shortValue();
- int sourceStaNo = dto.getSourceStaNo();
- if (sourceStaNo == 1007) {
- staNo = 2002;
- }
-
- if (inSta.getStaNo() == 1002) {
- staNo = 2002;
- }
+// int sourceStaNo = dto.getSourceStaNo();
+// if (sourceStaNo == 1007) {
+// staNo = 2002;
+// }
+//
+// if (inSta.getStaNo() == 1002) {
+// staNo = 2002;
+// }
barcodeThread.setBarcode("");
staProtocol.setWorkNo(dto.getWorkNo().shortValue());
@@ -420,7 +420,7 @@
// 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
- staProtocol.setPalletSize(locMast.getLocType2());
+// staProtocol.setPalletSize(locMast.getLocType2());
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (!result) {
@@ -1015,16 +1015,16 @@
continue;
}
- if (crnProtocol.getCrnNo() == 1) {
- //鍒ゆ柇鍫嗗灈鏈哄拰褰撳墠浠诲姟鏄惁澶勪簬涓�涓贩閬�
- if (Utils.getLaneByLocNo(wrkMast.getLocNo()) != crnProtocol.getCrnLane()) {
- //鍒ゆ柇鍫嗗灈鏈烘墍鍦ㄥ贩閬撴槸鍚﹀瓨鍦ㄥ叾浠栦换鍔★紝濡傚瓨鍦ㄥ垯浼樺厛鎵ц
- List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
-// if (!currentWrkMasts.isEmpty()) {
-// continue;//褰撳墠鍫嗗灈鏈烘墍鍦ㄥ贩閬撳瓨鍦ㄤ换鍔�
-// }
- }
- }
+// if (crnProtocol.getCrnNo() == 1) {
+// //鍒ゆ柇鍫嗗灈鏈哄拰褰撳墠浠诲姟鏄惁澶勪簬涓�涓贩閬�
+// if (Utils.getLaneByLocNo(wrkMast.getLocNo()) != crnProtocol.getCrnLane()) {
+// //鍒ゆ柇鍫嗗灈鏈烘墍鍦ㄥ贩閬撴槸鍚﹀瓨鍦ㄥ叾浠栦换鍔★紝濡傚瓨鍦ㄥ垯浼樺厛鎵ц
+// List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
+//// if (!currentWrkMasts.isEmpty()) {
+//// continue;//褰撳墠鍫嗗灈鏈烘墍鍦ㄥ贩閬撳瓨鍦ㄤ换鍔�
+//// }
+// }
+// }
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, wrkMast.getLocNo())) {
@@ -1131,32 +1131,32 @@
public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol, Integer mark) {
News.warnNoLog("" + mark + " - 2" + " - 0" + " - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
- int devpTaskStackOver = 20;
- Config config = configService.selectOne(new EntityWrapper<Config>()
- .eq("code", "devpTaskStackOver"));
- if (config != null) {
- devpTaskStackOver = Integer.parseInt(config.getValue());
- }
- int devpCheckTaskStackOver = 2;
- Config config2 = configService.selectOne(new EntityWrapper<Config>()
- .eq("code", "devpCheckTaskStackOver"));
- if (config2 != null) {
- devpCheckTaskStackOver = Integer.parseInt(config2.getValue());
- }
-
- int outNumber = 13;
- Config config3 = configService.selectOne(new EntityWrapper<Config>()
- .eq("code", "fullBoardOutboundNumber"));
- if (config3 != null) {
- outNumber = Integer.parseInt(config3.getValue());
- }
-
-
- Integer devpWorkingCount = commonService.queryDevpWorkingCount();
- if (devpWorkingCount > devpTaskStackOver) {
- News.warn("" + mark + " - 2" + " - 0" + " - 杈撻�佺嚎浠诲姟杩囪浇锛屽綋鍓嶈緭閫佺嚎鎵胯浇鏁伴噺:{}", devpWorkingCount);
- return;
- }
+// int devpTaskStackOver = 20;
+// Config config = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "devpTaskStackOver"));
+// if (config != null) {
+// devpTaskStackOver = Integer.parseInt(config.getValue());
+// }
+// int devpCheckTaskStackOver = 2;
+// Config config2 = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "devpCheckTaskStackOver"));
+// if (config2 != null) {
+// devpCheckTaskStackOver = Integer.parseInt(config2.getValue());
+// }
+//
+// int outNumber = 13;
+// Config config3 = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "fullBoardOutboundNumber"));
+// if (config3 != null) {
+// outNumber = Integer.parseInt(config3.getValue());
+// }
+//
+//
+// Integer devpWorkingCount = commonService.queryDevpWorkingCount();
+// if (devpWorkingCount > devpTaskStackOver) {
+// News.warn("" + mark + " - 2" + " - 0" + " - 杈撻�佺嚎浠诲姟杩囪浇锛屽綋鍓嶈緭閫佺嚎鎵胯浇鏁伴噺:{}", devpWorkingCount);
+// return;
+// }
for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
// 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
@@ -1188,49 +1188,49 @@
staProtocol = staProtocol.clone();
}
- if (wrkMast.getStaNo() == 1003 || wrkMast.getStaNo() == 1007 || wrkMast.getStaNo() == 1004) {
- //妫�娴嬫槸鍚︽湁鍏ュ簱浠诲姟
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("io_type", 1, 53, 57)
- .notIn("wrk_sts", 3, 4, 5)
- .in("source_sta_no", 1002, 1007)
- );
- if (!inWrkMasts.isEmpty()) {
- News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦ㄥ叆搴撲换鍔★紝绛夊緟鍏ュ簱浠诲姟鎵ц瀹屾垚鍐嶅嚭搴擄紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
- continue;
- }
- }
+// if (wrkMast.getStaNo() == 1003 || wrkMast.getStaNo() == 1007 || wrkMast.getStaNo() == 1004) {
+// //妫�娴嬫槸鍚︽湁鍏ュ簱浠诲姟
+// List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("io_type", 1, 53, 57)
+// .notIn("wrk_sts", 3, 4, 5)
+// .in("source_sta_no", 1002, 1007)
+// );
+// if (!inWrkMasts.isEmpty()) {
+// News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦ㄥ叆搴撲换鍔★紝绛夊緟鍏ュ簱浠诲姟鎵ц瀹屾垚鍐嶅嚭搴擄紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
+// continue;
+// }
+// }
//zhangc
- if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
- if (wrkMast.getStaNo() == 1058) {
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("wrk_sts", 12, 14)
- .eq("sta_no", 1058)
- );
- if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
- News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦�1058绔欑偣锛屽瓨鍦ㄤ袱绗斿伐浣滀腑鐨勪换鍔★紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
- continue;
- }
- } else if (wrkMast.getStaNo() == 1062) {
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("wrk_sts", 12, 14)
- .eq("sta_no", 1062)
- );
- if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
- News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦�1062绔欑偣锛屽瓨鍦ㄤ袱绗斿伐浣滀腑鐨勪换鍔★紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
- continue;
- }
- }
- }else if (wrkMast.getIoType() == 101) {
- List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .in("wrk_sts", 12, 14)
- );
- if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= outNumber) {
- News.error("" + mark + " - 4" + " - 妫�娴嬪埌鍏ㄦ澘鍑哄簱鐨勪换鍔″凡缁忓埌杈句笂绾匡紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
- continue;
- }
- }
+// if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
+// if (wrkMast.getStaNo() == 1058) {
+// List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("wrk_sts", 12, 14)
+// .eq("sta_no", 1058)
+// );
+// if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
+// News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦�1058绔欑偣锛屽瓨鍦ㄤ袱绗斿伐浣滀腑鐨勪换鍔★紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
+// continue;
+// }
+// } else if (wrkMast.getStaNo() == 1062) {
+// List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("wrk_sts", 12, 14)
+// .eq("sta_no", 1062)
+// );
+// if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= devpCheckTaskStackOver) {
+// News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦�1062绔欑偣锛屽瓨鍦ㄤ袱绗斿伐浣滀腑鐨勪换鍔★紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
+// continue;
+// }
+// }
+// }else if (wrkMast.getIoType() == 101) {
+// List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+// .in("wrk_sts", 12, 14)
+// );
+// if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= outNumber) {
+// News.error("" + mark + " - 4" + " - 妫�娴嬪埌鍏ㄦ澘鍑哄簱鐨勪换鍔″凡缁忓埌杈句笂绾匡紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
+// continue;
+// }
+// }
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if (devpThread.ioMode != IoModeType.PAKOUT_MODE) { continue; }
@@ -1250,22 +1250,22 @@
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
//鏍规嵁鍙傛暟鍒ゆ柇鏄惁鏍￠獙鍙嚭淇″彿
- String crnOutVerifyOut = "Y";
- Config crnOutVerifyOutEnableConfig = configService.selectOne(new EntityWrapper<Config>()
- .eq("code", "crnOutVerifyOutEnable"));
- if (crnOutVerifyOutEnableConfig != null) {
- crnOutVerifyOut = crnOutVerifyOutEnableConfig.getValue();
- }
-
- if (crnOutVerifyOut.equals("Y")) {
- if (!staProtocol.isOutEnable()) {
- continue;
- }
-
- if (staProtocol.getWorkNo() > 0) {
- continue;
- }
- }
+// String crnOutVerifyOut = "Y";
+// Config crnOutVerifyOutEnableConfig = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "crnOutVerifyOutEnable"));
+// if (crnOutVerifyOutEnableConfig != null) {
+// crnOutVerifyOut = crnOutVerifyOutEnableConfig.getValue();
+// }
+//
+// if (crnOutVerifyOut.equals("Y")) {
+// if (!staProtocol.isOutEnable()) {
+// continue;
+// }
+//
+// if (staProtocol.getWorkNo() > 0) {
+// continue;
+// }
+// }
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
@@ -1276,26 +1276,26 @@
break;
}
- if (crnProtocol.getCrnNo() == 1) {
- String turnCrnExecuteCurrentChannel = "Y";
- Config turnCrnExecuteCurrentChannelConfig = configService.selectOne(new EntityWrapper<Config>()
- .eq("code", "turnCrnExecuteCurrentChannel")
- );
- if (turnCrnExecuteCurrentChannelConfig != null) {
- turnCrnExecuteCurrentChannel = turnCrnExecuteCurrentChannelConfig.getValue();
- }
-
- if (turnCrnExecuteCurrentChannel.equals("Y")) {
- //鍒ゆ柇鍫嗗灈鏈哄拰褰撳墠浠诲姟鏄惁澶勪簬涓�涓贩閬�
- if (Utils.getLaneByLocNo(wrkMast.getSourceLocNo()) != crnProtocol.getCrnLane()) {
- //鍒ゆ柇鍫嗗灈鏈烘墍鍦ㄥ贩閬撴槸鍚﹀瓨鍦ㄥ叾浠栦换鍔★紝濡傚瓨鍦ㄥ垯浼樺厛鎵ц
- List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
- if (!currentWrkMasts.isEmpty()) {
- continue;//褰撳墠鍫嗗灈鏈烘墍鍦ㄥ贩閬撳瓨鍦ㄤ换鍔�
- }
- }
- }
- }
+// if (crnProtocol.getCrnNo() == 1) {
+// String turnCrnExecuteCurrentChannel = "Y";
+// Config turnCrnExecuteCurrentChannelConfig = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "turnCrnExecuteCurrentChannel")
+// );
+// if (turnCrnExecuteCurrentChannelConfig != null) {
+// turnCrnExecuteCurrentChannel = turnCrnExecuteCurrentChannelConfig.getValue();
+// }
+//
+// if (turnCrnExecuteCurrentChannel.equals("Y")) {
+// //鍒ゆ柇鍫嗗灈鏈哄拰褰撳墠浠诲姟鏄惁澶勪簬涓�涓贩閬�
+// if (Utils.getLaneByLocNo(wrkMast.getSourceLocNo()) != crnProtocol.getCrnLane()) {
+// //鍒ゆ柇鍫嗗灈鏈烘墍鍦ㄥ贩閬撴槸鍚﹀瓨鍦ㄥ叾浠栦换鍔★紝濡傚瓨鍦ㄥ垯浼樺厛鎵ц
+// List<WrkMast> currentWrkMasts = wrkMastService.selectLaneWrkMast(crnProtocol.getCrnLane(), false);
+// if (!currentWrkMasts.isEmpty()) {
+// continue;//褰撳墠鍫嗗灈鏈烘墍鍦ㄥ贩閬撳瓨鍦ㄤ换鍔�
+// }
+// }
+// }
+// }
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
@@ -1896,7 +1896,7 @@
&& staProtocol.isEmptyMk()
&& (staProtocol.getWorkNo() > 9990 && staProtocol.getWorkNo() <= 9999)
&& staProtocol.isPakMk()
- && staProtocol.getEmptyInType() == 1
+// && staProtocol.getEmptyInType() == 1
) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛岋細绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�");
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c5e9015..94e7286 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -52,7 +52,7 @@
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick(3);
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱-鏉＄爜
- mainService.stnToCrnStnPickBarcode(33);
+// mainService.stnToCrnStnPickBarcode(33);
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn(4);
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
@@ -68,7 +68,7 @@
// 绌烘墭鐩樺叆搴�-绔嬪簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
mainService.storeEmptyPlt(8);
// 绌烘墭鐩樺叆搴�-浜х嚎
- mainService.storeEmptyPltLine(13);
+// mainService.storeEmptyPltLine(13);
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute(9);
@@ -76,11 +76,11 @@
mainService.ledReset(10);
// RGV ===>> 鎵ц瀵筊GV鎿嶄綔
- mainService.rgvExecute(11);
+// mainService.rgvExecute(11);
// RGV ===>> 鎵ц瀵筊GV宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
- mainService.rgvFinished(12);
+// mainService.rgvFinished(12);
// RGV ===>> 鎵ц瀵筊GV宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔 绔欏埌绔�
- mainService.rgvFinished2(14);
+// mainService.rgvFinished2(14);
//鍫嗗灈鏈烘棤浠诲姟涓ゅ垎閽燂紝鍥炲叆搴撳彛寰呮満
mainService.crnMove();
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 4afe80f..ea54383 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -49,21 +49,11 @@
private Long deviceDataLogTime = System.currentTimeMillis();
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- 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(1031);
- add(1032);add(1033);add(1034);add(1035);add(1036);add(1037);add(1038);add(1039);
- add(1040);add(1041);add(1042);add(1043);add(1044);add(1045);add(1046);add(1047);
- add(1048);add(1049);add(1050);add(1051);add(1052);add(1053);add(1054);add(1055);
- add(1056);add(1057);add(1058);add(1059);add(1060);add(1061);add(1062);add(1063);
- add(1064);add(1065);add(1066);add(1067);add(1068);add(1069);add(1070);add(1071);
- add(1072);add(1073);add(1074);add(1075);add(1076);add(1077);add(1078);add(1079);
- add(1080);add(1081);add(1082);add(1083);add(1084);add(1085);add(1086);add(1087);
- add(1088);add(1089);add(1090);add(2003);
+ add(301);add(302);add(303);add(304);add(305);add(306);
}};
public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(2000);add(2001);add(2002);add(1001);add(1002);add(1003);add(1004);add(1005);add(1006);add(1007);
+ add(307);
}};
@@ -71,12 +61,12 @@
public static final ArrayList<Integer> barcode1 = new ArrayList<Integer>() {{
add(1);
- add(2);
+// add(2);
}};
public static final ArrayList<Integer> barcode2 = new ArrayList<Integer>() {{
- add(3);
- add(4);
+ add(2);
+// add(4);
}};
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2b96715..5d39088 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -69,12 +69,26 @@
row: 2
bay: 2
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 307
+ row: 1
+ bay: 16
+ lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 304
row: 1
bay: 2
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staNo: 307
+ row: 1
+ bay: 16
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
# crnOutStn[1]:
@@ -244,36 +258,42 @@
# 鍑哄簱鍙�1
outSta[0]:
staNo: 306
- led: ${wcs-slave.led[0].id}
+ led: ${wcs-slave.led[1].id}
# 杈撻�佺嚎2
-# devp[1]:
-# id: 2
-# ip: 172.17.60.118
-# port: 102
-# rack: 0
-# slot: 0
+ devp[1]:
+ id: 2
+ ip: 172.17.60.118
+ port: 102
+ rack: 0
+ slot: 0
# # 鍏ュ簱鍙�1
-# inSta[0]:
-# staNo: 1002
-# barcode: ${wcs-slave.barcode[2].id}
-# backSta: 1001
-# led: ${wcs-slave.led[7].id}
-# # 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 1007
-# barcode: ${wcs-slave.barcode[3].id}
-# backSta: 1003
-# led: ${wcs-slave.led[8].id}
+ inSta[0]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 307
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 307
+ led: ${wcs-slave.led[2].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
ip: 10.10.10.121
port: 51236
# 鏉＄爜鎵弿浠�2
-# barcode[1]:
-# id: 2
-# ip: 10.10.10.121
-# port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.121
+ port: 51236
# # 鏉＄爜鎵弿浠�3
# barcode[2]:
# id: 3
@@ -299,12 +319,12 @@
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 306
# # LED3
-# led[2]:
-# id: 3
-# ip: 172.17.60.181
-# port: 5005
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staArr: 1058
+ led[2]:
+ id: 3
+ ip: 172.17.60.181
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 307
# # LED4
# led[3]:
# id: 4
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 4e28f76..4faa095 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,123 +1,20 @@
mapInfo = {"mapName":"WCS","rackCount":16,"crnCount":4,"stbCount":16,"hpPosition":1,"minBayNo":2,"floors":1,"racks":[
- // {"type":"rack","id":"rack23","top":558,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack26","top":631,"left":642,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack25","top":612,"left":642,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack24","top":577,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack19","top":469,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack22","top":539,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack21","top":519,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack20","top":488,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack4","top":122,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
- // {"type":"rack","id":"rack5","top":141,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
- // {"type":"rack","id":"rack111","top":49,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
- // {"type":"rack","id":"rack15","top":376,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack18","top":449,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack17","top":430,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack16","top":396,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
{"type":"rack","id":"rack11","top":287,"left":400,"width":1100,"height":18,"minBayNo":2,"maxBayNo":24},
- // {"type":"rack","id":"rack14","top":357,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
{"type":"rack","id":"rack13","top":341,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":24},
{"type":"rack","id":"rack12","top":302,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":24},
- // {"type":"rack","id":"rack7","top":193,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack10","top":268,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31},
- // {"type":"rack","id":"rack9","top":249,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
- // {"type":"rack","id":"rack8","top":212,"left":641,"width":1100,"height":20,"minBayNo":2,"maxBayNo":28},
- // {"type":"rack","id":"rack2","top":83,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
- // {"type":"rack","id":"rack3","top":103,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":61},
- // {"type":"rack","id":"rack6","top":174,"left":641,"width":667,"height":18,"minBayNo":2,"maxBayNo":31}
],
"crns":[
- // {"type":"track","id":"lb_track8","text":"","top":76,"left":1327,"width":1,"height":93},
- // {"type":"track","id":"lb_track7","text":"","top":75,"left":596,"width":733,"height":1},
- // {"type":"track","id":"lb_track1","text":"","top":604,"left":593,"width":733,"height":1},
- // {"type":"track","id":"lb_track2","text":"","top":513,"left":595,"width":733,"height":1},
- // {"type":"crane","id":"crn-5","text":"5","top":507,"left":731,"width":67,"height":13},
- // {"type":"crane","id":"crn-6","text":"6","top":597,"left":731,"width":67,"height":13},
- // {"type":"crane","id":"crn-1","text":"1","top":162,"left":730,"width":67,"height":13},
- // {"type":"track","id":"lb_track3","text":"","top":424,"left":593,"width":733,"height":1},
- // {"type":"crane","id":"crn-2","text":"2","top":234,"left":741,"width":67,"height":13},
{"type":"track","id":"lb_track4","text":"","top":333,"left":400,"width":1100,"height":1},
- {"type":"crane","id":"crn-3","text":"3","top":325,"left":1450,"width":67,"height":13},
- // {"type":"track","id":"lb_track5","text":"","top":241,"left":595,"width":733,"height":1},
- // {"type":"track","id":"lb_track6","text":"","top":168,"left":596,"width":733,"height":1},
- // {"type":"crane","id":"crn-4","text":"4","top":417,"left":730,"width":67,"height":13}
+ {"type":"crane","id":"crn-1","text":"1","top":325,"left":1450,"width":67,"height":13},
],
"areas":[{"type":"Control_floor","id":"tabControl_floor1","text":"妤煎眰","top":41,"left":80,"width":1269,"height":781,"floors":[
{"type":"floor","id":"page_floor1","text":"1F","top":4,"left":22,"width":1243,"height":773,"stns":
[
- // {"type":"stn","id":"site-1064","text":"1064","top":720,"left":769,"width":59,"height":20},
- // {"type":"stn","id":"site-2003","text":"2003","top":456,"left":309,"width":37,"height":20},
- // {"type":"stn","id":"site-2002","text":"2002","top":455,"left":221,"width":37,"height":20},
- // {"type":"stn","id":"site-1004","text":"1004","top":334,"left":296,"width":37,"height":20},
- // {"type":"stn","id":"site-1002","text":"1002","top":291,"left":296,"width":37,"height":20},
- // {"type":"stn","id":"site-1006","text":"1006","top":312,"left":296,"width":37,"height":20},
- // {"type":"stn","id":"site-1007","text":"1007","top":312,"left":258,"width":37,"height":20},
- // {"type":"stn","id":"site-1003","text":"1003","top":312,"left":220,"width":37,"height":20},
- // {"type":"stn","id":"site-1075","text":"1075","top":723,"left":406,"width":71,"height":20},
- // {"type":"stn","id":"site-1076","text":"1076","top":701,"left":406,"width":71,"height":20},
- // {"type":"stn","id":"site-1077","text":"1077","top":679,"left":406,"width":71,"height":20},
- // {"type":"stn","id":"site-1078","text":"1078","top":657,"left":406,"width":71,"height":20},
- // {"type":"stn","id":"site-1079","text":"1079","top":598,"left":406,"width":71,"height":57},
- // {"type":"stn","id":"site-1047","text":"1047","top":578,"left":405,"width":93,"height":17},
- // {"type":"stn","id":"site-1081","text":"1081","top":417,"left":405,"width":71,"height":158},
- // {"type":"stn","id":"site-1034","text":"1034","top":398,"left":405,"width":95,"height":17},
- // {"type":"stn","id":"site-1083","text":"1083","top":320,"left":405,"width":71,"height":75},
- // {"type":"stn","id":"site-1084","text":"1084","top":198,"left":405,"width":71,"height":121},
- // {"type":"stn","id":"site-1059","text":"1059","top":700,"left":480,"width":161,"height":20},
- // {"type":"stn","id":"site-1018","text":"1018","top":178,"left":405,"width":95,"height":17},
- // {"type":"stn","id":"site-1086","text":"1086","top":146,"left":406,"width":71,"height":30},
- // {"type":"stn","id":"site-1087","text":"1087","top":125,"left":406,"width":71,"height":19},
- // {"type":"stn","id":"site-1088","text":"1088","top":105,"left":406,"width":71,"height":19},
- // {"type":"stn","id":"site-1074","text":"1074","top":678,"left":1141,"width":59,"height":20},
- // {"type":"stn","id":"site-1073","text":"1073","top":657,"left":1141,"width":59,"height":20},
- // {"type":"stn","id":"site-1071","text":"1071","top":678,"left":1017,"width":59,"height":20},
- // {"type":"stn","id":"site-1072","text":"1072","top":657,"left":1079,"width":59,"height":20},
- // {"type":"stn","id":"site-1070","text":"1070","top":657,"left":1017,"width":59,"height":20},
- // {"type":"stn","id":"site-1069","text":"1069","top":657,"left":955,"width":59,"height":20},
- // {"type":"stn","id":"site-1068","text":"1068","top":678,"left":893,"width":59,"height":20},
- // {"type":"stn","id":"site-1067","text":"1067","top":657,"left":893,"width":59,"height":20},
- // {"type":"stn","id":"site-1066","text":"1066","top":657,"left":831,"width":59,"height":20},
- // {"type":"stn","id":"site-1065","text":"1065","top":700,"left":707,"width":59,"height":20},
- // {"type":"stn","id":"site-1063","text":"1063","top":700,"left":769,"width":59,"height":20},
- // {"type":"stn","id":"site-1062","text":"1062","top":678,"left":769,"width":59,"height":20},
- // {"type":"stn","id":"site-1061","text":"1061","top":657,"left":769,"width":59,"height":20},
- // {"type":"stn","id":"site-1058","text":"1058","top":721,"left":645,"width":59,"height":20},
- // {"type":"stn","id":"site-1057","text":"1057","top":700,"left":645,"width":59,"height":20},
- // {"type":"stn","id":"site-1056","text":"1056","top":678,"left":645,"width":59,"height":20},
- // {"type":"stn","id":"site-1060","text":"1060","top":657,"left":707,"width":59,"height":20},
- // {"type":"stn","id":"site-1055","text":"1055","top":657,"left":645,"width":59,"height":20},
- // {"type":"stn","id":"site-1054","text":"1054","top":657,"left":574,"width":67,"height":20},
- // {"type":"stn","id":"site-1053","text":"1053","top":657,"left":479,"width":91,"height":20},
- // {"type":"stn","id":"site-1052","text":"1052","top":614,"left":573,"width":67,"height":17},
- // {"type":"stn","id":"site-1051","text":"1051","top":597,"left":502,"width":67,"height":58},
- // {"type":"stn","id":"site-1049","text":"1049","top":577,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-1048","text":"1048","top":578,"left":501,"width":67,"height":17},
- // {"type":"stn","id":"site-1045","text":"1045","top":523,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-1044","text":"1044","top":506,"left":501,"width":67,"height":69},
- // {"type":"stn","id":"site-1042","text":"1042","top":488,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-1041","text":"1041","top":466,"left":501,"width":67,"height":39},
- // {"type":"stn","id":"site-1039","text":"1039","top":433,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-1038","text":"1038","top":418,"left":501,"width":67,"height":45},
- // {"type":"stn","id":"site-1036","text":"1036","top":397,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-1035","text":"1035","top":398,"left":501,"width":67,"height":17},
{"type":"stn","id":"site-304","text":"304","top":344,"left":1500,"width":67,"height":17},
{"type":"stn","id":"site-305","text":"305","top":344,"left":1570,"width":67,"height":17},
{"type":"stn","id":"site-306","text":"306","top":344,"left":1640,"width":67,"height":17},
- // {"type":"stn","id":"site-1029","text":"1029","top":308,"left":571,"width":67,"height":17},
{"type":"stn","id":"site-301","text":"301","top":306,"left":1500,"width":67,"height":17},
- // {"type":"stn","id":"site-1026","text":"1026","top":250,"left":571,"width":67,"height":17},
{"type":"stn","id":"site-302","text":"302","top":306,"left":1570,"width":67,"height":17},
{"type":"stn","id":"site-303","text":"303","top":306,"left":1640,"width":67,"height":17},
{"type":"stn","id":"site-307","text":"307","top":370,"left":1200,"width":67,"height":17},
- // {"type":"stn","id":"site-106","text":"106","top":252,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-105","text":"105","top":243,"left":501,"width":67,"height":25},
- // {"type":"stn","id":"site-1020","text":"1020","top":177,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-1019","text":"1019","top":178,"left":502,"width":67,"height":17},
- // {"type":"stn","id":"site-1016","text":"1016","top":142,"left":571,"width":67,"height":17},
- // {"type":"stn","id":"site-1015","text":"1015","top":129,"left":502,"width":67,"height":46},
- // {"type":"stn","id":"site-1012","text":"1012","top":105,"left":502,"width":67,"height":23},
- // {"type":"stn","id":"site-1008","text":"1008","top":82,"left":337,"width":67,"height":21},
- // {"type":"stn","id":"site-1009","text":"1009","top":82,"left":406,"width":95,"height":21},
- // {"type":"stn","id":"site-1010","text":"1010","top":82,"left":502,"width":67,"height":21},
- // {"type":"stn","id":"site-1013","text":"1013","top":105,"left":571,"width":67,"height":17}
]}]}]}
--
Gitblit v1.9.1