From d6e4dfb1ac4c9bc1cff025d6215cd5023fd7a17e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 02 十二月 2023 13:23:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 -
src/main/webapp/static/js/console.map.js | 337 ++++++++++++++++++++++++++++++++++++++++-------
src/main/resources/application.yml | 69 +++++++--
3 files changed, 335 insertions(+), 78 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 59d5d39..6a8cc16 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -106,13 +106,6 @@
}
String barcode = barcodeThread.getBarcode();
- ////鍒ゆ柇101鍜�104鏄惁鏄嫞鏂欍�佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
- if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
- log.error("101鎴�104鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱", wrkMast1.getWrkNo());
- continue;
- }
-
if (!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 98edd14..f86372d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -41,7 +41,7 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4
+ doubleLocs: 1,4,5,8
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -57,29 +57,39 @@
# 鍫嗗灈鏈哄叆搴撶珯1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 1
+ staNo: 1003
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 1
+ staNo: 1006
+ row: 3
bay: 1
lev: 1
- # 绌烘墭鍏ュ簱绔欑偣
- emptyCrnInStn[0]:
+ # 鍫嗗灈鏈�2
+ crn[1]:
+ id: 2
+ ip: 10.10.10.111
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯1
+ crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
- row: 1
+ staNo: 1013
+ row: 7
bay: 1
lev: 1
- # 绌烘墭鍑哄簱绔欑偣
- emptyCrnOutStn[0]:
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�1
+ crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 1
+ staNo: 1010
+ row: 6
bay: 1
lev: 1
# 杈撻�佺嚎1
@@ -91,10 +101,16 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 102
+ staNo: 1003
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 1001
led: ${wcs-slave.led[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 1013
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 1011
+ led: ${wcs-slave.led[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 102
@@ -113,6 +129,11 @@
id: 1
ip: 10.10.10.3
port: 51236
+ # 鏉＄爜鎵弿浠�2
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.3
+ port: 51236
# LED1
led[0]:
@@ -120,11 +141,25 @@
ip: 10.10.10.205
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 1003
# LED2
led[1]:
id: 2
ip: 10.10.10.206
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
\ No newline at end of file
+ staArr: 1006
+ # LED3
+ led[2]:
+ id: 3
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1010
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.206
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 1013
\ 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 008de19..16a94e4 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,79 +1,131 @@
mapInfo = {
- "mapName": "jkxcwcs",
- "rackCount": 4,
- "crnCount": 1,
- "stbCount": 4,
- "hpPosition": 1,
+ "mapName": "QDMDWCS",
+ "rackCount": 8,
+ "crnCount": 2,
+ "stbCount": 25,
+ "hpPosition": 0,
"minBayNo": 1,
- "floors": 1,
+ "floors": 2,
"racks": [{
"type": "rack",
- "id": "rack1",
- "top": 200,
- "left": 458,
+ "id": "rack8",
+ "top": 402,
+ "left": 525,
"width": 796,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 40
+ "maxBayNo": 30
}, {
"type": "rack",
- "id": "rack2",
- "top": 224,
- "left": 458,
+ "id": "rack6",
+ "top": 319,
+ "left": 525,
"width": 796,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 20
+ "maxBayNo": 30
}, {
"type": "rack",
- "id": "rack3",
- "top": 298,
- "left": 458,
+ "id": "rack7",
+ "top": 378,
+ "left": 525,
"width": 796,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 20
+ "maxBayNo": 30
+ }, {
+ "type": "rack",
+ "id": "rack5",
+ "top": 295,
+ "left": 525,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 30
}, {
"type": "rack",
"id": "rack4",
- "top": 322,
- "left": 458,
+ "top": 268,
+ "left": 525,
"width": 796,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 20
+ "maxBayNo": 30
+ }, {
+ "type": "rack",
+ "id": "rack1",
+ "top": 160,
+ "left": 525,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 30
+ }, {
+ "type": "rack",
+ "id": "rack2",
+ "top": 184,
+ "left": 525,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 30
+ }, {
+ "type": "rack",
+ "id": "rack3",
+ "top": 244,
+ "left": 525,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 1,
+ "maxBayNo": 30
}],
"rackDescs": [{
"type": "rackDescs",
"id": "lb_desc17",
"text": "#1",
- "top": 200,
- "left": 380,
+ "top": 160,
+ "left": 1365,
"width": 30,
"height": 23
}, {
"type": "rackDescs",
"id": "lb_desc16",
- "text": "#4",
- "top": 322,
- "left": 377,
+ "text": "#8",
+ "top": 402,
+ "left": 1367,
"width": 33,
"height": 23
}],
"crns": [{
+ "type": "crane",
+ "id": "crn-2",
+ "text": "2",
+ "top": 348,
+ "left": 803,
+ "width": 93,
+ "height": 22
+ }, {
"type": "track",
"id": "lb_track1",
"text": "",
- "top": 269,
- "left": 442,
+ "top": 224,
+ "left": 509,
+ "width": 850,
+ "height": 2
+ }, {
+ "type": "track",
+ "id": "lb_track2",
+ "text": "",
+ "top": 359,
+ "left": 509,
"width": 850,
"height": 2
}, {
"type": "crane",
"id": "crn-1",
"text": "1",
- "top": 258,
- "left": 736,
+ "top": 215,
+ "left": 803,
"width": 93,
"height": 22
}],
@@ -83,47 +135,224 @@
"text": "妤煎眰",
"top": 66,
"left": 80,
- "width": 1416,
- "height": 623,
+ "width": 1374,
+ "height": 666,
"floors": [{
"type": "floor",
"id": "page_floor1",
"text": "1F",
"top": 4,
"left": 22,
- "width": 1390,
- "height": 615,
+ "width": 1348,
+ "height": 658,
"stns": [{
"type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 298,
- "left": 1255,
- "width": 73,
+ "id": "site-1013",
+ "text": "1013",
+ "top": 378,
+ "left": 459,
+ "width": 65,
"height": 23
}, {
"type": "stn",
- "id": "site-103",
- "text": "103",
- "top": 223,
- "left": 1255,
- "width": 101,
+ "id": "site-1002",
+ "text": "1002",
+ "top": 184,
+ "left": 393,
+ "width": 65,
"height": 23
}, {
"type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 223,
- "left": 1358,
- "width": 101,
+ "id": "site-1001",
+ "text": "1001",
+ "top": 184,
+ "left": 327,
+ "width": 65,
+ "height": 42
+ }, {
+ "type": "stn",
+ "id": "site-1012",
+ "text": "1012",
+ "top": 378,
+ "left": 393,
+ "width": 65,
"height": 23
}, {
"type": "stn",
- "id": "site-101",
- "text": "101",
- "top": 298,
- "left": 1330,
- "width": 73,
+ "id": "site-1005",
+ "text": "1005",
+ "top": 244,
+ "left": 393,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1003",
+ "text": "1003",
+ "top": 184,
+ "left": 459,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1010",
+ "text": "1010",
+ "top": 319,
+ "left": 459,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1008",
+ "text": "1008",
+ "top": 319,
+ "left": 327,
+ "width": 65,
+ "height": 41
+ }, {
+ "type": "stn",
+ "id": "site-1009",
+ "text": "1009",
+ "top": 319,
+ "left": 393,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1004",
+ "text": "1004",
+ "top": 227,
+ "left": 327,
+ "width": 65,
+ "height": 40
+ }, {
+ "type": "stn",
+ "id": "site-1007",
+ "text": "1007",
+ "top": 268,
+ "left": 327,
+ "width": 65,
+ "height": 50
+ }, {
+ "type": "stn",
+ "id": "site-1006",
+ "text": "1006",
+ "top": 244,
+ "left": 459,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1011",
+ "text": "1011",
+ "top": 361,
+ "left": 327,
+ "width": 65,
+ "height": 40
+ }]
+ }, {
+ "type": "floor",
+ "id": "page_floor2",
+ "text": "2F",
+ "top": 4,
+ "left": 22,
+ "width": 1348,
+ "height": 658,
+ "stns": [{
+ "type": "stn",
+ "id": "site-1014",
+ "text": "1014",
+ "top": 184,
+ "left": 327,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1016",
+ "text": "1016",
+ "top": 184,
+ "left": 459,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1015",
+ "text": "1015",
+ "top": 184,
+ "left": 393,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1024",
+ "text": "1024",
+ "top": 319,
+ "left": 393,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1020",
+ "text": "1020",
+ "top": 244,
+ "left": 327,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1022",
+ "text": "1022",
+ "top": 244,
+ "left": 459,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1018",
+ "text": "1018",
+ "top": 378,
+ "left": 393,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1019",
+ "text": "1019",
+ "top": 378,
+ "left": 459,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1021",
+ "text": "1021",
+ "top": 244,
+ "left": 393,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1023",
+ "text": "1023",
+ "top": 319,
+ "left": 327,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1025",
+ "text": "1025",
+ "top": 319,
+ "left": 459,
+ "width": 65,
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-1017",
+ "text": "1017",
+ "top": 378,
+ "left": 327,
+ "width": 65,
"height": 23
}]
}]
--
Gitblit v1.9.1