|
|
@ -5,6 +5,7 @@ import cn.hutool.json.JSONArray; |
|
|
|
import cn.hutool.json.JSONObject; |
|
|
|
import com.iflytop.sgs.app.core.BaseCommandHandler; |
|
|
|
import com.iflytop.sgs.app.model.bo.Point3D; |
|
|
|
import com.iflytop.sgs.app.model.bo.status.device.SolutionContainerState; |
|
|
|
import com.iflytop.sgs.app.model.bo.status.device.TransferModuleState; |
|
|
|
import com.iflytop.sgs.app.model.dto.CmdDTO; |
|
|
|
import com.iflytop.sgs.app.model.entity.Solutions; |
|
|
@ -48,7 +49,7 @@ public class LiquidPreFillStartCommand extends BaseCommandHandler { |
|
|
|
Assert.notNull(solutions, () -> new AppException(ResultCode.OPERATION_NOT_ALLOWED));//检验参数 |
|
|
|
ValveStateCode valveStateCode = ValveStateCode.valueOf(solutions.getCode());//获取对应的电磁阀通道 |
|
|
|
Point3D liquidAreaTrayPoint = devicePositionService.getPosition(DevicePositionCode.liquidAreaTrayPoint).getPoint3D(); //获取加液区上方点位 |
|
|
|
double position=devicePositionService.getPosition(DevicePositionCode.solutionPreFillDistance).getDistance();//预充开始 |
|
|
|
double position=devicePositionService.getPosition(DevicePositionCode.solutionPreFillDistance).getDistance(); |
|
|
|
return runAsync(() -> { |
|
|
|
deviceStateService.getDeviceState().getSolutionModule().setIdle(true);//设置占用 |
|
|
|
deviceStateService.getDeviceState().getSolutionModule().setPumping(true);//设置正在加液 |
|
|
@ -56,6 +57,9 @@ public class LiquidPreFillStartCommand extends BaseCommandHandler { |
|
|
|
solutionModuleService.solutionMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), 0);//加液机械臂上升 |
|
|
|
transferModuleService.transferMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), liquidAreaTrayPoint);//移动至加液位置 |
|
|
|
solutionModuleService.liquidPumpMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), position);//预充开始 |
|
|
|
|
|
|
|
SolutionContainerState solutionContainerState=deviceStateService.getDeviceState().getSolutionModule().getContainerStateByCode(valveStateCode.getContainerCode());//设置容器预充状态 |
|
|
|
solutionContainerState.setFull(true);//容器状态满 |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|