From e305c2c64ae1dc96d471c68b1f595b62da32de69 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 13 十一月 2025 11:55:15 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 106 ++++++++++++++++++++++------------------------------
1 files changed, 45 insertions(+), 61 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 00fc217..ac43165 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,9 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
+# url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
+ url: jdbc:sqlserver://178.18.1.201:1433;databasename=jxtlfasrs
+
username: sa
password: sa@123
mvc:
@@ -34,20 +36,20 @@
enable: false
wms:
- url: localhost:8080/fnwms
+ url: 127.0.0.1:8083/tlfwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs:
+ doubleLocs: 3
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount: 2
+ groupCount: 3
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.12.55.70
+ ip: 178.18.1.150
port: 8888
rack: 0
slot: 0
@@ -57,89 +59,71 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 202
- row: 1
- bay: 0
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
+ staNo: 100
row: 2
- bay: 0
- lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 10.12.55.60
- port: 8888
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 209
- row: 3
- bay: 0
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 210
- row: 4
- bay: 0
+ staNo: 106
+ row: 1
+ bay: 1
lev: 1
-
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 178.18.1.160
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 201
+ staNo: 101
barcode: ${wcs-slave.barcode[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 206
- barcode: ${wcs-slave.barcode[1].id}
+ backSta: 102
+ led: ${wcs-slave.led[0].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 201
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 206
+ staNo: 101
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 102
+ led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 204
+ staNo: 104
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 103
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 205
+ staNo: 102
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
ip: 172.28.15.235
port: 51236
- # 鏉＄爜鎵弿浠�2
- barcode[1]:
+ # LED1
+ led[0]:
+ id: 1
+ ip: 178.18.1.28
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 104
+ crnId: 1
+ # LED2
+ led[1]:
id: 2
- ip: 172.28.15.235
- port: 51236
-# # LED1
-# led[0]:
-# id: 1
-# ip: 10.10.10.60
-# port: 5005
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staArr: 110
+ ip: 178.18.1.29
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 100
+ crnId: 1
+ # LED3
+ led[2]:
+ id: 3
+ ip: 178.18.1.30
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 10
+ crnId: 1
#
# #socket
# socket[0]:
--
Gitblit v1.9.1