From 6d611bd596f57f0079c36bdb6a7686613f1bbb13 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 04 九月 2023 12:47:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/MainProcess.java |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 555c5f1..9555160 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,16 +50,14 @@
 
                     //鍒濆鍖栧疄鏃跺湴鍥�
                     mainService.initRealtimeBasMap();
-//                    //浠巖edis涓噸鍚换鍔�
-//                    mainService.restartTaskFromRedis();
                     // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
                     mainService.stnToCrnStnPick();
-//                    // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
-//                    mainService.shuttleIoInExecute();
-//                    // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
-//                    mainService.shuttleIoOutExecute();
-//                    //鍥涘悜绌挎杞︿换鍔″畬鎴�
-//                    mainService.shuttleFinished();
+                    // 鍏ュ簱  ===>>  鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+                    mainService.shuttleInExecute();
+                    // 鍑哄簱  ===>>  鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+                    mainService.shuttleOutExecute();
+                    //鍥涘悜绌挎杞︿换鍔″畬鎴�
+                    mainService.shuttleFinished();
                     //鎻愬崌鏈轰换鍔�
                     mainService.liftIoExecute();
                     //鎻愬崌鏈轰换鍔″畬鎴�
@@ -71,8 +66,8 @@
                     mainService.locToLocExecute();
                     //鎵ц灏忚溅绉诲簱浠诲姟
                     mainService.shuttleMoveExecute();
-//                    // 寮傚父淇℃伅璁板綍
-//                    mainService.recErr();
+                    // 寮傚父淇℃伅璁板綍
+                    mainService.recErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
                     mainService.storeEmptyPlt();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
@@ -80,8 +75,8 @@
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
                     mainService.ledReset();
                     // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
-//                    mainService.loopShuttleCharge();
-//                    mainService.executeShuttleCharge();
+                    mainService.loopShuttleCharge();
+                    mainService.executeShuttleCharge();
 
 //                    //鍑哄叆搴撴ā寮�
 //                    i++;

--
Gitblit v1.9.1