From 36c6d6b39e2b76080480c5bc90a412d711b76144 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 19 六月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
index 7696f04..f4c1a03 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
@@ -41,34 +41,26 @@
continue;
}
+ //鍒濆鍖栧疄鏃跺湴鍥�
+ mainService.initRealtimeBasMap();
+
+
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateInboundWrk(); // 缁勬墭
-
- // 闂撮殧
- Thread.sleep(500);
-
-// //鍒濆鍖栧疄鏃跺湴鍥�
-// mainService.initRealtimeBasMap();
-// // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
-//// mainService.stnToCrnStnPick();
- // 鍑哄簱 =====>>
- mainService.generateOutboundWrkMast();
+ // 瑙ｆ瀽鍑哄簱宸ヤ綔妗�
+ mainService.analyzeOutBoundTask();
// 瑙ｆ瀽鍏ュ簱宸ヤ綔妗�
mainService.analyzeInBoundTask();
-// // 寮傚父淇℃伅璁板綍
-// mainService.recErr();
-// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
-// // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
-// mainService.ledExecute();
-// // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-// mainService.ledReset();
+ // 瑙ｆ瀽灏忚溅绉诲姩宸ヤ綔妗�
+ mainService.analyzeMoveTask();
+ // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+ mainService.ledExecute();
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+ mainService.ledReset();
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
mainService.loopShuttleCharge();
// 绌挎杞� ===>> 灏忚溅鐢甸噺婊＄數鍚庡洖寰呮満浣�
mainService.loopShuttleToStandbyCauseCharge();
-// // 鎵弿宸茬粡鍦ㄥ嚭搴撳彛鐨勮揣鐗� => 鍛煎彨agv鑷虫斁璐х珯鐐�
-// mainService.scanOutCallAgv();
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1