From 4d44953d342fb0f7a1b9726eeaa9a35ba2b7548c Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 11:12:28 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2
src/main/webapp/views/console.html | 86 ++++++++++++---------
src/main/webapp/static/js/console.js | 39 ++++++---
src/main/webapp/static/js/console.map.js | 94 ++++++++++++++++++-----
src/main/resources/application.yml | 4
5 files changed, 150 insertions(+), 75 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 936b175..7fddf25 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -149,6 +149,7 @@
errMsg = errMsg + "鎵爜澶辫触";
back = true;
}
+ //9991婊℃墭锛�9990绌烘墭
String barcode = barcodeThread.getBarcode();
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
@@ -186,6 +187,7 @@
param.setIoType(1);
param.setSourceStaNo(inSta.getStaNo());
param.setLocType1(locTypeDto.getLocType1());
+ log.info("婊℃澘鍏ュ簱={}",param);
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/pakin/loc/v1")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f19ef97..9be50e2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxtlfasrs
+ url: jdbc:sqlserver://178.18.1.200:1433;databasename=jxtlfasrs
username: sa
password: sa@123
mvc:
@@ -35,7 +35,7 @@
enable: false
wms:
- url: 127.0.0.1:8081/tlfwms
+ url: 127.0.0.1:8083/tlfwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
diff --git a/src/main/webapp/static/js/console.js b/src/main/webapp/static/js/console.js
index 6372ad7..6ffe0ac 100644
--- a/src/main/webapp/static/js/console.js
+++ b/src/main/webapp/static/js/console.js
@@ -40,10 +40,16 @@
}
}else {
bNum = minBayNo
+ let hiddenArr = [];
+ if (rackss[i].hiddenArr != undefined) {
+ hiddenArr = rackss[i].hiddenArr
+ }
for (let j = 0; j < bLen; j++) {
-
- bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>"
- bays = bays + bay
+ bay = "<button class='item' style='width: "+ bayWidth +"px'>" + bNum + "</button>";
+ if (hiddenArr.indexOf(bNum) != -1) {
+ bay = "<button class='item' style='width: "+ bayWidth +"px;visibility: hidden'>" + bNum + "</button>";
+ }
+ bays = bays + bay;
bNum = bNum + minBayNo;
}
}
@@ -57,17 +63,17 @@
racks = racks + rack
// getCrnInfo(minBayNo);
}
- // 璐ф灦鎻忚堪
- for (let i = 0;i < rackDescss.length;i++) {
- rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
- "'style='width:"+ rackDescss[i].width +
- "px;height: "+ rackDescss[i].height+
- "px;line-height: "+ rackDescss[i].height+
- "px;top: "+ rackDescss[i].top +
- "px;left: "+ rackDescss[i].left +
- "px'>" + rackDescss[i].text + "</div>"
- rackDescs = rackDescs + rackDesc
- }
+ // // 璐ф灦鎻忚堪
+ // for (let i = 0;i < rackDescss.length;i++) {
+ // rackDesc = "<div class='rackDescs' id='" + rackDescss[i].id +
+ // "'style='width:"+ rackDescss[i].width +
+ // "px;height: "+ rackDescss[i].height+
+ // "px;line-height: "+ rackDescss[i].height+
+ // "px;top: "+ rackDescss[i].top +
+ // "px;left: "+ rackDescss[i].left +
+ // "px'>" + rackDescss[i].text + "</div>"
+ // rackDescs = rackDescs + rackDesc
+ // }
// 鍫嗗灈鏈哄拰鍦拌建
for (let i = 0;i < crnss.length;i++) {
if (crnss[i].type == "crane") {
@@ -93,6 +99,7 @@
let stnss = areas[i].stns
let floor = areas[i].text
+ console.log(areas[i].top)
floorId = areas[i].id
var position = (i+1)*100
floorBtn =
@@ -147,4 +154,6 @@
$("#line-total").empty()
$("#line-total").html(total[e])
// listenChange();
-}
\ 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 2c53f2e..20e2a25 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": "ZJFNWCS",
+ "mapName": "TLFWCS",
"rackCount": 4,
"crnCount": 2,
"stbCount": 13,
@@ -11,28 +11,30 @@
"id": "rack1",
"top": 260,
"left": 167,
- "width": 794,
+ "width": 1300,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 14
+ "maxBayNo": 21
}, {
"type": "rack",
"id": "rack2",
"top": 200,
"left": 167,
- "width": 794,
+ "width": 1300,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 14
+ "maxBayNo": 21,
+ "hiddenArr": [6,7,12,13,14,15,16,17,18]
},{
"type": "rack",
"id": "rack3",
"top": 177,
"left": 167,
- "width": 794,
+ "width": 1300,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 14
+ "maxBayNo": 21,
+ "hiddenArr": [6,7,12,13,14,15,16,17,18]
},],
"rackDescs": [{
"type": "rackDescs",
@@ -56,7 +58,7 @@
"id": "crn-1",
"text": "1",
"top": 232,
- "left": 436,
+ "left": 1300,
"width": 93,
"height": 22
}, {
@@ -65,7 +67,7 @@
"text": "",
"top": 243,
"left": 180,
- "width": 830,
+ "width": 1250,
"height": 2
}],
"areas": [{
@@ -86,34 +88,82 @@
"height": 505,
"stns": [{
"type": "stn",
- "id": "site-202",
- "text": "202",
+ "id": "site-106",
+ "text": "106",
"top": 260,
- "left": 960,
+ "left": 1407,
"width": 80,
"height": 23
}, {
"type": "stn",
- "id": "site-201",
- "text": "201",
+ "id": "site-105",
+ "text": "105",
"top": 260,
- "left": 1041,
+ "left": 1489,
"width": 80,
"height": 23
}, {
"type": "stn",
- "id": "site-203",
- "text": "203",
- "top": 200,
- "left": 960,
+ "id": "site-104",
+ "text": "104",
+ "top": 260,
+ "left": 1571,
"width": 80,
"height": 23
}, {
"type": "stn",
- "id": "site-204",
- "text": "204",
+ "id": "site-103",
+ "text": "103",
+ "top": 225,
+ "left": 1571,
+ "width": 80,
+ "height": 33
+ }, {
+ "type": "stn",
+ "id": "site-100",
+ "text": "100",
"top": 200,
- "left": 1041,
+ "left": 1407,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-101",
+ "text": "101",
+ "top": 200,
+ "left": 1489,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-102",
+ "text": "102",
+ "top": 200,
+ "left": 1571,
+ "width": 80,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site",
+ "text": "",
+ "top": 177,
+ "left": 1034,
+ "width": 122,
+ "height": 48
+ }, {
+ "type": "stn",
+ "id": "site",
+ "text": "",
+ "top": 177,
+ "left": 354,
+ "width": 432,
+ "height": 48
+ }, {
+ "type": "stn",
+ "id": "",
+ "text": "",
+ "top": 177,
+ "left": 1407,
"width": 80,
"height": 23
}]
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e0078c9..261e96d 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -107,46 +107,60 @@
<!-- <div id="loc-0102403" class="loc" style="top:448px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-3</div>-->
<!-- </div>-->
<div class="">
- <div id="loc-0100102" class="loc" style="top:372px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-2</div>
- <div id="loc-0100202" class="loc" style="top:372px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-2</div>
- <div id="loc-0100302" class="loc" style="top:372px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-2</div>
- <div id="loc-0100402" class="loc" style="top:372px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-2</div>
- <div id="loc-0100502" class="loc" style="top:372px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-2</div>
- <div id="loc-0100602" class="loc" style="top:372px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-2</div>
- <div id="loc-0100702" class="loc" style="top:372px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-2</div>
- <div id="loc-0100802" class="loc" style="top:372px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-2</div>
- <div id="loc-0100902" class="loc" style="top:372px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-2</div>
- <div id="loc-0101002" class="loc" style="top:372px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-2</div>
- <div id="loc-0101102" class="loc" style="top:372px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-2</div>
- <div id="loc-0101202" class="loc" style="top:372px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-2</div>
- <div id="loc-0101302" class="loc" style="top:372px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-2</div>
- <div id="loc-0101402" class="loc" style="top:372px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-2</div>
-<!-- <div id="loc-0101502" class="loc" style="top:472px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-2</div>-->
-<!-- <div id="loc-0101602" class="loc" style="top:472px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-2</div>-->
-<!-- <div id="loc-0101702" class="loc" style="top:472px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-2</div>-->
-<!-- <div id="loc-0101802" class="loc" style="top:472px; left:1424px; width:70px; height: 22px;line-height: 22px;">1-18-2</div>-->
-<!-- <div id="loc-0101902" class="loc" style="top:472px; left:1496px; width:70px; height: 22px;line-height: 22px;">1-19-2</div>-->
-<!-- <div id="loc-0102002" class="loc" style="top:472px; left:1568px; width:70px; height: 22px;line-height: 22px;">1-20-2</div>-->
-<!-- <div id="loc-0102102" class="loc" style="top:472px; left:1640px; width:70px; height: 22px;line-height: 22px;">1-21-2</div>-->
-<!-- <div id="loc-0102202" class="loc" style="top:472px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-2</div>-->
+<!-- <div id="loc-0100102" class="loc" style="top:372px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-2</div>-->
+<!-- <div id="loc-0100202" class="loc" style="top:372px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-2</div>-->
+<!-- <div id="loc-0100302" class="loc" style="top:372px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-2</div>-->
+<!-- <div id="loc-0100402" class="loc" style="top:372px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-2</div>-->
+<!-- <div id="loc-0100502" class="loc" style="top:372px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-2</div>-->
+<!-- <div id="loc-0100602" class="loc" style="top:372px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-2</div>-->
+<!-- <div id="loc-0100702" class="loc" style="top:372px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-2</div>-->
+<!-- <div id="loc-0100802" class="loc" style="top:372px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-2</div>-->
+ <div id="loc-0102102" class="loc" style="top:372px; left:176px; width:70px; height: 22px;line-height: 22px;">1-21-2</div>
+ <div id="loc-0102002" class="loc" style="top:372px; left:248px; width:70px; height: 22px;line-height: 22px;">1-20-2</div>
+ <div id="loc-0101902" class="loc" style="top:372px; left:320px; width:70px; height: 22px;line-height: 22px;">1-19-2</div>
+ <div id="loc-0101802" class="loc" style="top:372px; left:392px; width:70px; height: 22px;line-height: 22px;">1-18-2</div>
+ <div id="loc-0101702" class="loc" style="top:372px; left:464px; width:70px; height: 22px;line-height: 22px;">1-17-2</div>
+ <div id="loc-0101602" class="loc" style="top:372px; left:536px; width:70px; height: 22px;line-height: 22px;">1-16-2</div>
+ <div id="loc-0101502" class="loc" style="top:372px; left:608px; width:70px; height: 22px;line-height: 22px;">1-15-2</div>
+ <div id="loc-0101402" class="loc" style="top:372px; left:680px; width:70px; height: 22px;line-height: 22px;">1-14-2</div>
+ <div id="loc-0101302" class="loc" style="top:372px; left:752px; width:70px; height: 22px;line-height: 22px;">1-13-2</div>
+ <div id="loc-0101202" class="loc" style="top:372px; left:824px; width:70px; height: 22px;line-height: 22px;">1-12-2</div>
+ <div id="loc-0101102" class="loc" style="top:372px; left:896px; width:70px; height: 22px;line-height: 22px;">1-11-2</div>
+ <div id="loc-0101002" class="loc" style="top:372px; left:968px; width:70px; height: 22px;line-height: 22px;">1-10-2</div>
+<!-- <div id="loc-0100902" class="loc" style="top:372px; left:1040px; width:70px; height: 22px;line-height: 22px;">1-9-2</div>-->
+
+ <!-- <div id="loc-0102202" class="loc" style="top:472px; left:1712px; width:70px; height: 22px;line-height: 22px;">1-22-2</div>-->
<!-- <div id="loc-0102302" class="loc" style="top:472px; left:1784px; width:70px; height: 22px;line-height: 22px;">1-23-2</div>-->
<!-- <div id="loc-0102402" class="loc" style="top:472px; left:1856px; width:70px; height: 22px;line-height: 22px;">1-24-2</div>-->
</div>
<div class="">
- <div id="loc-0100101" class="loc" style="top:396px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-1</div>
- <div id="loc-0100201" class="loc" style="top:396px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-1</div>
- <div id="loc-0100301" class="loc" style="top:396px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-1</div>
- <div id="loc-0100401" class="loc" style="top:396px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-1</div>
- <div id="loc-0100501" class="loc" style="top:396px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-1</div>
- <div id="loc-0100601" class="loc" style="top:396px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-1</div>
- <div id="loc-0100701" class="loc" style="top:396px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-1</div>
- <div id="loc-0100801" class="loc" style="top:396px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-1</div>
- <div id="loc-0100901" class="loc" style="top:396px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-1</div>
- <div id="loc-0101001" class="loc" style="top:396px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-1</div>
- <div id="loc-0101101" class="loc" style="top:396px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-1</div>
- <div id="loc-0101201" class="loc" style="top:396px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-1</div>
- <div id="loc-0101301" class="loc" style="top:396px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-1</div>
- <div id="loc-0101401" class="loc" style="top:396px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-1</div>
+ <div id="loc-0102101" class="loc" style="top:396px; left:176px; width:70px; height: 22px;line-height: 22px;">1-21-1</div>
+ <div id="loc-0102001" class="loc" style="top:396px; left:248px; width:70px; height: 22px;line-height: 22px;">1-20-1</div>
+ <div id="loc-0101901" class="loc" style="top:396px; left:320px; width:70px; height: 22px;line-height: 22px;">1-19-1</div>
+ <div id="loc-0101801" class="loc" style="top:396px; left:392px; width:70px; height: 22px;line-height: 22px;">1-18-1</div>
+ <div id="loc-0101701" class="loc" style="top:396px; left:464px; width:70px; height: 22px;line-height: 22px;">1-17-1</div>
+ <div id="loc-0101601" class="loc" style="top:396px; left:536px; width:70px; height: 22px;line-height: 22px;">1-16-1</div>
+ <div id="loc-0101501" class="loc" style="top:396px; left:608px; width:70px; height: 22px;line-height: 22px;">1-15-1</div>
+ <div id="loc-0101401" class="loc" style="top:396px; left:680px; width:70px; height: 22px;line-height: 22px;">1-14-1</div>
+ <div id="loc-0101301" class="loc" style="top:396px; left:752px; width:70px; height: 22px;line-height: 22px;">1-13-1</div>
+ <div id="loc-0101201" class="loc" style="top:396px; left:824px; width:70px; height: 22px;line-height: 22px;">1-12-1</div>
+ <div id="loc-0101101" class="loc" style="top:396px; left:896px; width:70px; height: 22px;line-height: 22px;">1-11-1</div>
+ <div id="loc-0101001" class="loc" style="top:396px; left:968px; width:70px; height: 22px;line-height: 22px;">1-10-1</div>
+<!-- <div id="loc-0100901" class="loc" style="top:396px; left:1040px; width:70px; height: 22px;line-height: 22px;">1-9-1</div>-->
+<!-- <div id="loc-0100101" class="loc" style="top:396px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-1</div>-->
+<!-- <div id="loc-0100201" class="loc" style="top:396px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-1</div>-->
+<!-- <div id="loc-0100301" class="loc" style="top:396px; left:344px; width:70px; height: 22px;line-height: 22px;">1-3-1</div>-->
+<!-- <div id="loc-0100401" class="loc" style="top:396px; left:416px; width:70px; height: 22px;line-height: 22px;">1-4-1</div>-->
+<!-- <div id="loc-0100501" class="loc" style="top:396px; left:488px; width:70px; height: 22px;line-height: 22px;">1-5-1</div>-->
+<!-- <div id="loc-0100601" class="loc" style="top:396px; left:560px; width:70px; height: 22px;line-height: 22px;">1-6-1</div>-->
+<!-- <div id="loc-0100701" class="loc" style="top:396px; left:632px; width:70px; height: 22px;line-height: 22px;">1-7-1</div>-->
+<!-- <div id="loc-0100801" class="loc" style="top:396px; left:704px; width:70px; height: 22px;line-height: 22px;">1-8-1</div>-->
+<!-- <div id="loc-0100901" class="loc" style="top:396px; left:776px; width:70px; height: 22px;line-height: 22px;">1-9-1</div>-->
+<!-- <div id="loc-0101001" class="loc" style="top:396px; left:848px; width:70px; height: 22px;line-height: 22px;">1-10-1</div>-->
+<!-- <div id="loc-0101101" class="loc" style="top:396px; left:920px; width:70px; height: 22px;line-height: 22px;">1-11-1</div>-->
+<!-- <div id="loc-0101201" class="loc" style="top:396px; left:992px; width:70px; height: 22px;line-height: 22px;">1-12-1</div>-->
+<!-- <div id="loc-0101301" class="loc" style="top:396px; left:1064px; width:70px; height: 22px;line-height: 22px;">1-13-1</div>-->
+<!-- <div id="loc-0101401" class="loc" style="top:396px; left:1136px; width:70px; height: 22px;line-height: 22px;">1-14-1</div>-->
<!-- <div id="loc-0101501" class="loc" style="top:496px; left:1208px; width:70px; height: 22px;line-height: 22px;">1-15-1</div>-->
<!-- <div id="loc-0101601" class="loc" style="top:496px; left:1280px; width:70px; height: 22px;line-height: 22px;">1-16-1</div>-->
<!-- <div id="loc-0101701" class="loc" style="top:496px; left:1352px; width:70px; height: 22px;line-height: 22px;">1-17-1</div>-->
--
Gitblit v1.9.1