From 3c8b4f87fa61885f3c28d00eb6b9c9abde9bd462 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 01 八月 2023 16:25:02 +0800
Subject: [PATCH] 检测穿梭车是否在提升机内

---
 src/main/java/com/zy/core/MainProcess.java |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 28f02f5..b3b1831 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -41,9 +41,6 @@
                         continue;
                     }
 
-//                    // 婕旂ず
-//                    mainService.demo();
-
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateStoreWrkFile(); // 缁勬墭
 //                    mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
@@ -53,14 +50,12 @@
 
                     //鍒濆鍖栧疄鏃跺湴鍥�
                     mainService.initRealtimeBasMap();
-//                    //浠巖edis涓噸鍚换鍔�
-//                    mainService.restartTaskFromRedis();
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
                     // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
-                    mainService.shuttleIoInExecute();
+                    mainService.shuttleInExecute();
                     // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
-                    mainService.shuttleIoOutExecute();
+                    mainService.shuttleOutExecute();
                     //鍥涘悜绌挎杞︿换鍔″畬鎴�
                     mainService.shuttleFinished();
                     //鎻愬崌鏈轰换鍔�
@@ -69,8 +64,10 @@
                     mainService.liftFinished();
                     //搴撲綅绉昏浆
                     mainService.locToLocExecute();
-                    // 寮傚父淇℃伅璁板綍
-                    mainService.recErr();
+                    //鎵ц灏忚溅绉诲簱浠诲姟
+                    mainService.shuttleMoveExecute();
+//                    // 寮傚父淇℃伅璁板綍
+//                    mainService.recErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
@@ -78,8 +75,8 @@
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
                     // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
-                    mainService.loopShuttleCharge();
-                    mainService.executeShuttleCharge();
+//                    mainService.loopShuttleCharge();
+//                    mainService.executeShuttleCharge();
 
 //                    //鍑哄叆搴撴ā寮�
 //                    i++;

--
Gitblit v1.9.1