From cf9211f711be85c8e0c1c739d01c8694d2cf5c51 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期一, 13 四月 2026 16:23:04 +0800
Subject: [PATCH] 屏蔽预调度任务
---
src/main/java/com/zy/core/plugin/NormalProcess.java | 9 +++++++++
src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java | 2 +-
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 9 ++++++---
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java | 16 ++++++++--------
4 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
index ab059c4..06b3fb8 100644
--- a/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
+++ b/src/main/java/com/zy/asrs/task/InboundCrnMoveDispatchScheduler.java
@@ -44,7 +44,7 @@
this.crnOperateProcessUtils = crnOperateProcessUtils;
}
- @Scheduled(fixedDelay = 1000L)
+// @Scheduled(fixedDelay = 1000L)
public void dispatchInboundCrnMove() {
List<BasCrnp> basCrnps = basCrnpService.list(new QueryWrapper<BasCrnp>()
.orderByAsc("crn_no"));
diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 1a6cec9..34b90a4 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -63,17 +63,26 @@
//鎵ц鍫嗗灈鏈轰换鍔★紝鎸� lane 涓茶鎻愪氦
crnOperateUtils.submitCrnIoTasks(DISPATCH_INTERVAL_MS);
+
//鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴愶紝鎸� lane 涓茶鎻愪氦
crnOperateUtils.submitCrnIoExecuteFinishTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬪叆搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ stationOperateProcessUtils.submitInboundStationArrivalTasks(DISPATCH_INTERVAL_MS);
//鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔★紝鎸� lane 涓茶鎻愪氦
stationOperateProcessUtils.submitStationInTasks(DISPATCH_INTERVAL_MS);
+
//鎵ц杈撻�佺珯鐐瑰嚭搴撲换鍔★紝鎸� lane 涓茶鎻愪氦
stationOperateProcessUtils.submitCrnStationOutTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬪嚭搴撲换鍔℃槸鍚﹀凡缁忓埌杈剧洰鏍囩珯鍙�
+ stationOperateProcessUtils.submitStationOutExecuteFinishTasks(DISPATCH_INTERVAL_MS);
+ // 妫�娴嬬珯鍙拌繍琛屽畬鎴愬悗鐨勪换鍔¤浆瀹屾垚
+ stationOperateProcessUtils.submitCheckTaskToCompleteTasks(DISPATCH_INTERVAL_MS);
//妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉烇紝鎸� lane 涓茶鎻愪氦
stationOperateProcessUtils.submitCheckStationRunBlockTasks(DISPATCH_INTERVAL_MS);
//妫�娴嬭緭閫佺珯鐐逛换鍔″仠鐣欒秴鏃跺悗閲嶆柊璁＄畻璺緞锛屾寜 lane 涓茶鎻愪氦
stationOperateProcessUtils.submitCheckStationIdleRecoverTasks(DISPATCH_INTERVAL_MS);
+
}
/**
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 9406d8f..1cab1fd 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -280,9 +280,12 @@
crnCommand.setSourcePosX(Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
crnCommand.setSourcePosY(Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
crnCommand.setSourcePosZ(Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
- crnCommand.setDestinationPosX(Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY(Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
+// crnCommand.setDestinationPosX(Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
+// crnCommand.setDestinationPosY(Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
+// crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosX(0); // 鐩爣搴撲綅鎺�
+ crnCommand.setDestinationPosY(0); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(0); // 鐩爣搴撲綅灞�
crnCommand.setCommand(1); // 浠诲姟纭
return crnCommand;
}
diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 5c813e1..34fe8b5 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -134,11 +134,11 @@
return;
}
- //鎵ц绉诲姩浠诲姟
- boolean executed = executeCrnMoveTask(crnThread, crnProtocol);
- if (executed) {
- return;
- }
+// //鎵ц绉诲姩浠诲姟
+// boolean executed = executeCrnMoveTask(crnThread, crnProtocol);
+// if (executed) {
+// return;
+// }
String lastIo = resolveCrnLastIo(crnProtocol);
@@ -387,9 +387,9 @@
return false;
}
- if (!allowBatchOutboundExecute(wrkMast, true)) {
- return false;
- }
+// if (!allowBatchOutboundExecute(wrkMast, true)) {
+// return false;
+// }
for (StationObjModel stationObjModel : outStationList) {
StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
--
Gitblit v1.9.1