From 435f01237b240dbb3316317b33f1c266004afeac Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 21 七月 2025 14:47:11 +0800
Subject: [PATCH] 1
---
src/main/webapp/static/js/console.map.js | 44 ++++++++++++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 12 ++++
src/main/resources/application.yml | 74 ++++++++++++++++++++++++
3 files changed, 126 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index ff81f77..a9be2e8 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -56,12 +56,20 @@
add(300);add(301);add(302);add(303);add(304);
}};
+ public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
+ add(311);add(312);add(313);add(314);add(315);
+ }};
+
public static final ArrayList<Integer> barcode1 = new ArrayList<Integer>() {{
add(1); add(2);
}};
public static final ArrayList<Integer> barcode2 = new ArrayList<Integer>() {{
add(3);
+ }};
+
+ public static final ArrayList<Integer> barcode3 = new ArrayList<Integer>() {{
+ add(4);
}};
private Integer count=0;
@@ -89,6 +97,8 @@
return staNos1;
case 2:
return staNos2;
+ case 3:
+ return staNos3;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -163,6 +173,8 @@
return barcode1;
case 2:
return barcode2;
+ case 3:
+ return barcode3;
default:
throw new CoolException("鑾峰彇鏉＄爜鎵弿鍣ㄥけ璐ワ紒");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fb9af3c..4852f29 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://172.17.20.240:1433;databasename=sxjzasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=sxjzasrs
username: sa
password: sa@123
mvc:
@@ -116,6 +116,30 @@
row: 6
bay: 0
lev: 1
+
+ crn[3]:
+ id: 4
+ ip: 10.10.10.40
+ port: 0
+ rack: 0
+ slot: 0
+ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2
+ demo: false
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 314
+ row: 9
+ bay: 0
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staNo: 315
+ row: 8
+ bay: 0
+ lev: 1
# 杈撻�佺嚎1
devp[0]:
id: 1
@@ -193,6 +217,35 @@
outSta[0]:
staNo: 301
led: ${wcs-slave.led[2].id}
+
+ # 杈撻�佺嚎2
+ devp[2]:
+ id: 3
+ ip: 10.10.10.140
+ port: 0
+ rack: 0
+ slot: 0
+ # 鍏ュ簱鍙�1
+ inSta[0]:
+ staNo: 311
+ barcode: ${wcs-slave.barcode[3].id}
+ backSta: 312
+ led: ${wcs-slave.led[5].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[0]:
+ staNo: 311
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 312
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 311
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[5].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 314
+ led: ${wcs-slave.led[4].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
@@ -202,6 +255,9 @@
# 鏉＄爜鎵弿浠�3
barcode[2]:
id: 3
+ # 鏉＄爜鎵弿浠�3
+ barcode[3]:
+ id: 4
# LED1
led[0]:
id: 1
@@ -229,4 +285,18 @@
ip: 10.10.10.109
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 304
\ No newline at end of file
+ staArr: 304
+ # LED3
+ led[4]:
+ id: 5
+ ip: 10.10.10.110
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staArr: 311
+ # LED4
+ led[5]:
+ id: 6
+ ip: 10.10.10.111
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[2].id}
+ staArr: 314
\ 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 add3cd5..8782408 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -70,13 +70,37 @@
"height": 22,
"minBayNo": 1,
"maxBayNo": 39
+ }, {
+ "type": "rack",
+ "id": "rack8",
+ "top": 195,
+ "left": 300,
+ "width": 1200,
+ "height": 22,
+ "minBayNo": 1,
+ "maxBayNo": 30
+ }, {
+ "type": "rack",
+ "id": "rack9",
+ "top": 142,
+ "left": 300,
+ "width": 1200,
+ "height": 22,
+ "minBayNo": 1,
+ "maxBayNo": 30
}],
"rackDescs": [{
"type": "rackDescs", "id": "lb_desc16", "text": "#7", "top": 227, "left": 240, "width": 30, "height": 23
}, {
"type": "rackDescs", "id": "lb_desc1", "text": "#1", "top": 475, "left": 240, "width": 30, "height": 23
}, {
- "type": "rackDescs", "id": "lb_desc100", "text": "=>鍑哄簱=>=>", "top": 475, "left": 1470, "width": 120, "height": 23
+ "type": "rackDescs",
+ "id": "lb_desc100",
+ "text": "=>鍑哄簱=>=>",
+ "top": 475,
+ "left": 1470,
+ "width": 120,
+ "height": 23
}],
"crns": [{
"type": "crane", "id": "crn-1", "text": "1", "top": 423, "left": 300, "width": 93, "height": 22
@@ -90,6 +114,10 @@
"type": "crane", "id": "crn-3", "text": "3", "top": 256, "left": 300, "width": 93, "height": 22
}, {
"type": "track", "id": "lb_track3", "text": "", "top": 263, "left": 300, "width": 1170, "height": 2
+ }, {
+ "type": "crane", "id": "crn-4", "text": "4", "top": 170, "left": 300, "width": 93, "height": 22
+ }, {
+ "type": "track", "id": "lb_track4", "text": "", "top": 180, "left": 300, "width": 1170, "height": 2
}],
"areas": [{
"type": "Control_floor",
@@ -137,7 +165,19 @@
"type": "stn", "id": "site-303", "text": "303", "top": 227, "left": 1550, "width": 70, "height": 20
}, {
"type": "stn", "id": "site-304", "text": "304", "top": 227, "left": 1470, "width": 70, "height": 20
- }]
+ }
+ , {
+ "type": "stn", "id": "site-315", "text": "315", "top": 197, "left": 1470, "width": 70, "height": 20
+ }, {
+ "type": "stn", "id": "site-314", "text": "314", "top": 197, "left": 1550, "width": 70, "height": 20
+ }, {
+ "type": "stn", "id": "site-313", "text": "313", "top": 169, "left": 1550, "width": 70, "height": 26
+ }, {
+ "type": "stn", "id": "site-312", "text": "312", "top": 144, "left": 1550, "width": 70, "height": 20
+ }, {
+ "type": "stn", "id": "site-311", "text": "311", "top": 144, "left": 1470, "width": 70, "height": 20
+ }
+ ]
}]
}]
}
\ No newline at end of file
--
Gitblit v1.9.1