From 95c6ea9da63330ae9d8936c521fbfb232132e143 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 26 一月 2024 21:37:54 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 115 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 81 insertions(+), 34 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6bd3e0b..874489d 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://192.168.4.15:1433;databasename=gdykasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=gdykasrs
username: sa
password: sa@123
mvc:
@@ -34,14 +34,14 @@
enable: false
wms:
- url: 127.0.0.1:8080/lktwms
+ url: 127.0.0.1:8080/ykwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,11,14,21,24
+ doubleLocs: 1,4,5,8,9,12,13,16
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 鍫嗗灈鏈�1
@@ -57,21 +57,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
- row: 2
+ staNo: 123
+ row: 3
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 104
- row: 3
+ staNo: 118
+ row: 2
bay: 1
lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.4.250
+ ip: 10.10.10.20
port: 102
rack: 0
slot: 0
@@ -81,21 +81,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 12
+ staNo: 127
+ row: 6
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 204
- row: 13
+ staNo: 131
+ row: 7
bay: 1
lev: 1
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 10.10.10.10
+ ip: 10.10.10.30
port: 102
rack: 0
slot: 0
@@ -105,21 +105,21 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
- row: 22
+ staNo: 135
+ row: 10
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 23
+ staNo: 139
+ row: 11
bay: 1
lev: 1
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 10.10.10.10
+ ip: 10.10.10.40
port: 102
rack: 0
slot: 0
@@ -129,22 +129,22 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 303
- row: 22
+ staNo: 144
+ row: 14
bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 304
- row: 23
+ staNo: 148
+ row: 15
bay: 1
lev: 1
# RGV绌挎杞�1
rgv[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.60
port: 502
rack: 0
slot: 0
@@ -172,7 +172,7 @@
# RGV绌挎杞�2
rgv[1]:
id: 2
- ip: 192.168.4.250
+ ip: 10.10.10.63
port: 502
rack: 0
slot: 0
@@ -197,33 +197,80 @@
rgvDestStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
+ # RGV绌挎杞�2
+# rgv[2]:
+# id: 3
+# ip: 10.10.10.66
+# port: 502
+# rack: 0
+# slot: 0
+# #RGV鍏ュ簱婧愮珯鐐�
+# rgvInSStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 100
+# rgvInSStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 101
+# #RGV鍑哄簱婧愮珯鐐�
+# rgvOutSStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 110
+# rgvOutSStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 112
+# #RGV鐩爣绔欑偣
+# rgvDestStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 102
+# rgvDestStn[1]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 103
# 杈撻�佺嚎1
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.50
port: 102
rack: 0
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
+ staNo: 106
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 105
led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 101
+ staNo: 106
barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
+ backSta: 105
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 101
+ staNo: 106
barcode: ${wcs-slave.barcode[0].id}
led: ${wcs-slave.led[1].id}
+ backSta: 105
+ # 鍏ュ簱鍙�1
+ inSta[1]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 108
+ led: ${wcs-slave.led[1].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 108
+ led: ${wcs-slave.led[1].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 107
+ barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[1].id}
+ backSta: 108
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 106
+ staNo: 100
led: ${wcs-slave.led[0].id}
# 鏉＄爜鎵弿浠�1
@@ -247,21 +294,21 @@
ip: 10.10.10.249
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101
+ staArr: 100
# LED2
led[1]:
id: 2
ip: 10.10.10.248
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 108
+ staArr: 106
# LED3
led[2]:
id: 3
ip: 10.10.10.247
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 117
+ staArr: 107
# LED4
led[3]:
id: 4
--
Gitblit v1.9.1