From b82892d4b6d7ddd51d550871223036e993f76cf6 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 02 八月 2023 14:32:50 +0800
Subject: [PATCH] 提升机、穿梭车独占令牌页面显示与控制
---
src/main/java/com/zy/core/MainProcess.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 536cad9..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,18 +50,22 @@
//鍒濆鍖栧疄鏃跺湴鍥�
mainService.initRealtimeBasMap();
- //浠巖edis涓噸鍚换鍔�
- mainService.restartTaskFromRedis();
+ // 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
+ mainService.stnToCrnStnPick();
// 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
- mainService.shuttleIoInExecute();
+ mainService.shuttleInExecute();
// 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
- mainService.shuttleIoOutExecute();
+ mainService.shuttleOutExecute();
//鍥涘悜绌挎杞︿换鍔″畬鎴�
mainService.shuttleFinished();
//鎻愬崌鏈轰换鍔�
mainService.liftIoExecute();
//鎻愬崌鏈轰换鍔″畬鎴�
mainService.liftFinished();
+ //搴撲綅绉昏浆
+ mainService.locToLocExecute();
+ //鎵ц灏忚溅绉诲簱浠诲姟
+ mainService.shuttleMoveExecute();
// 寮傚父淇℃伅璁板綍
mainService.recErr();
// 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
@@ -76,19 +77,16 @@
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
mainService.loopShuttleCharge();
mainService.executeShuttleCharge();
- //鍑哄叆搴撴ā寮�
- i++;
- if (i > 1) {
- mainService.outAndIn();
- i = 0;
- }
+
+// //鍑哄叆搴撴ā寮�
+// i++;
+// if (i > 1) {
+// mainService.outAndIn();
+// i = 0;
+// }
// 闂撮殧
Thread.sleep(200);
- // 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣�
-// mainService.queryChargeLocOfComplete();
-// mainService.steFromChargeToIdleLoc();
-
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1