From dd91c85493463db1968e6e7a61c841d20f948cf6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 14 十一月 2023 16:37:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 6826c57..4a88cb3 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;
/**
* =====>> 寮�濮嬪伐浣�
@@ -32,42 +34,62 @@
try {
// 闂撮殧
- Thread.sleep(1000);
+ Thread.sleep(300);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
- // 婕旂ず
- mainService.demo();
-
-
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
- mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+
+ // 闂撮殧
+ Thread.sleep(500);
+
+ //鍒濆鍖栧疄鏃跺湴鍥�
+ mainService.initRealtimeBasMap();
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
- mainService.stnToCrnStnPick0();
- mainService.stnToCrnStnPick1();
- // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
- mainService.crnStnToOutStn();
- // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
- mainService.crnIoExecute();
- // 鍏ュ簱 ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
- mainService.storeFinished();
- // 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗ｇ殑瀹屾垚鎿嶄綔
- mainService.carGenerateStore();
+ mainService.stnToCrnStnPick();
+ // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+ mainService.shuttleInExecute();
+ // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+ mainService.shuttleOutExecute();
+ //鍥涘悜绌挎杞︿换鍔″畬鎴�
+ mainService.shuttleFinished();
+ //鎻愬崌鏈轰换鍔�
+ mainService.liftIoExecute();
+ //鎻愬崌鏈轰换鍔″畬鎴�
+ mainService.liftFinished();
+ //搴撲綅绉昏浆
+ mainService.locToLocExecute();
+ //鎵ц灏忚溅绉诲簱浠诲姟
+ mainService.shuttleMoveExecute();
// 寮傚父淇℃伅璁板綍
mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
mainService.storeEmptyPlt();
+ // AGV琛ヨ揣 => 鐢熸垚鍏ュ簱閫氱煡妗�
+ mainService.robotGenerateAgvTask();
+ // AGV琛ヨ揣(鏈烘鑷傛嫞鏂�)
+ mainService.agvRestockByRobot();
+ // AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
+ mainService.agvRestockInto();
+ // AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
+ mainService.agvRestockIntoByHangingWire();
+ // 300绔欐嫞鏂�
+ mainService.pick300();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
mainService.ledExecute();
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
- mainService.loopSteCharge();
+ mainService.loopShuttleCharge();
+ mainService.executeShuttleCharge();
+ // 闂撮殧
+ Thread.sleep(200);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1