From a861a66802880bf562b3d85994025c660f964832 Mon Sep 17 00:00:00 2001
From: lfdfwqwcs <lfdfwqwcs>
Date: 星期四, 06 三月 2025 10:27:45 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 150 ++++++++++++++++++++++++++-----------------------
1 files changed, 79 insertions(+), 71 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d088790..b392c89 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://localhost:1433;databasename=lfdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8081/lfdwms
+ url: 192.168.0.17:8080/lfdwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -143,8 +143,8 @@
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 10.10.10.111
- port: 102
+ ip: 10.10.10.5
+ port: 6000
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -167,8 +167,8 @@
# 鍫嗗灈鏈�6
crn[5]:
id: 6
- ip: 10.10.10.111
- port: 102
+ ip: 10.10.10.6
+ port: 6000
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -191,8 +191,8 @@
# 鍫嗗灈鏈�7
crn[6]:
id: 7
- ip: 10.10.10.111
- port: 102
+ ip: 10.10.10.7
+ port: 6000
rack: 0
slot: 0
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
@@ -225,30 +225,31 @@
barcode: ${wcs-slave.barcode[0].id}
backSta: 100
led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 109
- barcode: ${wcs-slave.barcode[1].id}
- backSta: 108
- led: ${wcs-slave.led[1].id}
# 鍏ュ簱鍙�3
- inSta[2]:
+ inSta[1]:
staNo: 117
barcode: ${wcs-slave.barcode[2].id}
- backSta: 116
+ backSta: 100
led: ${wcs-slave.led[2].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 101
barcode: ${wcs-slave.barcode[0].id}
+ backSta: 100
led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 109
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
+ emptyInSta[1]:
+ staNo: 117
+ barcode: ${wcs-slave.barcode[2].id}
+ backSta: 100
+ led: ${wcs-slave.led[2].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
staNo: 117
barcode: ${wcs-slave.barcode[2].id}
led: ${wcs-slave.led[2].id}
@@ -265,14 +266,11 @@
outSta[2]:
staNo: 100
led: ${wcs-slave.led[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 126
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 134
-# barcode: ${wcs-slave.barcode[0].id}
+ # 鍑哄簱鍙�2
+ outSta[3]:
+ staNo: 108
+ led: ${wcs-slave.led[1].id}
+
# 杈撻�佺嚎2
devp[1]:
id: 2
@@ -302,14 +300,32 @@
emptyInSta[0]:
staNo: 201
barcode: ${wcs-slave.barcode[3].id}
+ backSta: 200
led: ${wcs-slave.led[5].id}
# 绌烘澘鍏ュ簱鍙�2
emptyInSta[1]:
staNo: 207
barcode: ${wcs-slave.barcode[4].id}
+ backSta: 206
led: ${wcs-slave.led[7].id}
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
+ staNo: 213
+ barcode: ${wcs-slave.barcode[5].id}
+ backSta: 212
+ led: ${wcs-slave.led[9].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[0]:
+ staNo: 201
+ barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[5].id}
+ # 鎷ｆ枡鍏ュ簱鍙�2
+ pickSta[1]:
+ staNo: 207
+ barcode: ${wcs-slave.barcode[4].id}
+ led: ${wcs-slave.led[7].id}
+ # 鎷ｆ枡鍏ュ簱鍙�3
+ pickSta[2]:
staNo: 213
barcode: ${wcs-slave.barcode[5].id}
led: ${wcs-slave.led[9].id}
@@ -325,14 +341,6 @@
outSta[2]:
staNo: 217
led: ${wcs-slave.led[10].id}
-# # 鎷ｆ枡鍏ュ簱鍙�1
-# pickSta[0]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
-# # 鎷ｆ枡鍏ュ簱鍙�2
-# pickSta[1]:
-# staNo: 011
-# barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -367,77 +375,77 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 10.10.10.249
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 015
+ staArr: 101
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 10.10.10.248
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 108
# LED3
led[2]:
id: 3
- ip: 10.10.10.202
+ ip: 10.10.10.247
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 117
# LED4
led[3]:
id: 4
- ip: 10.10.10.202
+ ip: 10.10.10.246
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 126
# LED5
led[4]:
id: 5
- ip: 10.10.10.202
+ ip: 10.10.10.245
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ staArr: 134
# LED6
led[5]:
id: 6
- ip: 10.10.10.202
+ ip: 10.10.10.244
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 201
# LED7
led[6]:
- id: 6
- ip: 10.10.10.202
+ id: 7
+ ip: 10.10.10.243
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 205
# LED8
led[7]:
- id: 5
- ip: 10.10.10.202
+ id: 8
+ ip: 10.10.10.242
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 207
# LED9
led[8]:
- id: 6
- ip: 10.10.10.202
+ id: 9
+ ip: 10.10.10.241
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 211
# LED10
led[9]:
- id: 6
- ip: 10.10.10.202
+ id: 10
+ ip: 10.10.10.240
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 213
# LED11
led[10]:
- id: 6
- ip: 10.10.10.202
+ id: 11
+ ip: 10.10.10.239
port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 011
\ No newline at end of file
+ devpPlcId: ${wcs-slave.devp[1].id}
+ staArr: 217
\ No newline at end of file
--
Gitblit v1.9.1