From 97aa2cd09e92f73cd4dff3d99eaef64e748c80b3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 28 六月 2023 19:04:32 +0800
Subject: [PATCH] 优化出库小车避让
---
src/main/java/com/zy/core/MainProcess.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index a54f050..18d86f0 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -22,6 +22,8 @@
private MainServiceImpl mainService;
// 鎵�灞炵嚎绋�
private Thread thread;
+ // 棰戠巼
+ private int i = 0;
/**
* =====>> 寮�濮嬪伐浣�
@@ -49,16 +51,20 @@
// 闂撮殧
Thread.sleep(500);
- // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick();
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
- // 鍏ュ簱 ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
- mainService.storeFinished();
- // 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
- mainService.carGenerateStore();
+ //鍒濆鍖栧疄鏃跺湴鍥�
+ mainService.initRealtimeBasMap();
+ //浠巖edis涓噸鍚换鍔�
+ mainService.restartTaskFromRedis();
+ // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+ mainService.shuttleIoInExecute();
+ // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+ mainService.shuttleIoOutExecute();
+ //鍥涘悜绌挎杞︿换鍔″畬鎴�
+ mainService.shuttleFinished();
+ //鎻愬崌鏈轰换鍔�
+ mainService.liftIoExecute();
+ //鎻愬崌鏈轰换鍔″畬鎴�
+ mainService.liftFinished();
// 寮傚父淇℃伅璁板綍
mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
@@ -68,14 +74,18 @@
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
- mainService.loopSteCharge();
- mainService.executeSteCharge();
+ mainService.loopShuttleCharge();
+ mainService.executeShuttleCharge();
+
+// //鍑哄叆搴撴ā寮�
+// i++;
+// if (i > 1) {
+// mainService.outAndIn();
+// i = 0;
+// }
+
// 闂撮殧
Thread.sleep(200);
- // 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣�
-// mainService.queryChargeLocOfComplete();
-// mainService.steFromChargeToIdleLoc();
-
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1