From ac1b1719fb2fb2ad663c527248e3e30a3579b705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Sun, 20 Apr 2025 16:08:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=89=A9=E4=BD=99=E8=80=97?=
 =?UTF-8?q?=E6=9D=902=E4=B8=AA=EF=BC=8C=E5=BD=93=E5=89=8D=E8=AF=95?=
 =?UTF-8?q?=E7=AE=A1=E6=9E=B6=E9=9C=80=E8=A6=813=E4=B8=AA=E5=88=99?=
 =?UTF-8?q?=E8=80=97=E6=9D=90=E4=B8=8D=E8=B6=B3=E6=8E=A8=E5=87=BA=E8=AF=95?=
 =?UTF-8?q?=E7=AE=A1=E6=9E=B6=20=E4=BD=86=E6=98=AF=E8=80=97=E6=9D=90?=
 =?UTF-8?q?=E8=BF=98=E5=89=A9=E4=B8=8B2=E4=B8=AA=EF=BC=8C=E9=82=A3?=
 =?UTF-8?q?=E4=B9=88=E4=B8=8B=E4=B8=80=E4=B8=AA=E8=AF=95=E7=AE=A1=E6=9E=B6?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=BB=A1=E8=B6=B32=E4=B8=AA=E5=88=99?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E5=85=81=E8=AE=B8=E7=94=A8=E6=88=B7=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=93=8D=E4=BD=9C=EF=BC=8C=E8=80=97=E6=9D=90=E4=B8=8D?=
 =?UTF-8?q?=E8=B6=B3=E6=97=B6=E5=8F=AA=E5=BD=B1=E5=93=8D=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E9=82=A3=E6=9E=B6=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java
index 8a3d82f..2e5fefb 100644
--- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java
+++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java
@@ -91,9 +91,7 @@ public class AC30ScanTubeHolderTask extends A8kActionTask {
 	}
 
 	public Boolean isReady() {
-		return tubeStateMgrService.isTubeHolderProcessCompleted() &&
-				getTubeholderEnterPosPPS() &&
-				!deviceWorkStateMgrService.getConsumeNotEnoughErrorFlag();
+		return tubeStateMgrService.isTubeHolderProcessCompleted() && getTubeholderEnterPosPPS();
 	}
 
 	public String toDisplayString() {
@@ -223,6 +221,7 @@ public class AC30ScanTubeHolderTask extends A8kActionTask {
 			}
 			ebus.pushEvent(new AppWarningNotifyEvent(error));
 			doEjectHodler();
+			deviceWorkStateMgrService.clearConsumeNotEnoughErrorFlag();
 			return false;
 		}
 		return true;