|
@ -44,6 +44,7 @@ import lombok.extern.slf4j.Slf4j; |
|
|
import org.springframework.stereotype.Component; |
|
|
import org.springframework.stereotype.Component; |
|
|
import org.springframework.util.Assert; |
|
|
import org.springframework.util.Assert; |
|
|
|
|
|
|
|
|
|
|
|
import javax.swing.*; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Objects; |
|
|
import java.util.Objects; |
|
|
|
|
|
|
|
@ -289,12 +290,13 @@ public class ExperimentConsistencyTestingService { |
|
|
} |
|
|
} |
|
|
Assert.isTrue(scanResult.tube[tubeoff].isTubeExist, String.format("位置[%d]未放入是试管", tubeoff + 1)); |
|
|
Assert.isTrue(scanResult.tube[tubeoff].isTubeExist, String.format("位置[%d]未放入是试管", tubeoff + 1)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//移动试管架到预处理位置 |
|
|
//移动试管架到预处理位置 |
|
|
int finalTubeoff = tubeoff; |
|
|
int finalTubeoff = tubeoff; |
|
|
UISender.txInfoMsg(log, "开始处理第%d个试管", finalTubeoff + 1); |
|
|
UISender.txInfoMsg(log, "开始处理第%d个试管", finalTubeoff + 1); |
|
|
docmd("移动试管到处理位", () -> tubeFeedingCtrlService.moveTubeToPreProcessPos(finalTubeoff)); |
|
|
docmd("移动试管到处理位", () -> tubeFeedingCtrlService.moveTubeToPreProcessPos(finalTubeoff)); |
|
|
|
|
|
|
|
|
|
|
|
for (int j = 0; j < getRepeatTimes(tubeoff); j++) { |
|
|
|
|
|
|
|
|
//尝试处理孵育完成的反应板 |
|
|
//尝试处理孵育完成的反应板 |
|
|
incubationPlateProcess(false); |
|
|
incubationPlateProcess(false); |
|
|
|
|
|
|
|
@ -326,7 +328,6 @@ public class ExperimentConsistencyTestingService { |
|
|
tube.setSampleId(sampleId); |
|
|
tube.setSampleId(sampleId); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (int j = 0; j < getRepeatTimes(tubeoff); j++) { |
|
|
|
|
|
//处理试管 |
|
|
//处理试管 |
|
|
processTube(tube, tubeoff, consumableInfo, tubeSetting); |
|
|
processTube(tube, tubeoff, consumableInfo, tubeSetting); |
|
|
if (!tube.getErrors().isEmpty()) { |
|
|
if (!tube.getErrors().isEmpty()) { |
|
|