From cc3d834fc3e6a5e74e3a9d476b41493e2ab001f0 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期四, 26 五月 2022 14:03:02 +0800
Subject: [PATCH] #
---
src/main/webapp/views/render.js | 247 ++++++++++++----------------------------
src/main/webapp/views/render.html | 4
src/main/resources/application.yml | 83 ++++++++-----
3 files changed, 131 insertions(+), 203 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eed7e75..239c8dc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
# username: sa
# password: Zoneyung@zy56$
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=xgmasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=klsasrs2
# url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
username: sa
password: sa@123
@@ -38,8 +38,7 @@
enable: false
wms:
- url: localhost:8080/xgmwms
-# url: localhost:8082/xgmwms
+ url: localhost:8080/klswms
#鍫嗗灈鏈烘病鏈夋墽琛屼腑浠诲姟锛岃緭閫佹湁鍏ュ簱浠诲姟锛屽彨鍥炲師鐐�
crnBackHp:
@@ -64,15 +63,15 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 100
- row: 2
+ staNo: 106
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 101
- row: 3
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
@@ -86,15 +85,15 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 6
+ staNo: 120
+ row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 7
+ staNo: 113
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈�3
@@ -108,14 +107,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 10
+ staNo: 133
+ row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
+ staNo: 10
row: 11
bay: 1
lev: 1
@@ -129,33 +128,34 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 176
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 180
- barcode: ${wcs-slave.barcode[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 176
+ staNo: 103
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 173
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 182
- # 鎷ｆ枡鍏ュ簱鍙�
+ staNo: 110
+ # 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 176
+ staNo: 117
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 124
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
+ staNo: 131
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�4
+ pickSta[3]:
+ staNo: 136
barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
ip: 10.10.10.52
- port: 51236
- barcode[1]:
- id: 2
- ip: 10.10.10.53
port: 51236
# LED1
led[0]:
@@ -163,11 +163,32 @@
ip: 10.10.10.60
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 172
+ staArr: 110
# LED2
led[1]:
id: 2
ip: 10.10.10.61
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 182
+ staArr: 117
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 124
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 131
+ # LED5
+ led[4]:
+ id: 5
+ ip: 10.10.10.61
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 136
\ No newline at end of file
diff --git a/src/main/webapp/views/render.html b/src/main/webapp/views/render.html
index b8c025e..b6ccdce 100644
--- a/src/main/webapp/views/render.html
+++ b/src/main/webapp/views/render.html
@@ -584,7 +584,7 @@
headers: {'token': localStorage.getItem('token')},
method: 'POST',
success: function (res) {
- console.log(res)
+ // console.log(res)
if (res.code === 200) {
var crns = res.data;
for (var i = 0; i < crns.length; i++) {
@@ -651,7 +651,7 @@
// 鍫嗗灈鏈哄亸绉诲姩鐢�
function crnAnimate(id, leftVal) {
- console.log(crn1Position)
+ // console.log(crn1Position)
switch (id) {
case 1:
$("#crn-1").animate({left: leftVal + 'px'}, 1000);
diff --git a/src/main/webapp/views/render.js b/src/main/webapp/views/render.js
index ff6158c..0c7fcd8 100644
--- a/src/main/webapp/views/render.js
+++ b/src/main/webapp/views/render.js
@@ -6,8 +6,7 @@
"hpPosition": 1,
"minBayNo": 2,
"floors": 1,
- "racks": [
- {
+ "racks": [{
"type": "rack",
"id": "rack12",
"top": 646,
@@ -16,8 +15,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack11",
"top": 613,
@@ -26,8 +24,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack10",
"top": 516,
@@ -36,8 +33,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack9",
"top": 483,
@@ -46,8 +42,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack8",
"top": 451,
@@ -56,8 +51,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack7",
"top": 418,
@@ -66,8 +60,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack6",
"top": 323,
@@ -76,8 +69,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack5",
"top": 290,
@@ -86,8 +78,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 52
- },
- {
+ }, {
"type": "rack",
"id": "rack3",
"top": 225,
@@ -96,8 +87,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 60
- },
- {
+ }, {
"type": "rack",
"id": "rack1",
"top": 97,
@@ -106,8 +96,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 60
- },
- {
+ }, {
"type": "rack",
"id": "rack4",
"top": 257,
@@ -116,8 +105,7 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 60
- },
- {
+ }, {
"type": "rack",
"id": "rack2",
"top": 129,
@@ -126,10 +114,8 @@
"height": 30,
"minBayNo": 2,
"maxBayNo": 60
- }
-],
- "rackDescs": [
- {
+ }],
+ "rackDescs": [{
"type": "rackDescs",
"id": "lb_desc12",
"text": "#12",
@@ -137,8 +123,7 @@
"left": 260,
"width": 47,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc11",
"text": "#11",
@@ -146,8 +131,7 @@
"left": 260,
"width": 44,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc10",
"text": "#10",
@@ -155,8 +139,7 @@
"left": 257,
"width": 49,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc9",
"text": "#9",
@@ -164,8 +147,7 @@
"left": 257,
"width": 38,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc8",
"text": "#8",
@@ -173,8 +155,7 @@
"left": 260,
"width": 39,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc7",
"text": "#7",
@@ -182,8 +163,7 @@
"left": 260,
"width": 37,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc6",
"text": "#6",
@@ -191,8 +171,7 @@
"left": 260,
"width": 38,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc5",
"text": "#5",
@@ -200,8 +179,7 @@
"left": 261,
"width": 38,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc4",
"text": "#4",
@@ -209,8 +187,7 @@
"left": 145,
"width": 38,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc3",
"text": "#3",
@@ -218,8 +195,7 @@
"left": 145,
"width": 38,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc2",
"text": "#2",
@@ -227,8 +203,7 @@
"left": 145,
"width": 38,
"height": 27
- },
- {
+ }, {
"type": "rackDescs",
"id": "lb_desc1",
"text": "#1",
@@ -236,66 +211,33 @@
"left": 145,
"width": 35,
"height": 27
- }
-],
- "crns": [
- {
- "type": "crane",
- "id": "crn-1",
- "text": "1",
- "top": 184,
- "left": 777,
- "width": 93,
- "height": 22
- },
- {
- "type": "crane",
- "id": "crn-2",
- "text": "2",
- "top": 378,
- "left": 777,
- "width": 93,
- "height": 22
- },
- {
- "type": "crane",
- "id": "crn-3",
- "text": "3",
- "top": 572,
- "left": 777,
- "width": 93,
- "height": 22
- },
- {
+ }],
+ "crns": [{
"type": "track",
"id": "lb_track2",
"text": "",
- "top": 390,
- "left": 325,
- "width": 1010,
+ "top": 387,
+ "left": 146,
+ "width": 1112,
"height": 2
- },
- {
+ }, {
"type": "track",
"id": "lb_track3",
"text": "",
- "top": 584,
- "left": 325,
- "width": 1010,
+ "top": 582,
+ "left": 146,
+ "width": 1112,
"height": 2
- },
- {
+ }, {
"type": "track",
"id": "lb_track1",
"text": "",
- "top": 197,
- "left": 188,
- "width": 1148,
+ "top": 195,
+ "left": 146,
+ "width": 1112,
"height": 2
- }
-],
- "stns": [
- {
+ }],
+ "stns": [{
"type": "stn",
"id": "site-132",
"text": "132",
@@ -303,8 +245,7 @@
"left": 1399,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-126",
"text": "126",
@@ -312,8 +253,7 @@
"left": 1461,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-125",
"text": "125",
@@ -321,8 +261,7 @@
"left": 1399,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-119",
"text": "119",
@@ -330,8 +269,7 @@
"left": 1461,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-118",
"text": "118",
@@ -339,8 +277,7 @@
"left": 1399,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-136",
"text": "136",
@@ -348,8 +285,7 @@
"left": 1461,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-135",
"text": "135",
@@ -357,8 +293,7 @@
"left": 1399,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-134",
"text": "134",
@@ -366,8 +301,7 @@
"left": 1337,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-133",
"text": "133",
@@ -375,8 +309,7 @@
"left": 1215,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-130",
"text": "130",
@@ -384,8 +317,7 @@
"left": 1461,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-129",
"text": "129",
@@ -393,8 +325,7 @@
"left": 1399,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-128",
"text": "128",
@@ -402,8 +333,7 @@
"left": 1337,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-127",
"text": "127",
@@ -411,8 +341,7 @@
"left": 1215,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-131",
"text": "131",
@@ -420,8 +349,7 @@
"left": 1522,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-123",
"text": "123",
@@ -429,8 +357,7 @@
"left": 1461,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-122",
"text": "122",
@@ -438,8 +365,7 @@
"left": 1399,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-121",
"text": "121",
@@ -447,8 +373,7 @@
"left": 1337,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-120",
"text": "120",
@@ -456,8 +381,7 @@
"left": 1215,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-124",
"text": "124",
@@ -465,8 +389,7 @@
"left": 1522,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-112",
"text": "112",
@@ -474,8 +397,7 @@
"left": 1461,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-111",
"text": "111",
@@ -483,8 +405,7 @@
"left": 1399,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-116",
"text": "116",
@@ -492,8 +413,7 @@
"left": 1461,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-115",
"text": "115",
@@ -501,8 +421,7 @@
"left": 1399,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-114",
"text": "114",
@@ -510,8 +429,7 @@
"left": 1337,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-113",
"text": "113",
@@ -519,8 +437,7 @@
"left": 1215,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-117",
"text": "117",
@@ -528,8 +445,7 @@
"left": 1522,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-105",
"text": "105",
@@ -537,8 +453,7 @@
"left": 1399,
"width": 60,
"height": 63
- },
- {
+ }, {
"type": "stn",
"id": "site-109",
"text": "109",
@@ -546,8 +461,7 @@
"left": 1461,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-108",
"text": "108",
@@ -555,8 +469,7 @@
"left": 1399,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-107",
"text": "107",
@@ -564,8 +477,7 @@
"left": 1337,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-106",
"text": "106",
@@ -573,8 +485,7 @@
"left": 1215,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-104",
"text": "104",
@@ -582,8 +493,7 @@
"left": 1461,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-103",
"text": "103",
@@ -591,8 +501,7 @@
"left": 1399,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-102",
"text": "102",
@@ -600,8 +509,7 @@
"left": 1337,
"width": 60,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-101",
"text": "101",
@@ -609,8 +517,7 @@
"left": 1215,
"width": 120,
"height": 30
- },
- {
+ }, {
"type": "stn",
"id": "site-110",
"text": "110",
@@ -618,9 +525,9 @@
"left": 1522,
"width": 60,
"height": 30
- }
-]
+ }]
}
+
// 搴撲綅鍥�
function getMap() {
let mapName = "<div class='mapName'>" + data.mapName + "</div>"
--
Gitblit v1.9.1