From 8f0bc9c0e67c527bef6392401b776d36423206f4 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 17 二月 2023 10:55:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 2
src/main/java/com/zy/asrs/controller/ConsoleController.java | 3
src/main/java/com/zy/core/enums/CrnStatusType.java | 1
src/main/webapp/views/crn.html | 23 -----
src/main/webapp/static/js/console.map.js | 144 ++++++++++++++++++------------------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 +-
src/main/resources/application.yml | 36 ++++----
src/main/java/com/zy/core/ServerBootstrap.java | 2
8 files changed, 103 insertions(+), 120 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 7dbab85..d2b5ed7 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -35,6 +35,7 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.MelsecCrnThread;
import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.SiemensCrnThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -249,7 +250,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index fc82ad9..72cadd1 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -58,7 +58,7 @@
res.add(map2);
} else {
Map<String, Object> map3 = new HashMap<>();
- map3.put("floor", 2);
+ map3.put("floor", 3);
map3.put("modeVal", devpThread.ioModeOf1F3.id);
map3.put("modeDesc", devpThread.ioModeOf1F3.desc);
res.add(map3);
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index a1bb5dd..7b7e6e0 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -77,7 +77,7 @@
// 鍒濆鍖栧爢鍨涙満绾跨▼
log.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
for (CrnSlave crn : slaveProperties.getCrn()) {
- CrnThread crnThread = new MelsecCrnThread(crn);
+ CrnThread crnThread = new SiemensCrnThread(crn);
new Thread((Runnable) crnThread).start();
SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
}
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 371c87f..b5a9de9 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -16,6 +16,7 @@
WAITING(10, "浠诲姟瀹屾垚绛夊緟WCS纭"),
PAUSE(11, "浠诲姟鏆傚仠"),
SOS(99, "鎶ヨ"),
+ UNKNOW(100,"鍏朵粬")
;
public Integer id;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6ba2110..05c6996 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -308,37 +308,37 @@
}
if (slave.getId() == 2 && this.ioModeOf1F3 != IoModeType.NONE) {
if (!siemensS7Net.Write("DB100.300", this.ioModeOf1F3.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
log.error("鍐欏叆杈撻�佺嚎1F3鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
if (slave.getId() == 2 && this.ioModeOf1F4 != IoModeType.NONE) {
if (!siemensS7Net.Write("DB100.302", this.ioModeOf1F4.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎1F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
log.error("鍐欏叆杈撻�佺嚎1F4鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
if (slave.getId() == 2 && this.ioModeOf2F1 != IoModeType.NONE) {
if (!siemensS7Net.Write("DB100.304", this.ioModeOf2F1.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
log.error("鍐欏叆杈撻�佺嚎2F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
if (slave.getId() == 2 && this.ioModeOf2F2 != IoModeType.NONE) {
if (!siemensS7Net.Write("DB100.306", this.ioModeOf2F2.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
log.error("鍐欏叆杈撻�佺嚎2F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
if (slave.getId() == 2 && this.ioModeOf3F1 != IoModeType.NONE) {
if (!siemensS7Net.Write("DB100.308", this.ioModeOf3F1.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
log.error("鍐欏叆杈撻�佺嚎3F1鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
if (slave.getId() == 2 && this.ioModeOf3F2 != IoModeType.NONE) {
if (!siemensS7Net.Write("DB100.310", this.ioModeOf3F2.id).IsSuccess) {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={1}", slave.getId()));
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={2}", slave.getId()));
log.error("鍐欏叆杈撻�佺嚎3F2鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", slave.getId());
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 85cf8a0..fbccc8c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,7 +48,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.10.10
port: 102
rack: 0
slot: 0
@@ -60,61 +60,61 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
row: 2
- bay: 2
+ bay: 84
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 112
row: 2
- bay: 55
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�3
crnInStn[2]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 202
row: 2
- bay: 55
+ bay: 1
lev: 4
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[3]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 302
row: 2
- bay: 55
+ bay: 1
lev: 7
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
row: 2
- bay: 2
+ bay: 84
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 112
row: 2
- bay: 55
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 202
row: 2
- bay: 55
+ bay: 1
lev: 4
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[3]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 302
row: 2
- bay: 55
+ bay: 1
lev: 7
- # 鍫嗗灈鏈�2
+ # 鍫嗗灈鏈�1
crn[1]:
id: 2
- ip: 10.10.10.111
+ ip: 10.10.10.20
port: 102
rack: 0
slot: 0
@@ -126,35 +126,35 @@
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 106
row: 7
- bay: 2
+ bay: 84
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 116
row: 7
- bay: 55
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�3
crnInStn[2]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 205
row: 7
- bay: 55
+ bay: 1
lev: 4
# 鍫嗗灈鏈哄叆搴撶珯鐐�4
crnInStn[3]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 305
row: 7
- bay: 55
+ bay: 1
lev: 7
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 106
row: 7
- bay: 2
+ bay: 84
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
@@ -168,14 +168,14 @@
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 205
row: 7
- bay: 55
+ bay: 1
lev: 4
# 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[3]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 305
row: 7
- bay: 55
+ bay: 1
lev: 7
# 杈撻�佺嚎1
devp[0]:
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index d4c8047..3a14b32 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -91,36 +91,9 @@
"rackDescs": [
{
"type": "rackDescs",
- "id": "lb_desc8",
- "text": "#8",
+ "id": "lb_desc1",
+ "text": "#1",
"top": 150,
- "left": 1345,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc6",
- "text": "#6",
- "top": 223,
- "left": 1380,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc5",
- "text": "#5",
- "top": 245,
- "left": 1380,
- "width": 30,
- "height": 23
- },
- {
- "type": "rackDescs",
- "id": "lb_desc4",
- "text": "#4",
- "top": 280,
"left": 1380,
"width": 30,
"height": 23
@@ -129,6 +102,33 @@
"type": "rackDescs",
"id": "lb_desc3",
"text": "#3",
+ "top": 223,
+ "left": 1380,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc4",
+ "text": "#4",
+ "top": 245,
+ "left": 1380,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc5",
+ "text": "#5",
+ "top": 280,
+ "left": 1380,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc6",
+ "text": "#6",
"top": 300,
"left": 1380,
"width": 30,
@@ -136,10 +136,10 @@
},
{
"type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
+ "id": "lb_desc8",
+ "text": "#8",
"top": 380,
- "left": 1345,
+ "left": 1380,
"width": 30,
"height": 23
},
@@ -206,8 +206,8 @@
"type": "stn",
"id": "site-102",
"text": "102",
- "top": 173,
- "left": 403,
+ "top": 172,
+ "left": 1342,
"width": 70,
"height": 20
},
@@ -215,8 +215,8 @@
"type": "stn",
"id": "site-101",
"text": "101",
- "top": 173,
- "left": 332,
+ "top": 172,
+ "left": 1413,
"width": 70,
"height": 20
},
@@ -224,8 +224,8 @@
"type": "stn",
"id": "site-100",
"text": "100",
- "top": 173,
- "left": 261,
+ "top": 172,
+ "left": 1484,
"width": 70,
"height": 20
},
@@ -233,8 +233,8 @@
"type": "stn",
"id": "site-106",
"text": "106",
- "top": 358,
- "left": 403,
+ "top": 359,
+ "left": 1342,
"width": 70,
"height": 20
},
@@ -242,8 +242,8 @@
"type": "stn",
"id": "site-105",
"text": "105",
- "top": 358,
- "left": 332,
+ "top": 359,
+ "left": 1413,
"width": 70,
"height": 20
},
@@ -251,8 +251,8 @@
"type": "stn",
"id": "site-104",
"text": "104",
- "top": 358,
- "left": 261,
+ "top": 359,
+ "left": 1484,
"width": 70,
"height": 20
},
@@ -260,8 +260,8 @@
"type": "stn",
"id": "site-103",
"text": "103",
- "top": 358,
- "left": 190,
+ "top": 359,
+ "left": 1555,
"width": 70,
"height": 20
},
@@ -269,8 +269,8 @@
"type": "stn",
"id": "site-112",
"text": "112",
- "top": 172,
- "left": 1342,
+ "top": 173,
+ "left": 403,
"width": 70,
"height": 20
},
@@ -278,8 +278,8 @@
"type": "stn",
"id": "site-111",
"text": "111",
- "top": 172,
- "left": 1413,
+ "top": 173,
+ "left": 332,
"width": 70,
"height": 20
},
@@ -287,8 +287,8 @@
"type": "stn",
"id": "site-110",
"text": "110",
- "top": 172,
- "left": 1484,
+ "top": 173,
+ "left": 261,
"width": 70,
"height": 20
},
@@ -296,8 +296,8 @@
"type": "stn",
"id": "site-116",
"text": "116",
- "top": 359,
- "left": 1342,
+ "top": 358,
+ "left": 403,
"width": 70,
"height": 20
},
@@ -305,8 +305,8 @@
"type": "stn",
"id": "site-115",
"text": "115",
- "top": 359,
- "left": 1413,
+ "top": 358,
+ "left": 332,
"width": 70,
"height": 20
},
@@ -314,8 +314,8 @@
"type": "stn",
"id": "site-114",
"text": "114",
- "top": 359,
- "left": 1484,
+ "top": 358,
+ "left": 261,
"width": 70,
"height": 20
},
@@ -323,8 +323,8 @@
"type": "stn",
"id": "site-113",
"text": "113",
- "top": 359,
- "left": 1555,
+ "top": 358,
+ "left": 190,
"width": 70,
"height": 20
},
@@ -344,7 +344,7 @@
"id": "site-202",
"text": "202",
"top": 173,
- "left": 1342,
+ "left": 403,
"width": 70,
"height": 20
},
@@ -353,7 +353,7 @@
"id": "site-201",
"text": "201",
"top": 173,
- "left": 1413,
+ "left": 332,
"width": 70,
"height": 20
},
@@ -362,7 +362,7 @@
"id": "site-200",
"text": "200",
"top": 173,
- "left": 1484,
+ "left": 261,
"width": 70,
"height": 20
},
@@ -371,7 +371,7 @@
"id": "site-205",
"text": "205",
"top": 358,
- "left": 1342,
+ "left": 403,
"width": 70,
"height": 20
},
@@ -380,7 +380,7 @@
"id": "site-204",
"text": "204",
"top": 358,
- "left": 1413,
+ "left": 332,
"width": 70,
"height": 20
},
@@ -389,7 +389,7 @@
"id": "site-203",
"text": "203",
"top": 358,
- "left": 1484,
+ "left": 261,
"width": 70,
"height": 20
},
@@ -409,7 +409,7 @@
"id": "site-302",
"text": "302",
"top": 173,
- "left": 1342,
+ "left": 403,
"width": 70,
"height": 20
},
@@ -418,7 +418,7 @@
"id": "site-301",
"text": "301",
"top": 173,
- "left": 1413,
+ "left": 332,
"width": 70,
"height": 20
},
@@ -427,7 +427,7 @@
"id": "site-300",
"text": "300",
"top": 173,
- "left": 1484,
+ "left": 261,
"width": 70,
"height": 20
},
@@ -436,7 +436,7 @@
"id": "site-305",
"text": "305",
"top": 358,
- "left": 1342,
+ "left": 403,
"width": 70,
"height": 20
},
@@ -445,7 +445,7 @@
"id": "site-304",
"text": "304",
"top": 358,
- "left": 1413,
+ "left": 332,
"width": 70,
"height": 20
},
@@ -454,7 +454,7 @@
"id": "site-303",
"text": "303",
"top": 358,
- "left": 1484,
+ "left": 261,
"width": 70,
"height": 20
},
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index c1012c7..99cd253 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -65,24 +65,7 @@
<!-- <span> </span>-->
<input id="crn2" disabled="disabled">
</div>
- <div class="crn-command-item">
- <label>3#</label>
- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn3" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>4#</label>
- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn4" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>5#</label>
- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn5" disabled="disabled">
- </div>
+
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
@@ -150,9 +133,7 @@
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
<label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
+
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
--
Gitblit v1.9.1