From 5ee5f0f833ff06a012ac65db476d2b906cce0e1f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 27 五月 2021 10:32:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 2 +-
src/main/resources/application.yml | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ce1ac8e..05dd008 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -113,7 +113,7 @@
case 110:
whsType = 4;
break;
- case 306:
+ case 301:
whsType = 5;
break;
default:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fecd4f9..41cb95c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -126,22 +126,22 @@
slot: 1
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 306
+ staNo: 301
barcode: ${wcs-slave.barcode[0].id}
# # 鍏ュ簱鍙�2
# inSta[1]:
# staNo: 202
# barcode: ${wcs-slave.barcode[1].id}
- inSta[2]:
+ inSta[1]:
staNo: 110
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 306
+ staNo: 301
# 绌烘澘鍏ュ簱鍙�2
# emptyInSta[1]:
# staNo: 202
# 绌烘澘鍏ュ簱鍙�3
- emptyInSta[2]:
+ emptyInSta[1]:
staNo: 126
# 鍑哄簱鍙�1
outSta[0]:
@@ -163,11 +163,11 @@
id: 1
ip: 192.168.10.130
port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 192.168.10.131
- port: 51236
+# # 鏉＄爜鎵弿浠�
+# barcode[1]:
+# id: 2
+# ip: 192.168.10.131
+# port: 51236
# LED1
led[0]:
id: 1
--
Gitblit v1.9.1