From 70719561b926eedeacdd01b380d95be179fac646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Sun, 20 Apr 2025 16:05:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=9C=A8=E8=80=97=E6=9D=90?= =?UTF-8?q?=E5=85=85=E8=B6=B3=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=8D?= =?UTF-8?q?=E8=A6=86=E7=9B=96tubeHolder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainctrl/mainflowctrl/action/AC30ScanTubeHolderTask.java | 1 - src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 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 d642eb1..8a3d82f 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 @@ -153,7 +153,6 @@ public class AC30ScanTubeHolderTask extends A8kActionTask { log.info("试管架配置 {}", setting); TubeHolder tubeholder = new TubeHolder(); - Assert.isTrue(setting == null || setting.tubeSettings.length == tubeholder.getTubes().length, "试管架配置信息与试管数量不匹配"); //获取试管架类型 A8kTubeHolderType tubeHolderType = A8kTubeHolderType.of(scanResult.tubeHolderType); diff --git a/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java b/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java index 5d5aa57..78d8196 100644 --- a/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/TubeStateMgrService.java @@ -124,8 +124,8 @@ public class TubeStateMgrService { //试管状态管理 // public synchronized AppError newTubeHolder(TubeHolder tubeHolder) throws AppException { - this.tubeHolder = tubeHolder; - var tubes = tubeHolder.getTubes(); +// this.tubeHolder = tubeHolder; +// var tubes = tubeHolder.getTubes(); List statInfos = consumableStateAnalyzerService.analyze(tubeHolder); @@ -140,7 +140,8 @@ public class TubeStateMgrService { return new AppError(A8kEcode.APPE_TIP_NOT_ENOUGH); } - + this.tubeHolder = tubeHolder; + var tubes = tubeHolder.getTubes(); for (Tube tube : tubes) { if (tube.getState().equals(TubeState.EMPTY)) { continue;