From 434b69ba26276fa37ee3fc6053b8376c2840ca37 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 16:42:11 +0800
Subject: [PATCH] #
---
src/main/webapp/views/render.js | 150 ++++++++++++++++++++----------------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 7 -
src/main/resources/application.yml | 54 ++++++++----
3 files changed, 121 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index df00d38..8fceff3 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -47,10 +47,9 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(101);add(102);add(103);add(104);add(105);add(106);add(107);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(101);add(102);add(103);add(104);
+ add(201);add(202);add(203);add(204);
+ add(301);add(302);add(303);add(304);add(305);add(306);
}};
/**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b9a815c..8c8e89c 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://47.97.1.152:51433;databasename=xgmasrs
- url: jdbc:sqlserver://localhost:1433;databasename=klsasrs2
+ url: jdbc:sqlserver://localhost:1433;databasename=hylyasrs
username: sa
password: sa@123
mvc:
@@ -56,14 +56,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
+ staNo: 103
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 102
+ staNo: 101
row: 2
bay: 1
lev: 1
@@ -78,14 +78,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 108
+ staNo: 203
row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
+ staNo: 201
row: 6
bay: 1
lev: 1
@@ -100,14 +100,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 112
+ staNo: 304
row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
+ staNo: 301
row: 10
bay: 1
lev: 1
@@ -121,30 +121,46 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 104
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 305
+ barcode: ${wcs-slave.barcode[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 104
+ staNo: 103
+ # 绌烘澘鍏ュ簱鍙�2
+ emptyInSta[1]:
+ staNo: 203
+ # 绌烘澘鍏ュ簱鍙�3
+ emptyInSta[2]:
+ staNo: 305
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 101
+ staNo: 102
+ # 鍑哄簱鍙�2
+ outSta[1]:
+ staNo: 202
+ # 鍑哄簱鍙�3
+ outSta[2]:
+ staNo: 303
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 104
+ staNo: 103
barcode: ${wcs-slave.barcode[0].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
- staNo: 108
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 203
+ barcode: ${wcs-slave.barcode[1].id}
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
- staNo: 112
- barcode: ${wcs-slave.barcode[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 114
- barcode: ${wcs-slave.barcode[0].id}
+ staNo: 305
+ barcode: ${wcs-slave.barcode[2].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
diff --git a/src/main/webapp/views/render.js b/src/main/webapp/views/render.js
index 8c12e73..aca6084 100644
--- a/src/main/webapp/views/render.js
+++ b/src/main/webapp/views/render.js
@@ -2,7 +2,7 @@
"mapName": "HYLYWCS",
"rackCount": 16,
"crnCount": 4,
- "stbCount": 14,
+ "stbCount": 16,
"hpPosition": 0,
"minBayNo": 2,
"floors": 1,
@@ -347,82 +347,90 @@
}],
"stns": [{
"type": "stn",
- "id": "site-112",
- "text": "112",
+ "id": "site-306",
+ "text": "306",
"top": 458,
- "left": 311,
- "width": 100,
+ "left": 211,
+ "width": 66,
"height": 24
}, {
"type": "stn",
- "id": "site-111",
- "text": "111",
- "top": 458,
- "left": 209,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-114",
- "text": "114",
- "top": 568,
- "left": 311,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-113",
- "text": "113",
- "top": 568,
- "left": 209,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-105",
- "text": "105",
- "top": 262,
- "left": 201,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-109",
- "text": "109",
+ "id": "site-303",
+ "text": "303",
"top": 399,
- "left": 208,
+ "left": 211,
+ "width": 66,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-304",
+ "text": "304",
+ "top": 458,
+ "left": 345,
+ "width": 66,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-305",
+ "text": "305",
+ "top": 458,
+ "left": 278,
+ "width": 66,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-401",
+ "text": "401",
+ "top": 568,
+ "left": 311,
"width": 100,
"height": 24
}, {
"type": "stn",
- "id": "site-108",
- "text": "108",
+ "id": "site-402",
+ "text": "402",
+ "top": 568,
+ "left": 209,
+ "width": 100,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-202",
+ "text": "202",
+ "top": 262,
+ "left": 202,
+ "width": 100,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-302",
+ "text": "302",
+ "top": 399,
+ "left": 278,
+ "width": 66,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-203",
+ "text": "203",
"top": 318,
"left": 303,
"width": 100,
"height": 24
}, {
"type": "stn",
- "id": "site-107",
- "text": "107",
+ "id": "site-204",
+ "text": "204",
"top": 318,
- "left": 201,
+ "left": 202,
"width": 100,
"height": 24
}, {
"type": "stn",
- "id": "site-106",
- "text": "106",
+ "id": "site-201",
+ "text": "201",
"top": 262,
"left": 303,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-104",
- "text": "104",
- "top": 180,
- "left": 255,
"width": 100,
"height": 24
}, {
@@ -430,14 +438,6 @@
"id": "site-103",
"text": "103",
"top": 180,
- "left": 153,
- "width": 100,
- "height": 24
- }, {
- "type": "stn",
- "id": "site-102",
- "text": "102",
- "top": 122,
"left": 255,
"width": 100,
"height": 24
@@ -446,15 +446,31 @@
"id": "site-101",
"text": "101",
"top": 122,
- "left": 153,
+ "left": 255,
"width": 100,
"height": 24
}, {
"type": "stn",
- "id": "site-110",
- "text": "110",
+ "id": "site-301",
+ "text": "301",
"top": 399,
- "left": 310,
+ "left": 345,
+ "width": 66,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-102",
+ "text": "102",
+ "top": 122,
+ "left": 154,
+ "width": 100,
+ "height": 24
+ }, {
+ "type": "stn",
+ "id": "site-104",
+ "text": "104",
+ "top": 180,
+ "left": 154,
"width": 100,
"height": 24
}]
--
Gitblit v1.9.1