diff --git a/src/main/java/a8k/app/engineer/service/qatest/ExperimentConsistencyTestingService.java b/src/main/java/a8k/app/engineer/service/qatest/ExperimentConsistencyTestingService.java index 998d899..4ac2cd4 100644 --- a/src/main/java/a8k/app/engineer/service/qatest/ExperimentConsistencyTestingService.java +++ b/src/main/java/a8k/app/engineer/service/qatest/ExperimentConsistencyTestingService.java @@ -38,6 +38,7 @@ import a8k.app.type.exception.AppException; import a8k.app.type.param.type.A8kSamplePos; import a8k.app.type.ui.TubeHolderSetting; import a8k.app.type.ui.TubeSetting; +import a8k.app.utils.ZJsonHelper; import a8k.app.utils.ZList; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -112,6 +113,7 @@ public class ExperimentConsistencyTestingService { if (tubeExTubeHolderExConfig != null) { this.tubeHolderExConfig = tubeExTubeHolderExConfig; } + log.info("更新试管架配置 {}", ZJsonHelper.objectToJson(tubeHolderExConfig)); } synchronized public TubeHolderExConfig getTubeExConfig() { @@ -161,7 +163,7 @@ public class ExperimentConsistencyTestingService { int testTotalTimes = 0; for (TubeSetting tubeSetting : tubeHolderSetting.tubeSettings) { for (Integer ignored : tubeSetting.projId) { - testTotalTimes++; + testTotalTimes += tubeHolderExConfig.tubeExConfigs.get(tubeSetting.tubeIndex).repeatTimes; } } if (consumablesMgrService.getConsumableNum(1/*hscrp项目*/) < testTotalTimes) { diff --git a/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java b/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java index e1f9355..02a428d 100644 --- a/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java +++ b/src/main/java/a8k/app/service/lowerctrl/HbotMoveExCtrlService.java @@ -160,6 +160,7 @@ public class HbotMoveExCtrlService { hbotMoveCtrlService.hbotMoveTo(hbotTipPosMgr.getDropTipPos()); pipetteCtrlDriver.pipetteInitDeviceBlock(); pipetteCtrlDriver.zMotorMoveToZeroPointQuickBlock(); + moveQuickToZero(); } public void quickResetHbot() throws AppException {