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;