From f140f8d9e17f4465f029134b008ec7f644b0e3db Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 14 十一月 2025 11:08:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 93 +---------------------------------------------
1 files changed, 2 insertions(+), 91 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index de9f387..fcb313a 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -1,12 +1,10 @@
package com.zy.core;
-import com.zy.asrs.service.impl.ForkMainServiceImpl;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.properties.SystemProperties;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.annotation.PreDestroy;
@@ -20,12 +18,8 @@
@Component
public class MainProcess {
- @Value("${deviceExecuteConfig.liftType}")
- private String liftType;
@Autowired
private MainServiceImpl mainService;
- @Autowired
- private ForkMainServiceImpl forkMainService;
// 鎵�灞炵嚎绋�
private Thread thread;
// 棰戠巼
@@ -35,14 +29,6 @@
* =====>> 寮�濮嬪伐浣�
*/
public void start(){
- if(liftType.equals("ForkLift")){
- initForkMain();
- }else {
- initMain();
- }
- }
-
- private void initMain() {
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
@@ -55,83 +41,8 @@
continue;
}
- //鍒濆鍖栧疄鏃跺湴鍥�
- mainService.initRealtimeBasMap();
-
- // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
- mainService.shuttleInExecute();
- // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
- mainService.shuttleOutExecute();
-// //鍥涘悜绌挎杞︿换鍔″畬鎴�
-// mainService.shuttleFinished();
- //鎵ц绉诲簱浠诲姟
- mainService.shuttleLocMoveExecute();
- //鎻愬崌鏈轰换鍔�
- mainService.liftIoExecute();
- //鎻愬崌鏈轰换鍔″畬鎴�
- mainService.liftFinished();
- //鎵ц灏忚溅绉诲姩浠诲姟
- mainService.shuttleMoveExecute();
- // 寮傚父淇℃伅璁板綍
- mainService.recErr();
- // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
- mainService.loopShuttleCharge();
- mainService.executeShuttleCharge();
-
- //鑷姩鍒囨崲鍑哄叆搴撴ā寮�
- mainService.autoSwitchLiftIOMode();
-
- // 闂撮殧
- Thread.sleep(200);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
- thread.start();
- }
-
- private void initForkMain() {
- thread = new Thread(() -> {
- while (!Thread.currentThread().isInterrupted()) {
- try {
-
- // 闂撮殧
- Thread.sleep(300);
-
- // 绯荤粺杩愯鐘舵�佸垽鏂�
- if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
- continue;
- }
-
- //鍒濆鍖栧疄鏃跺湴鍥�
- forkMainService.initRealtimeBasMap();
-
- //鍑哄簱浠诲姟棰勮皟搴︽彁鍗囨満
- forkMainService.outTaskPreviewDispatchForkLift();
-
- // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙�
- forkMainService.shuttleInExecute();
- // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙�
- forkMainService.shuttleOutExecute();
-// //鍥涘悜绌挎杞︿换鍔″畬鎴�
-// mainService.shuttleFinished();
- //鎵ц绉诲簱浠诲姟
- forkMainService.shuttleLocMoveExecute();
- //璐у弶鎻愬崌鏈轰换鍔�
- forkMainService.forkLiftIoExecute();
- //璐у弶鎻愬崌鏈轰换鍔″畬鎴�
- forkMainService.forkLiftFinished();
- //鎵ц灏忚溅绉诲姩浠诲姟
- forkMainService.shuttleMoveExecute();
- // 寮傚父淇℃伅璁板綍
- forkMainService.recErr();
- // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢�
- forkMainService.loopShuttleCharge();
- forkMainService.executeShuttleCharge();
-
- //鑷姩鍒囨崲鍑哄叆搴撴ā寮�
- forkMainService.autoSwitchForkLiftIOMode();
+ // 鍒濆鍖栧簱浣嶅湴鍥�
+ mainService.initLocMap();
// 闂撮殧
Thread.sleep(200);
--
Gitblit v1.9.1