From 8ba4ddfed043b20b0a15316141a9be10162ba664 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 12 十二月 2022 12:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/core/MainProcess.java | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 94ae174..f99d68c 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -30,39 +30,49 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
+
+ // 闂撮殧
+ Thread.sleep(500);
+
// 绯荤粺杩愯鐘舵�佸垽鏂�
- if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
+
+ // 婕旂ず
+ mainService.demo();
+
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
- mainService.generateStoreWrkFile();
+ mainService.generateStoreWrkFile(); // 缁勬墭
+ mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+
+ // 闂撮殧
+ Thread.sleep(500);
+
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
+ mainService.stnToCrnStnPick0();
+ mainService.stnToCrnStnPick1();
+ // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐规姷杈剧洰鏍囩珯
+ mainService.pickWrkCompleteStaNo();
// 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
mainService.crnStnToOutStn();
// 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
mainService.crnIoExecute();
-
-
-
-
-
-
-
-
-
-
- // 鎵ц瀵瑰伐浣滄。鐨勫叆搴撳畬鎴�
+ // 鍏ュ簱 ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
mainService.storeFinished();
- // 鏇存柊鍫嗗灈鏈虹Щ鍔ㄦ椂宸ヤ綔妗ｇ姸鎬�
- mainService.updateCrnMove();
+ // 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
+ mainService.carGenerateStore();
+ // 寮傚父淇℃伅璁板綍
+ mainService.recErr();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
+ mainService.storeEmptyPlt();
+ // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+ mainService.ledExecute();
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+ mainService.ledReset();
+ // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
+ mainService.loopSteCharge();
-
-
-
- // 闂撮殧
- Thread.sleep(1500);
- log.info("WCS 宸ヤ綔涓� .....................");
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1