From 44371d30a848970e1c82763dfd6a2fdc05a3b477 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 06 十二月 2022 13:23:28 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 2
src/main/webapp/static/js/console.map.js | 161 ++++++++++++++--------
src/main/resources/application.yml | 220 ++++++++++++++++++++++---------
3 files changed, 260 insertions(+), 123 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 36d4881..3b2f10a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -35,7 +35,7 @@
enable: false
wms:
- url: localhost:8080/nbjfwms
+ url: localhost:8088/nbjfwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -55,20 +55,62 @@
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 102
row: 2
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+ staNo: 100
row: 2
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 112
+ row: 2
+ bay: 55
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 110
+ row: 2
+ bay: 55
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 202
+ row: 2
+ bay: 55
+ lev: 4
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 200
+ row: 2
+ bay: 55
+ lev: 4
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 302
+ row: 2
+ bay: 55
+ lev: 7
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 300
+ row: 2
+ bay: 55
+ lev: 7
# 鍫嗗灈鏈�2
crn[1]:
id: 2
@@ -79,20 +121,62 @@
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 113
- row: 3
+ staNo: 106
+ row: 7
bay: 1
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 114
- row: 4
+ staNo: 103
+ row: 7
bay: 1
lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 116
+ row: 7
+ bay: 55
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�2
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 113
+ row: 7
+ bay: 55
+ lev: 1
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 205
+ row: 7
+ bay: 55
+ lev: 4
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[2]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 203
+ row: 7
+ bay: 55
+ lev: 4
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�3
+ crnInStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 305
+ row: 7
+ bay: 55
+ lev: 7
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�3
+ crnOutStn[3]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 303
+ row: 7
+ bay: 55
+ lev: 7
# 杈撻�佺嚎1
devp[0]:
id: 1
@@ -102,34 +186,84 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 109
+ staNo: 102
barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 117
+ staNo: 112
barcode: ${wcs-slave.barcode[0].id}
# 鍏ュ簱鍙�3
inSta[2]:
- staNo: 101
+ staNo: 106
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�4
+ inSta[3]:
+ staNo: 116
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�5
+ inSta[4]:
+ staNo: 202
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�6
+ inSta[5]:
+ staNo: 205
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�7
+ inSta[6]:
+ staNo: 302
+ barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�8
+ inSta[7]:
+ staNo: 305
barcode: ${wcs-slave.barcode[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 109
+ staNo: 102
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 117
+ staNo: 112
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[2]:
- staNo: 101
+ staNo: 106
+ # 绌烘澘鍏ュ簱鍙�4
+ emptyInSta[3]:
+ staNo: 116
+ # 绌烘澘鍏ュ簱鍙�5
+ emptyInSta[4]:
+ staNo: 202
+ # 绌烘澘鍏ュ簱鍙�6
+ emptyInSta[5]:
+ staNo: 205
+ # 绌烘澘鍏ュ簱鍙�7
+ emptyInSta[6]:
+ staNo: 302
+ # 绌烘澘鍏ュ簱鍙�8
+ emptyInSta[7]:
+ staNo: 305
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 126
+ staNo: 100
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 134
- # 鍑哄簱鍙�2
+ staNo: 110
+ # 鍑哄簱鍙�3
outSta[2]:
- staNo: 100
+ staNo: 103
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 113
+ # 鍑哄簱鍙�5
+ outSta[4]:
+ staNo: 200
+ # 鍑哄簱鍙�6
+ outSta[5]:
+ staNo: 203
+ # 鍑哄簱鍙�7
+ outSta[6]:
+ staNo: 300
+ # 鍑哄簱鍙�8
+ outSta[7]:
+ staNo: 303
# # 鎷ｆ枡鍏ュ簱鍙�1
# pickSta[0]:
# staNo: 126
@@ -138,51 +272,7 @@
# pickSta[1]:
# staNo: 134
# barcode: ${wcs-slave.barcode[0].id}
- # 杈撻�佺嚎2
- devp[1]:
- id: 2
- ip: 192.168.4.250
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 201
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 207
- barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 213
- barcode: ${wcs-slave.barcode[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 201
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 207
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
- staNo: 213
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 205
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 211
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 217
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
+
# 鏉＄爜鎵弿浠�1
barcode[0]:
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 39b1a19..7d1bd63 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -88,15 +88,62 @@
"maxBayNo": 54
},
],
- "rackDescs": [ {
- "type": "rackDescs",
- "id": "lb_desc1",
- "text": "#1",
- "top": 93,
- "left": 1867,
- "width": 30,
- "height": 23
- },],
+ "rackDescs": [
+ {
+ "type": "rackDescs",
+ "id": "lb_desc1",
+ "text": "#1",
+ "top": 150,
+ "left": 1345,
+ "width": 30,
+ "height": 23
+ },
+ {
+ "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,
+ "height": 23
+ },
+ {
+ "type": "rackDescs",
+ "id": "lb_desc8",
+ "text": "#8",
+ "top": 380,
+ "left": 1345,
+ "width": 30,
+ "height": 23
+ },
+ ],
"crns": [
{
"type": "track",
@@ -160,8 +207,8 @@
"id": "site-102",
"text": "102",
"top": 173,
- "left": 384,
- "width": 89,
+ "left": 403,
+ "width": 70,
"height": 20
},
{
@@ -169,8 +216,8 @@
"id": "site-101",
"text": "101",
"top": 173,
- "left": 294,
- "width": 89,
+ "left": 332,
+ "width": 70,
"height": 20
},
{
@@ -178,8 +225,8 @@
"id": "site-100",
"text": "100",
"top": 173,
- "left": 204,
- "width": 89,
+ "left": 261,
+ "width": 70,
"height": 20
},
{
@@ -187,8 +234,8 @@
"id": "site-106",
"text": "106",
"top": 358,
- "left": 384,
- "width": 89,
+ "left": 403,
+ "width": 70,
"height": 20
},
{
@@ -196,8 +243,8 @@
"id": "site-105",
"text": "105",
"top": 358,
- "left": 294,
- "width": 89,
+ "left": 332,
+ "width": 70,
"height": 20
},
{
@@ -205,8 +252,8 @@
"id": "site-104",
"text": "104",
"top": 358,
- "left": 204,
- "width": 89,
+ "left": 261,
+ "width": 70,
"height": 20
},
{
@@ -214,8 +261,8 @@
"id": "site-103",
"text": "103",
"top": 358,
- "left": 114,
- "width": 89,
+ "left": 190,
+ "width": 70,
"height": 20
},
{
@@ -224,7 +271,7 @@
"text": "112",
"top": 172,
"left": 1342,
- "width": 89,
+ "width": 70,
"height": 20
},
{
@@ -232,8 +279,8 @@
"id": "site-111",
"text": "111",
"top": 172,
- "left": 1432,
- "width": 89,
+ "left": 1413,
+ "width": 70,
"height": 20
},
{
@@ -241,8 +288,8 @@
"id": "site-110",
"text": "110",
"top": 172,
- "left": 1522,
- "width": 89,
+ "left": 1484,
+ "width": 70,
"height": 20
},
{
@@ -251,7 +298,7 @@
"text": "116",
"top": 359,
"left": 1342,
- "width": 89,
+ "width": 70,
"height": 20
},
{
@@ -259,8 +306,8 @@
"id": "site-115",
"text": "115",
"top": 359,
- "left": 1432,
- "width": 89,
+ "left": 1413,
+ "width": 70,
"height": 20
},
{
@@ -268,8 +315,8 @@
"id": "site-114",
"text": "114",
"top": 359,
- "left": 1522,
- "width": 89,
+ "left": 1484,
+ "width": 70,
"height": 20
},
{
@@ -277,8 +324,8 @@
"id": "site-113",
"text": "113",
"top": 359,
- "left": 1612,
- "width": 89,
+ "left": 1555,
+ "width": 70,
"height": 20
},
]
@@ -298,7 +345,7 @@
"text": "202",
"top": 173,
"left": 1342,
- "width": 89,
+ "width": 70,
"height": 20
},
{
@@ -306,8 +353,8 @@
"id": "site-201",
"text": "201",
"top": 173,
- "left": 1432,
- "width": 89,
+ "left": 1413,
+ "width": 70,
"height": 20
},
{
@@ -315,8 +362,8 @@
"id": "site-200",
"text": "200",
"top": 173,
- "left": 1522,
- "width": 89,
+ "left": 1484,
+ "width": 70,
"height": 20
},
{
@@ -325,16 +372,16 @@
"text": "205",
"top": 358,
"left": 1342,
- "width": 89,
+ "width": 70,
"height": 20
},
{
"type": "stn",
- "id": "site-204",
- "text": "204",
+ "id": "site-261",
+ "text": "261",
"top": 358,
- "left": 1432,
- "width": 89,
+ "left": 1413,
+ "width": 70,
"height": 20
},
{
@@ -342,8 +389,8 @@
"id": "site-203",
"text": "203",
"top": 358,
- "left": 1522,
- "width": 89,
+ "left": 1484,
+ "width": 70,
"height": 20
},
]
@@ -363,7 +410,7 @@
"text": "302",
"top": 173,
"left": 1342,
- "width": 89,
+ "width": 70,
"height": 20
},
{
@@ -371,8 +418,8 @@
"id": "site-301",
"text": "301",
"top": 173,
- "left": 1432,
- "width": 89,
+ "left": 1413,
+ "width": 70,
"height": 20
},
{
@@ -380,8 +427,8 @@
"id": "site-300",
"text": "300",
"top": 173,
- "left": 1522,
- "width": 89,
+ "left": 1484,
+ "width": 70,
"height": 20
},
{
@@ -390,7 +437,7 @@
"text": "305",
"top": 358,
"left": 1342,
- "width": 89,
+ "width": 70,
"height": 20
},
{
@@ -398,8 +445,8 @@
"id": "site-304",
"text": "304",
"top": 358,
- "left": 1432,
- "width": 89,
+ "left": 1413,
+ "width": 70,
"height": 20
},
{
@@ -407,8 +454,8 @@
"id": "site-303",
"text": "303",
"top": 358,
- "left": 1522,
- "width": 89,
+ "left": 1484,
+ "width": 70,
"height": 20
},
]
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index be0ee1c..d69319f 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -605,7 +605,7 @@
var offSet = 0;
unit = 60;
- offSet = 550;
+ offSet = 350;
if(crns[i].bay === 1){
--
Gitblit v1.9.1