From 92167e0e41a8b63c4aa53dc8d75e83bbac70169b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 18 九月 2025 11:16:52 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 210 ++++++++++++++++++++++++++++------------------------
1 files changed, 114 insertions(+), 96 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 47ee984..c1bff08 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://127.0.0.1:1433;databasename=phpsasrs
+ url: jdbc:sqlserver://10.10.10.233:1433;databasename=phpsasrs
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
username: sa
password: sa@123
@@ -35,7 +35,7 @@
enable: false
wms:
- url: localhost:8080/phpswms
+ url: localhost:8088/pswms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -58,45 +58,45 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 1
+ staNo: 110
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 206
- row: 1
+ staNo: 210
+ row: 2
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈哄叆搴撶珯鐐�3
crnInStn[2]:
devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 306
- row: 1
+ staNo: 310
+ row: 2
bay: 1
- lev: 1
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 2
+ staNo: 111
+ row: 1
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 207
- row: 2
+ staNo: 211
+ row: 1
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 307
- row: 2
+ staNo: 311
+ row: 1
bay: 1
- lev: 1
+ lev: 3
# 鍫嗗灈鏈�2
crn[1]:
id: 2
@@ -111,44 +111,44 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 108
- row: 3
+ row: 4
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 208
- row: 3
+ row: 4
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈哄叆搴撶珯鐐�3
crnInStn[2]:
devpPlcId: ${wcs-slave.devp[2].id}
staNo: 308
- row: 3
+ row: 4
bay: 1
- lev: 1
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 109
- row: 4
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
staNo: 209
- row: 4
+ row: 3
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[2].id}
staNo: 309
- row: 4
+ row: 3
bay: 1
- lev: 1
+ lev: 3
# 鍫嗗灈鏈�3
crn[2]:
id: 3
@@ -162,45 +162,45 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�1
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 110
- row: 5
+ staNo: 106
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�2
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 210
- row: 5
+ staNo: 206
+ row: 6
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈哄叆搴撶珯鐐�3
crnInStn[2]:
devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 310
- row: 5
+ staNo: 306
+ row: 6
bay: 1
- lev: 1
+ lev: 3
# 鍫嗗灈鏈哄嚭搴撶珯鐐�1
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 111
- row: 6
+ staNo: 107
+ row: 5
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�2
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 211
- row: 6
+ staNo: 207
+ row: 5
bay: 1
- lev: 1
+ lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�3
crnOutStn[2]:
devpPlcId: ${wcs-slave.devp[2].id}
- staNo: 311
- row: 6
+ staNo: 307
+ row: 5
bay: 1
- lev: 1
+ lev: 3
# 杈撻�佺嚎1妤�
devp[0]:
id: 1
@@ -213,16 +213,19 @@
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[0].id}
+ backSta: 100
# 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 103
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 105
- barcode: ${wcs-slave.barcode[2].id}
- led: ${wcs-slave.led[2].id}
+ inSta[1]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 102
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[2].id}
+ led: ${wcs-slave.led[2].id}
+ backSta: 104
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 101
@@ -245,14 +248,17 @@
pickSta[0]:
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
# 鎷f枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 103
barcode: ${wcs-slave.barcode[1].id}
+ backSta: 102
# 鎷f枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 105
barcode: ${wcs-slave.barcode[2].id}
+ backSta: 104
# 杈撻�佺嚎2妤�
devp[1]:
id: 2
@@ -265,16 +271,19 @@
staNo: 201
barcode: ${wcs-slave.barcode[3].id}
led: ${wcs-slave.led[3].id}
+ backSta: 200
# 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 203
- barcode: ${wcs-slave.barcode[4].id}
- led: ${wcs-slave.led[4].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 205
- barcode: ${wcs-slave.barcode[5].id}
- led: ${wcs-slave.led[5].id}
+ inSta[1]:
+ staNo: 203
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[4].id}
+ backSta: 202
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 205
+ barcode: ${wcs-slave.barcode[5].id}
+ led: ${wcs-slave.led[5].id}
+ backSta: 204
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 201
@@ -297,14 +306,17 @@
pickSta[0]:
staNo: 201
barcode: ${wcs-slave.barcode[3].id}
+ backSta: 200
# 鎷f枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 203
barcode: ${wcs-slave.barcode[4].id}
+ backSta: 202
# 鎷f枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 205
barcode: ${wcs-slave.barcode[5].id}
+ backSta: 204
# 杈撻�佺嚎3妤�
devp[2]:
id: 3
@@ -317,16 +329,19 @@
staNo: 301
barcode: ${wcs-slave.barcode[6].id}
led: ${wcs-slave.led[6].id}
+ backSta: 300
# 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 303
- barcode: ${wcs-slave.barcode[7].id}
- led: ${wcs-slave.led[7].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
- barcode: ${wcs-slave.barcode[8].id}
- led: ${wcs-slave.led[8].id}
+ inSta[1]:
+ staNo: 303
+ barcode: ${wcs-slave.barcode[7].id}
+ led: ${wcs-slave.led[7].id}
+ backSta: 302
+ # 鍏ュ簱鍙�3
+ inSta[2]:
+ staNo: 305
+ barcode: ${wcs-slave.barcode[8].id}
+ led: ${wcs-slave.led[8].id}
+ backSta: 304
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 301
@@ -349,14 +364,17 @@
pickSta[0]:
staNo: 301
barcode: ${wcs-slave.barcode[6].id}
+ backSta: 300
# 鎷f枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 303
barcode: ${wcs-slave.barcode[7].id}
+ backSta: 302
# 鎷f枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 305
barcode: ${wcs-slave.barcode[8].id}
+ backSta: 304
# 鏉$爜鎵弿浠�1
barcode[0]:
id: 1
@@ -405,63 +423,63 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.81
+ ip: 10.10.10.11
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
+ staArr: 100
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.12
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
+ staArr: 102
# LED3
led[2]:
- id: 1
- ip: 10.10.10.81
+ id: 3
+ ip: 10.10.10.13
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 105
+ staArr: 104
# LED4
led[3]:
- id: 2
- ip: 10.10.10.202
+ id: 4
+ ip: 10.10.10.14
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 201
+ staArr: 200
# LED5
led[4]:
- id: 1
- ip: 10.10.10.81
+ id: 5
+ ip: 10.10.10.15
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 203
+ staArr: 202
# LED6
led[5]:
- id: 2
- ip: 10.10.10.202
+ id: 6
+ ip: 10.10.10.16
port: 5005
devpPlcId: ${wcs-slave.devp[1].id}
- staArr: 205
+ staArr: 204
# LED7
led[6]:
- id: 1
- ip: 10.10.10.81
+ id: 7
+ ip: 10.10.10.17
port: 5005
devpPlcId: ${wcs-slave.devp[2].id}
- staArr: 301
+ staArr: 300
# LED8
led[7]:
- id: 2
- ip: 10.10.10.202
+ id: 8
+ ip: 10.10.10.18
port: 5005
devpPlcId: ${wcs-slave.devp[2].id}
- staArr: 303
+ staArr: 302
# LED9
led[8]:
- id: 1
- ip: 10.10.10.81
+ id: 9
+ ip: 10.10.10.17
port: 5005
devpPlcId: ${wcs-slave.devp[2].id}
- staArr: 305
+ staArr: 304
--
Gitblit v1.9.1