From e5b22617ce5a2e3159436143020a27459c8e75b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 10:03:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 9 +++++----
src/main/resources/application.yml | 40 ++++++++++++++++++++--------------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 7dd67f8..9a4fdff 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -34,6 +34,11 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+
+ // 闂撮殧
+ Thread.sleep(1500);
+ log.info("WCS 宸ヤ綔涓� .....................");
+
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
@@ -46,13 +51,9 @@
mainService.storeFinished();
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
-
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
mainService.storeEmptyPlt();
- // 闂撮殧
- Thread.sleep(1500);
- log.info("WCS 宸ヤ綔涓� .....................");
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 63be732..0645bad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -36,26 +36,26 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍫嗗灈鏈�
-# crn[0]:
-# id: 1
-# ip: 192.168.6.9
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 5
-# row: 2
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 6
-# row: 1
-# bay: 1
-# lev: 1
+ crn[0]:
+ id: 1
+ ip: 192.168.6.9
+ port: 102
+ rack: 0
+ slot: 0
+ # 鍫嗗灈鏈哄叆搴撶珯鐐�
+ crnInStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 5
+ row: 2
+ bay: 1
+ lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 6
+ row: 1
+ bay: 1
+ lev: 1
# 杈撻�佺嚎
devp[0]:
id: 1
--
Gitblit v1.9.1