From 1c80f6410a4bd8d2d7cfece250d32b9bbac98ef8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 17 九月 2025 10:08:58 +0800
Subject: [PATCH] WCS配置完善
---
src/main/webapp/static/js/console.map.js | 46 +++++++++++-----------
src/main/java/com/zy/core/MainProcess.java | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 3 -
src/main/resources/application.yml | 53 +++++++++++++++++---------
4 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index f6cc851..352c57c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -41,7 +41,7 @@
}
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-// mainService.stnToCrnStnPick(3);
+ mainService.stnToCrnStnPick(3);
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index db266b3..1d45d5c 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -46,8 +46,7 @@
private short heartBeatVal = 1;
private StaError1 staError1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(100);add(101);add(102);add(103);
- add(104);add(105);add(106);add(107);
+ add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);
}};
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 68edfc1..234d11a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -58,14 +58,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 104
row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 102
row: 2
bay: 1
lev: 1
@@ -82,14 +82,14 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
+ staNo: 106
row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
+ staNo: 108
row: 7
bay: 1
lev: 1
@@ -103,34 +103,47 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 103
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 103
led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�2
inSta[1]:
- staNo: 105
+ staNo: 106
barcode: ${wcs-slave.barcode[1].id}
- backSta: 104
+ backSta: 105
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 103
+ staNo: 104
barcode: ${wcs-slave.barcode[0].id}
- backSta: 102
+ backSta: 103
led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
- staNo: 105
+ staNo: 106
barcode: ${wcs-slave.barcode[1].id}
- backSta: 104
+ backSta: 105
+ led: ${wcs-slave.led[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 104
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 103
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 106
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 105
led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 100
+ staNo: 101
led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 106
+ staNo: 107
led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�1
@@ -150,25 +163,29 @@
ip: 10.10.10.190
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 100
+ staArr: 101
+ crnId: 1
# LED2
led[1]:
id: 2
ip: 10.10.10.191
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102,103
+ staArr: 104
+ crnId: 1
# LED3
led[2]:
id: 3
ip: 10.10.10.192
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104,105
+ staArr: 106
+ crnId: 2
# LED4
led[3]:
id: 4
ip: 10.10.10.192
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 106
\ No newline at end of file
+ staArr: 107
+ crnId: 2
\ 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 39163d8..c7cae1d 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -305,29 +305,20 @@
"stns": [
{
"type": "stn",
- "id": "site-100",
- "text": "100",
- "top": 218,
- "left": 260,
- "width": 65,
- "height": 22
- },
- {
- "type": "stn",
"id": "site-101",
"text": "101",
"top": 218,
- "left": 330,
- "width": 68,
+ "left": 260,
+ "width": 65,
"height": 22
},
{
"type": "stn",
"id": "site-102",
"text": "102",
- "top": 284,
- "left": 260,
- "width": 65,
+ "top": 218,
+ "left": 330,
+ "width": 68,
"height": 22
},
{
@@ -335,17 +326,17 @@
"id": "site-103",
"text": "103",
"top": 284,
- "left": 330,
- "width": 68,
+ "left": 260,
+ "width": 65,
"height": 22
},
{
"type": "stn",
"id": "site-104",
"text": "104",
- "top": 367,
- "left": 260,
- "width": 65,
+ "top": 284,
+ "left": 330,
+ "width": 68,
"height": 22
},
{
@@ -353,14 +344,23 @@
"id": "site-105",
"text": "105",
"top": 367,
- "left": 330,
- "width": 68,
+ "left": 260,
+ "width": 65,
"height": 22
},
{
"type": "stn",
"id": "site-106",
"text": "106",
+ "top": 367,
+ "left": 330,
+ "width": 68,
+ "height": 22
+ },
+ {
+ "type": "stn",
+ "id": "site-107",
+ "text": "107",
"top": 431,
"left": 260,
"width": 65,
@@ -368,8 +368,8 @@
},
{
"type": "stn",
- "id": "site-107",
- "text": "107",
+ "id": "site-108",
+ "text": "108",
"top": 431,
"left": 330,
"width": 68,
--
Gitblit v1.9.1