diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java index ba6543d..17b4967 100644 --- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java +++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java @@ -56,9 +56,11 @@ public class LiquidAddCommand extends BaseCommandHandler { Point3D feedAreaTrayPoint3D = devicePositionService.getPosition(DevicePositionCode.feedAreaTrayPoint).getPoint3D();//获取上料区托盘夹爪位置点 Double transferModuleXPickTrayMoveDistance = devicePositionService.getPosition(DevicePositionCode.transferModuleXPickTrayMoveDistance).getDistance();//获取转运模块X轴拿取托盘进出卡槽移动距离 JSONArray jsonArray = cmdDTO.getJSONArrayParam("columns");//获取参数 + //todo 容器id为空 Integer containerId = cmdDTO.getIntegerParam("containerId");//溶液ID double volume = cmdDTO.getDoubleParam("volume");//量 - Container container = containerService.getById(containerId); + //Container container = containerService.getById(containerId); + Container container = containerService.getById(1); Solutions solutions = solutionsService.getById(container.getSolutionId());//获取溶液 Assert.isTrue(!jsonArray.isEmpty(), () -> new AppException(ResultCode.INVALID_PARAMETER));//确定选中了列 deviceStateService.getCommandMutexState().get().setTransferCommandExecuting(true);