From 90db1f77f09c717ce9f1f810139c43c0f88aee67 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 28 十一月 2022 11:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/resources/application.yml | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 03438c7..3735333 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -193,10 +193,6 @@
inSta[2]:
staNo: 305
barcode: ${wcs-slave.barcode[2].id}
- # 鍏ュ簱鍙�4
- inSta[3]:
- staNo: 401
- barcode: ${wcs-slave.barcode[3].id}
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
staNo: 103
@@ -206,9 +202,6 @@
# 绌烘澘鍏ュ簱鍙�3
emptyInSta[2]:
staNo: 305
- # 绌烘澘鍏ュ簱鍙�4
- emptyInSta[3]:
- staNo: 401
# 鍑哄簱鍙�1
outSta[0]:
staNo: 102
@@ -218,9 +211,6 @@
# 鍑哄簱鍙�3
outSta[2]:
staNo: 303
- # 鍑哄簱鍙�4
- outSta[3]:
- staNo: 402
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 102
@@ -233,10 +223,6 @@
pickSta[2]:
staNo: 303
barcode: ${wcs-slave.barcode[2].id}
- # 鎷ｆ枡鍏ュ簱鍙�4
- pickSta[3]:
- staNo: 402
- barcode: ${wcs-slave.barcode[3].id}
devp[1]:
id: 2
@@ -266,15 +252,15 @@
port: 51236
barcode[1]:
id: 2
- ip: 10.10.10.52
+ ip: 10.10.10.53
port: 51236
barcode[2]:
id: 3
- ip: 10.10.10.52
+ ip: 10.10.10.54
port: 51236
barcode[3]:
id: 4
- ip: 10.10.10.93
+ ip: 10.10.10.94
port: 51236
# LED1
led[0]:
--
Gitblit v1.9.1