From b2e9d1f13a8a88e2963f504926234589fa2d2787 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 13:45:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/java/com/zy/core/MainProcess.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 1778208..51ace7f 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -28,7 +28,7 @@
/**
* =====>> 寮�濮嬪伐浣�
*/
- public void start(){
+ public void start() {
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
@@ -40,32 +40,35 @@
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
continue;
}
-
-// // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-// mainService.generateStoreWrkFile(); // 缁勬墭
+ //zhangc
+ //杈撻�佺嚎
+ // 鍏ュ簱
+ // mainService.generateInboundWrk();
+ // 鍑哄簱
+ // mainService.stnToOutStn();
//鍒濆鍖栧疄鏃跺湴鍥�
mainService.initRealtimeBasMap();
-// // 鎷ｆ枡銆佸苟鏉垮啀鍏ュ簱
-// mainService.stnToCrnStnPick();
-// // 鐩樼偣鍐嶅叆搴�
-// mainService.stnToCrnStnPlate();
-// // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
-// mainService.shuttleInExecute();
-// // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
-// mainService.shuttleOutExecute();
+ // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
+ mainService.shuttleInExecute();
+ // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
+ mainService.shuttleOutExecute();
//鍥涘悜绌挎杞︿换鍔″畬鎴�
mainService.shuttleFinished();
+ //鎵ц绉诲簱浠诲姟
+ mainService.shuttleLocMoveExecute();
+// //璐у弶鎻愬崌鏈轰换鍔�
+// mainService.forkLiftIoExecute();
+// //璐у弶鎻愬崌鏈轰换鍔″畬鎴�
+// mainService.forkLiftFinished();
// //鎻愬崌鏈轰换鍔�
// mainService.liftIoExecute();
- //璐у弶鎻愬崌鏈轰换鍔″畬鎴�
- mainService.forkLiftFinished();
- //鎵ц灏忚溅绉诲簱浠诲姟
+ //鎻愬崌鏈轰换鍔″畬鎴�
+ mainService.liftFinished();
+ //鎵ц灏忚溅绉诲姩浠诲姟
mainService.shuttleMoveExecute();
// 寮傚父淇℃伅璁板綍
mainService.recErr();
-// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
-// mainService.storeEmptyPlt();
// 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
mainService.loopShuttleCharge();
mainService.executeShuttleCharge();
@@ -81,7 +84,7 @@
}
@PreDestroy
- public void shutDown(){
+ public void shutDown() {
if (thread != null) thread.interrupt();
}
--
Gitblit v1.9.1