From 4871bcf8e6850a4a665c76b1be1fcea67907d9aa Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 04 八月 2025 16:20:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 9 ++
src/main/webapp/views/crn.html | 9 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4
src/main/webapp/views/console.html | 39 +++++----
src/main/webapp/static/js/console.map.js | 33 ++++---
src/main/webapp/views/rgv.html | 6
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 24 ++---
src/main/resources/application.yml | 62 +++++++--------
9 files changed, 100 insertions(+), 88 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 208b218..b6d8c12 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -203,7 +203,14 @@
return R.ok().add(list);
}
- /****************************************************************/
+// @PostMapping("/latest/data/rgv")
+// @ManagerAuth(memo = "RGV瀹炴椂鏁版嵁")
+// public R rgvLatestData(){
+// return R.ok().add(list);
+// }
+
+
+ /****************************************************************/
/************************** 璇︽儏鎿嶄綔 ******************************/
/****************************************************************/
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 aa670a4..0298d74 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2295,7 +2295,7 @@
public synchronized void autoEmptyOut() {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
List<Integer> list = new ArrayList<>();
- list.add(101);list.add(112);
+ list.add(1108);list.add(112);
Map<Integer,Integer> map = new HashMap<>();
map.put(101,102);map.put(112,111);
for (Integer site:list){
@@ -2351,7 +2351,7 @@
public synchronized void autoEmptyIn() {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
List<Integer> list = new ArrayList<>();
- list.add(153);list.add(157);
+ list.add(1038);
for (Integer site:list){
StaProtocol staProtocol = devpThread.getStation().get(site);
if (staProtocol == null) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index eb078f2..1148d41 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -56,20 +56,16 @@
add(108);add(109);add(110);add(111);
add(112);add(113);add(114);add(115);
add(116);add(117);add(118);add(119);
- add(120);add(121);add(122);add(123);
- add(124);add(125);add(126);add(127);
- add(128);add(129);add(130);add(131);
- add(132);add(133);add(134);add(135);
- add(136);add(137);add(138);add(139);
- add(140);add(141);add(142);add(143);
- add(144);add(145);add(146);add(147);
- add(148);add(149);add(150);add(151);
- add(152);add(153);add(154);add(155);
- add(156);add(157);add(158);add(159);
- add(160);add(161);
- add(1);
-// add(200);add(201);add(202);
+
}};
+
+ public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
+ add(100);add(101);add(102);add(103);
+ add(104);add(105);add(106);add(107);
+ add(108);add(109);add(110);add(111);
+ }};
+
+
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(0); add(1); add(2);
@@ -109,6 +105,8 @@
switch (slave.getId()) {
case 1:
return staNos1;
+ case 2:
+ return staNos2;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ef6db3d..3104bca 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 127.0.0.1:9090/jshdwms
+ url: 127.0.0.1:8080/jshdasrs
inventory:
number: 7
@@ -60,14 +60,14 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 123
- row: 3
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 118
- row: 2
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈�2
@@ -132,14 +132,38 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 144
- row: 14
+ row: 15
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 148
- row: 15
+ row: 14
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈�4
+ crn[4]:
+ id: 5
+ ip: 10.10.10.41
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 144
+ row: 19
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 148
+ row: 18
bay: 1
lev: 1
@@ -175,34 +199,6 @@
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
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 44e7c47..82cd390 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 = "/jshdwcs";
// 璧嬪��
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 cf249c4..4c56441 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": "JSHDWCS",
"rackCount": 4,
"crnCount": 3,
"stbCount": 13,
@@ -309,6 +309,7 @@
"stns": [
{"type": "track", "id": "lb_trCart11", "text": "", "top": 65, "left": 1000, "width": 6, "height": 560},
{"type": "track", "id": "lb_trCart12", "text": "", "top": 65, "left": 1020, "width": 6, "height": 560},
+ { "type": "stn", "id": "site-1", "text": "1", "top": 84, "left": 1000, "width": 35, "height": 20 },
{ "type": "stn", "id": "site-1001", "text": "1001", "top": 84, "left": 870, "width": 35, "height": 20 },
{ "type": "stn", "id": "site-1002", "text": "1002", "top": 84, "left": 907, "width": 35, "height": 20 },
{ "type": "stn", "id": "site-1004", "text": "1004", "top": 84, "left": 944, "width": 35, "height": 20 },
@@ -324,11 +325,11 @@
{ "type": "stn", "id": "site-1018", "text": "1018", "top": 300, "left": 944, "width": 35, "height": 20 },
{ "type": "stn", "id": "site-1019", "text": "1019", "top": 350, "left": 870, "width": 54, "height": 20 },
{ "type": "stn", "id": "site-1021", "text": "1021", "top": 350, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1022", "text": "1022", "top": 415, "left": 870, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1024", "text": "1024", "top": 415, "left": 907, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1025", "text": "1025", "top": 415, "left": 944, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-1026", "text": "1026", "top": 465, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-1028", "text": "1028", "top": 465, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-1025", "text": "1025", "top": 465, "left": 870, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-1026", "text": "1026", "top": 465, "left": 907, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-1028", "text": "1028", "top": 465, "left": 944, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-1022", "text": "1022", "top": 415, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-1024", "text": "1024", "top": 415, "left": 926, "width": 54, "height": 20 },
{ "type": "stn", "id": "site-1029", "text": "1029", "top": 530, "left": 870, "width": 54, "height": 20 },
{ "type": "stn", "id": "site-1031", "text": "1031", "top": 530, "left": 926, "width": 54, "height": 20 },
{ "type": "stn", "id": "site-1032", "text": "1032", "top": 580, "left": 870, "width": 35, "height": 20 },
@@ -443,6 +444,8 @@
"width": 2900,
"height": 600,
"stns": [
+ { "type": "stn", "id": "site-2", "text": "2", "top": 84, "left": 1000, "width": 35, "height": 20 },
+
{"type": "track", "id": "lb_trCart21", "text": "", "top": 65, "left": 1000, "width": 6, "height": 560},
{"type": "track", "id": "lb_trCart22", "text": "", "top": 65, "left": 1020, "width": 6, "height": 560},
{ "type": "stn", "id": "site-2003", "text": "2003", "top": 84, "left": 926, "width": 54, "height": 20 },
@@ -468,12 +471,12 @@
{ "type": "stn", "id": "site-2025", "text": "2025", "top": 530, "left": 870, "width": 54, "height": 20 },
{ "type": "stn", "id": "site-2030", "text": "2030", "top": 580, "left": 926, "width": 54, "height": 20 },
{ "type": "stn", "id": "site-2028", "text": "2028", "top": 580, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-221", "text": "221", "top": 128, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-222", "text": "222", "top": 128, "left": 1087, "width": 70, "height": 20 },
- { "type": "stn", "id": "site-223", "text": "223", "top": 128, "left": 1160, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-2037", "text": "2037", "top": 128, "left": 1050, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-2035", "text": "2035", "top": 128, "left": 1087, "width": 70, "height": 20 },
+ { "type": "stn", "id": "site-2034", "text": "2034", "top": 128, "left": 1160, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-224", "text": "224", "top": 300, "left": 1050, "width": 35, "height": 20 },
- { "type": "stn", "id": "site-225", "text": "225", "top": 300, "left": 1087, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-2031", "text": "2031", "top": 300, "left": 1050, "width": 35, "height": 20 },
+ { "type": "stn", "id": "site-2033", "text": "2033", "top": 300, "left": 1087, "width": 35, "height": 20 },
{ "type": "stn", "id": "site-2110", "text": "2110", "top": 190, "left": 1407, "width": 35, "height": 20 },
@@ -567,10 +570,10 @@
"width": 2900,
"height": 600,
"stns": [
- { "type": "stn", "id": "site-4001", "text": "401", "top": 300, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-4003", "text": "402", "top": 300, "left": 926, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-4004", "text": "403", "top": 350, "left": 870, "width": 54, "height": 20 },
- { "type": "stn", "id": "site-4006", "text": "404", "top": 350, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-4001", "text": "4001", "top": 300, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-4003", "text": "4003", "top": 300, "left": 926, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-4004", "text": "4004", "top": 350, "left": 870, "width": 54, "height": 20 },
+ { "type": "stn", "id": "site-4006", "text": "4006", "top": 350, "left": 926, "width": 54, "height": 20 },
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index f8dc63c..74e4bb1 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -602,25 +602,26 @@
}
// crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
// crns[i].bay = 15;
- var offSet = 0;
- switch (i) {
- case 0:
- case 1:
- case 2:
- case 3:
- unit = 35;
- offSet = 500;
- break;
- case 5:
- unit = 124;
- offSet = 550;
- break;
- case 4:
- case 6:
- unit = 62;
- offSet = 550;
- break;
- }
+ var offSet = 800;
+ unit = 52;
+ // switch (i) {
+ // case 0:
+ // case 1:
+ // case 2:
+ // case 3:
+ // unit = 35;
+ // offSet = 500;
+ // break;
+ // case 5:
+ // unit = 124;
+ // offSet = 550;
+ // break;
+ // case 4:
+ // case 6:
+ // unit = 62;
+ // offSet = 550;
+ // break;
+ // }
if(crns[i].bay === 1){
crnEl.animate({left: offSet + 'px'}, 1000);
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7be0a1f..d535245 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -77,6 +77,12 @@
<!-- <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">
@@ -146,6 +152,7 @@
<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>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -479,7 +486,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200) {
crnOutput(res.data);
} else if (res.code === 403) {
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index 4d8d9d8..43f4b79 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -153,7 +153,7 @@
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="rgvSelect" value="1" checked> 1鍙稲GV</label>
<label><input type="radio" name="rgvSelect" value="2"> 2鍙稲GV</label>
- <label><input type="radio" name="rgvSelect" value="3"> 3鍙稲GV</label>
+<!-- <label><input type="radio" name="rgvSelect" value="3"> 3鍙稲GV</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -303,7 +303,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200){
var table = res.data;
if (table.length > rgvStateTableBlankRows && table.length !== rgvStateTableFullRows) {
@@ -498,7 +498,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200) {
rgvOutput(res.data);
} else if (res.code === 403) {
--
Gitblit v1.9.1