From a55f2835748bd494ff46ca3e1a2d7d672153cb2f Mon Sep 17 00:00:00 2001
From: Administrator <XS@163.COM>
Date: 星期六, 25 四月 2026 13:50:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/plugin/XiaosongProcess.java | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/XiaosongProcess.java b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
index b047396..364d4cb 100644
--- a/src/main/java/com/zy/core/plugin/XiaosongProcess.java
+++ b/src/main/java/com/zy/core/plugin/XiaosongProcess.java
@@ -24,6 +24,8 @@
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.plugin.api.MainProcessPluginApi;
+import com.zy.core.task.MainProcessLane;
+import com.zy.core.task.MainProcessTaskSubmitter;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.CrnOperateProcessUtils;
import com.zy.core.utils.DualCrnOperateProcessUtils;
@@ -40,6 +42,8 @@
@Slf4j
@Component
public class XiaosongProcess implements MainProcessPluginApi {
+ private static final long DISPATCH_INTERVAL_MS = 200L;
+ private static final long MAINTENANCE_INTERVAL_MS = 500L;
@Autowired
private CrnOperateProcessUtils crnOperateUtils;
@@ -57,36 +61,46 @@
private WmsOperateUtils wmsOperateUtils;
@Autowired
private DualCrnOperateProcessUtils dualCrnOperateProcessUtils;
+ @Autowired
+ private MainProcessTaskSubmitter mainProcessTaskSubmitter;
@Override
public void run() {
- //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔$敓鎴愶紝骞跺惎鍔ㄥ叆搴�
- checkInStationHasTask();
- //璇锋眰鐢熸垚鍏ュ簱浠诲姟
- generateStoreWrkFile();
+ // 妫�娴嬪叆搴撶珯鏄惁鏈変换鍔$敓鎴愶紝骞舵寜绔欑偣 lane 寮傛鍚姩鍏ュ簱
+ stationOperateProcessUtils.submitStationEnableInTasks(DISPATCH_INTERVAL_MS);
+ // 璇锋眰鐢熸垚鍏ュ簱浠诲姟锛屾斁鍏ョ嫭绔� lane锛岄伩鍏嶆嫋鎱㈠叾浠栦富娴佺▼鏂规硶
+ submitGenerateStoreWrkFileTask();
- //鎵ц鍫嗗灈鏈轰换鍔�
- crnOperateUtils.crnIoExecute();
- //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
- crnOperateUtils.crnIoExecuteFinish();
- //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
- stationOperateProcessUtils.stationInExecute();
- //鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
- stationOperateProcessUtils.crnStationOutExecute();
- //鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
- stationOperateProcessUtils.dualCrnStationOutExecute();
- //妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
- stationOperateProcessUtils.stationOutExecuteFinish();
+ // 鎵ц鍫嗗灈鏈轰换鍔�
+ crnOperateUtils.submitCrnIoTasks(DISPATCH_INTERVAL_MS);
+ // 鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
+ crnOperateUtils.submitCrnIoExecuteFinishTasks(DISPATCH_INTERVAL_MS);
+ // 鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
+ stationOperateProcessUtils.submitStationInTasks(DISPATCH_INTERVAL_MS);
+ // 鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
+ stationOperateProcessUtils.submitCrnStationOutTasks(DISPATCH_INTERVAL_MS);
+ // 鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
+ stationOperateProcessUtils.submitDualCrnStationOutTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬭緭閫佺珯鐐瑰嚭搴撲换鍔℃墽琛屽畬鎴�
+ stationOperateProcessUtils.submitStationOutExecuteFinishTasks(DISPATCH_INTERVAL_MS);
// 妫�娴嬩换鍔¤浆瀹屾垚
- stationOperateProcessUtils.checkTaskToComplete();
- //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
- stationOperateProcessUtils.checkStationRunBlock();
+ stationOperateProcessUtils.submitCheckTaskToCompleteTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
+ stationOperateProcessUtils.submitCheckStationRunBlockTasks(MAINTENANCE_INTERVAL_MS);
// 鎵ц鍙屽伐浣嶅爢鍨涙満浠诲姟
- dualCrnOperateProcessUtils.dualCrnIoExecute();
+ dualCrnOperateProcessUtils.submitDualCrnIoTasks(DISPATCH_INTERVAL_MS);
// 鍙屽伐浣嶅爢鍨涙満浠诲姟鎵ц瀹屾垚
- dualCrnOperateProcessUtils.dualCrnIoExecuteFinish();
+ dualCrnOperateProcessUtils.submitDualCrnIoExecuteFinishTasks(DISPATCH_INTERVAL_MS);
+ }
+ private void submitGenerateStoreWrkFileTask() {
+ mainProcessTaskSubmitter.submitSerialTask(
+ MainProcessLane.GENERATE_STORE,
+ "generateStoreWrkFile",
+ DISPATCH_INTERVAL_MS,
+ this::generateStoreWrkFile
+ );
}
/**
--
Gitblit v1.9.1