From c471b38363268108200e6c88c87fc219d17eb17f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 26 十一月 2024 13:13:58 +0800
Subject: [PATCH] 项目搭建完成
---
src/main/resources/application.yml | 120 +++++++++++++++++------------------------------------------
1 files changed, 35 insertions(+), 85 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e639265..68edfc1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.243:1433;databasename=ghlnasrs
-# url: jdbc:sqlserver://127.0.0.1:1433;databasename=ghlnasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsjasrs
username: sa
password: sa@123
mvc:
@@ -35,7 +34,7 @@
enable: false
wms:
- url: 10.10.10.243:8080/jsjwms
+ url: 127.0.0.1:8080/jsjwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -60,40 +59,16 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 103
- row: 2
+ row: 3
bay: 1
lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 2
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 103
+ staNo: 101
row: 2
bay: 1
lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 105
- row: 2
- bay: 4
- lev: 1
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 107
- row: 1
- bay: 28
- lev: 1
- crnOutStn[3]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 203
- row: 2
- bay: 1
- lev: 2
# 鍫嗗灈鏈�2
crn[1]:
id: 2
@@ -107,34 +82,16 @@
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
+ staNo: 105
row: 6
bay: 1
lev: 1
- crnInStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
- lev: 2
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 101
- row: 6
+ staNo: 107
+ row: 7
bay: 1
- lev: 1
- crnOutStn[1]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 201
- row: 6
- bay: 1
- lev: 2
- crnOutStn[2]:
- devpPlcId: ${wcs-slave.devp[0].id}
- staNo: 106
- row: 6
- bay: 28
lev: 1
# 杈撻�佺嚎1
@@ -146,48 +103,35 @@
slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 101
- barcode: ${wcs-slave.barcode[0].id}
- backSta: 100
- led: ${wcs-slave.led[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
staNo: 103
- barcode: ${wcs-slave.barcode[1].id}
+ barcode: ${wcs-slave.barcode[0].id}
backSta: 102
led: ${wcs-slave.led[1].id}
- # 鍏ュ簱鍙�3
- inSta[2]:
- staNo: 305
+ # 鍏ュ簱鍙�2
+ inSta[1]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 104
+ 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}
-# emptyInSta[1]:
-# staNo: 103
-# barcode: ${wcs-slave.barcode[1].id}
-# backSta: 102
-# led: ${wcs-slave.led[1].id}
+ emptyInSta[0]:
+ staNo: 103
+ barcode: ${wcs-slave.barcode[0].id}
+ backSta: 102
+ led: ${wcs-slave.led[1].id}
+ emptyInSta[1]:
+ staNo: 105
+ barcode: ${wcs-slave.barcode[1].id}
+ backSta: 104
+ led: ${wcs-slave.led[2].id}
# 鍑哄簱鍙�1
outSta[0]:
staNo: 100
led: ${wcs-slave.led[0].id}
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 102
- led: ${wcs-slave.led[1].id}
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 104
- led: ${wcs-slave.led[2].id}
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 107
- # 鍑哄簱鍙�5
- outSta[4]:
- staNo: 305
+ staNo: 106
+ led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�1
barcode[0]:
@@ -206,8 +150,7 @@
ip: 10.10.10.190
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 101,100
-
+ staArr: 100
# LED2
led[1]:
id: 2
@@ -221,4 +164,11 @@
ip: 10.10.10.192
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104
\ No newline at end of file
+ staArr: 104,105
+ # LED4
+ led[3]:
+ id: 4
+ ip: 10.10.10.192
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 106
\ No newline at end of file
--
Gitblit v1.9.1