sige 1 year ago
parent
commit
fb95254b3c
  1. 42
      src/main/java/com/iflytop/digester/DigestionTaskThread.java

42
src/main/java/com/iflytop/digester/DigestionTaskThread.java

@ -347,27 +347,27 @@ public class DigestionTaskThread extends Thread {
var device = Device.getInstance();
var errorSlot = device.heatingTurntable.getErrorSlot();
// this.updateTaskStatus("ErrorRound", "移动异常试管架至加液区");
// device.transferArm.moveTubeRackToLiquidPlate(errorSlot.index);
//
// var liquidAddition = device.liquidAddition;
// for ( var liquid : errorRound.liquids ) {
// this.updateTaskStatus("ErrorRoundLiquidAdd", String.format("异常加液 %s %d", liquid.type, liquid.volume));
// liquidAddition.addLiquidToTubes(this.errorTubeIndexes, liquid.type, liquid.volume);
// }
// this.updateTaskStatus("ErrorRoundLiquidAdd", "异常摇匀");
// liquidAddition.shake(errorRound.shakingCount);
//
// this.updateTaskStatus("ErrorRound", "移动异常试管架至加热区");
// device.transferArm.moveTubeRackToHeatingTurntable(errorSlot.index);
//
// for ( var heating : errorRound.heatings ) {
// this.updateTaskStatus("ErrorRoundHeating", String.format("异常加热 %d℃ %d分钟", heating.temperature, heating.duration));
// this.heatingSlot.heating(heating.temperature, heating.duration);
// }
//
// this.updateTaskStatus("ErrorRound", "移动异常试管架至加液区");
// device.transferArm.moveTubeRackToLiquidPlate(errorSlot.index);
this.updateTaskStatus("ErrorRound", "移动异常试管架至加液区");
device.transferArm.moveTubeRackToLiquidPlate(errorSlot.index);
var liquidAddition = device.liquidAddition;
for ( var liquid : errorRound.liquids ) {
this.updateTaskStatus("ErrorRoundLiquidAdd", String.format("异常加液 %s %d", liquid.type, liquid.volume));
liquidAddition.addLiquidToTubes(this.errorTubeIndexes, liquid.type, liquid.volume);
}
this.updateTaskStatus("ErrorRoundLiquidAdd", "异常摇匀");
liquidAddition.shake(errorRound.shakingCount);
this.updateTaskStatus("ErrorRound", "移动异常试管架至加热区");
device.transferArm.moveTubeRackToHeatingTurntable(errorSlot.index);
for ( var heating : errorRound.heatings ) {
this.updateTaskStatus("ErrorRoundHeating", String.format("异常加热 %d℃ %d分钟", heating.temperature, heating.duration));
this.heatingSlot.heating(heating.temperature, heating.duration);
}
this.updateTaskStatus("ErrorRound", "移动异常试管架至加液区");
device.transferArm.moveTubeRackToLiquidPlate(errorSlot.index);
// 拍照检查是否存在消解完成的试管
this.takeShotAndCheckFinishedTubes();

Loading…
Cancel
Save