From 98d120bd0633e4e0717d584cae5514132a18516b Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 13:36:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index a775f51..6278bcb 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -117,11 +117,12 @@
                 vo.setOutEnable(stationProtocol.isOutEnable()); // 鏄惁鍙嚭
                 vo.setEmptyMk(stationProtocol.isEmptyMk()); // 鏄惁绌烘澘
                 vo.setFullPlt(stationProtocol.isFullPlt()); // 鏄惁婊℃澘
+                vo.setRunBlock(stationProtocol.isRunBlock());// 杩愯鍫靛
                 vo.setPalletHeight(stationProtocol.getPalletHeight()); // 鎵樼洏楂樺害
                 vo.setError(stationProtocol.getError()); // 閿欒鐮�
                 vo.setBarcode(stationProtocol.getBarcode()); // 鏉$爜
                 String stationStatus = StationStatusType.process(stationProtocol).toString().toLowerCase().replaceAll("_", "-");
-                if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0) {
+                if (stationProtocol.isAutoing() && stationProtocol.isLoading() && stationProtocol.getTaskNo() > 0 && !stationProtocol.isRunBlock()) {
                     String taskClass = getStationTaskClass(stationProtocol.getTaskNo(), inTaskRange, outTaskRange);
                     if (taskClass != null) {
                         stationStatus = taskClass;

--
Gitblit v1.9.1