diff --git a/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromHeatPlateToLiquidPlate.java b/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromHeatPlateToLiquidPlate.java index 213bbd5..d28da8d 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromHeatPlateToLiquidPlate.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromHeatPlateToLiquidPlate.java @@ -48,5 +48,6 @@ public class MoveMoveTubeRackFromHeatPlateToLiquidPlate extends DiTaskMoveBase { transLrMotor.moveTo("TransLrMotorStandby"); // 加热盘移动到就绪位置 heatPlateMotor.moveTo("HeatPlateStandby"); + liquidPlateMotor.moveTo("LiquidPlateStandby"); } } diff --git a/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromLiquidPlateToHeatPlate.java b/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromLiquidPlateToHeatPlate.java index 87e5933..4166d49 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromLiquidPlateToHeatPlate.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/move/MoveMoveTubeRackFromLiquidPlateToHeatPlate.java @@ -49,5 +49,6 @@ public class MoveMoveTubeRackFromLiquidPlateToHeatPlate extends DiTaskMoveBase { // slot.coverClose(); heatPlateMotor.moveTo("HeatPlateStandby"); + liquidPlateMotor.moveTo("LiquidPlateStandby"); } } diff --git a/src/src/main/java/com/my/graphiteDigesterBg/task/TaskSampleTakeOut.java b/src/src/main/java/com/my/graphiteDigesterBg/task/TaskSampleTakeOut.java index a3937e3..b102834 100644 --- a/src/src/main/java/com/my/graphiteDigesterBg/task/TaskSampleTakeOut.java +++ b/src/src/main/java/com/my/graphiteDigesterBg/task/TaskSampleTakeOut.java @@ -2,6 +2,8 @@ package com.my.graphiteDigesterBg.task; import com.my.graphiteDigesterBg.diframe.DiTaskBase; import com.my.graphiteDigesterBg.diframe.Task; import com.my.graphiteDigesterBg.move.MoveMoveTubeRackFromHeatPlateToLiquidPlate; +import com.my.graphiteDigesterBg.resource.ResHeatingTubeRackSlotManager; + @Task(name="SampleTakeOut") public class TaskSampleTakeOut extends DiTaskBase { // slot index @@ -9,10 +11,15 @@ public class TaskSampleTakeOut extends DiTaskBase { @Override public void run() { + var slotMan = this.getResourceManager(ResHeatingTubeRackSlotManager.class); + var slot = slotMan.getSlotByIndex(this.slotIndex); + var moveTubeRackFromHeatPlateToLiquidPlate = new MoveMoveTubeRackFromHeatPlateToLiquidPlate(); moveTubeRackFromHeatPlateToLiquidPlate.slotIndex = this.slotIndex; moveTubeRackFromHeatPlateToLiquidPlate.setDevice(this.getDevice()); moveTubeRackFromHeatPlateToLiquidPlate.run(); + + slot.unlock(); this.setStatus(TaskStatus.FINISHED); } }