From 2ea423b0f01d4db3d879066cd6c9634cc6800c7c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 27 十一月 2025 16:37:43 +0800
Subject: [PATCH] #1
---
src/main/resources/application.yml | 151 +++++++++++++++++++++++++++++---------------------
1 files changed, 87 insertions(+), 64 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7b6a6a4..5175834 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 9090
+ port: 9093
servlet:
context-path: /@pom.build.finalName@
@@ -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=jnejcasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=shhtgcasrs
username: sa
password: sa@123
mvc:
@@ -41,15 +41,15 @@
# 鍙屾繁
doubleDeep: false
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 3,4,7,10,11,14,15,18,19,22,23,26
+ doubleLocs: 3
# 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft: 4,7,11,15,19,23
+# doubleLocsLeft: 4,7,11,15,19,23
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 3,10,14,18,22,26
+ doubleLocsRight: 3
# 宸︽祬搴撲綅鎺掑彿
- shallowLocsLeft: 5,8,12,16,20,24
+ shallowLocsLeft: 1
# 鍙虫祬搴撲綅鎺掑彿
- shallowLocsRight: 2,6,9,13,17,21,25
+ shallowLocsRight: 2
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 2
# 鍫嗗灈鏈�1
@@ -65,48 +65,55 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 6
- bay: 120
+ staNo: 401
+ row: 2
+ bay: 2
lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
- crnOutStn[0]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 3
- bay: 1
- lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[1]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1016
-# row: 5
-# bay: 120
-# lev: 1
- # 鍫嗗灈鏈�2
- crn[1]:
- id: 2
- ip: 172.17.60.20
- port: 102
- rack: 0
- slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
- offset: 2
- demo: false
# 鍫嗗灈鏈哄叆搴撶珯鐐�
- crnInStn[0]:
+ crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1023
- row: 8
- bay: 1
+ staNo: 402
+ row: 2
+ bay: 30
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 1026
- row: 9
- bay: 1
+ staNo: 401
+ row: 2
+ bay: 2
lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 402
+ row: 2
+ bay: 30
+ lev: 1
+ # 鍫嗗灈鏈�2
+# crn[1]:
+# id: 2
+# ip: 172.17.60.20
+# port: 102
+# rack: 0
+# slot: 0
+# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+# offset: 2
+# demo: false
+# # 鍫嗗灈鏈哄叆搴撶珯鐐�
+# crnInStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 1023
+# row: 8
+# bay: 1
+# lev: 1
+# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+# crnOutStn[0]:
+# devpPlcId: ${wcs-slave.devp[0].id}
+# staNo: 1026
+# row: 9
+# bay: 1
+# lev: 1
# 鍫嗗灈鏈�3
# crn[2]:
# id: 3
@@ -219,31 +226,47 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 106
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ backSta: 401
led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�2
-# inSta[1]:
-# staNo: 1076
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 1075
-# led: ${wcs-slave.led[1].id}
+ inSta[1]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 402
+ led: ${wcs-slave.led[1].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 106
+ staNo: 401
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 401
+ led: ${wcs-slave.led[0].id}
+ # 绌烘澘鍏ュ簱鍙�1
+ emptyInSta[1]:
+ staNo: 402
barcode: ${wcs-slave.barcode[1].id}
- backSta: 105
+ backSta: 402
led: ${wcs-slave.led[1].id}
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
- staNo: 106
+ staNo: 401
barcode: ${wcs-slave.barcode[0].id}
- backSta: 105
+ backSta: 401
led: ${wcs-slave.led[0].id}
+ # 鎷ｆ枡鍏ュ簱鍙�1
+ pickSta[1]:
+ staNo: 402
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 402
+ led: ${wcs-slave.led[1].id}
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 102
+ staNo: 401
+ led: ${wcs-slave.led[0].id}
+ # 鍑哄簱鍙�1
+ outSta[1]:
+ staNo: 402
led: ${wcs-slave.led[0].id}
# 杈撻�佺嚎2
# devp[1]:
@@ -270,10 +293,10 @@
ip: 10.10.10.121
port: 51236
# 鏉＄爜鎵弿浠�2
-# barcode[1]:
-# id: 2
-# ip: 10.10.10.121
-# port: 51236
+ barcode[1]:
+ id: 2
+ ip: 10.10.10.121
+ port: 51236
# # 鏉＄爜鎵弿浠�3
# barcode[2]:
# id: 3
@@ -290,14 +313,14 @@
ip: 127.0.0.1
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 1009
+ staArr: 401
# LED2
-# led[1]:
-# id: 2
-# ip: 172.17.60.183
-# port: 5005
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staArr: 1075
+ led[1]:
+ id: 2
+ ip: 172.17.60.183
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 402
# # LED3
# led[2]:
# id: 3
--
Gitblit v1.9.1