Browse Source

移除使用机械臂标志

master
王梦远 2 months ago
parent
commit
990e2bbe90
  1. 4
      src/main/java/com/iflytop/sgs/app/cmd/control/OutTrayCommand.java

4
src/main/java/com/iflytop/sgs/app/cmd/control/OutTrayCommand.java

@ -63,7 +63,7 @@ public class OutTrayCommand extends BaseCommandHandler {
solutionModuleService.solutionMotorMoveZero(cmdDTO.getCommandId(), cmdDTO.getCommand());//加液机械臂上升
boolean heatTrayExist = deviceSensorService.getTrayStateByHeatModuleCode(targetHeatModuleCode);//获取传感器状态
Assert.isTrue(heatTrayExist, () -> new AppException(ResultCode.TARGET_HEAT_MODULE_NO_TRAY));//加热区无托盘
deviceStateService.getDeviceState().getTrayByHeatModuleCode(targetHeatModuleCode).setUseArm(true);//使用机械臂标志
//deviceStateService.getDeviceState().getTrayByHeatModuleCode(targetHeatModuleCode).setUseArm(true);//使用机械臂标志
transferModuleService.transferXMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), targetHeatModuleTrayClawPoint3D.getX() + transferModuleXPickTrayMoveDistance);//将X轴移动至目标加热模块托盘夹取点 + 进出卡槽移动距离
transferModuleService.transferZMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), targetHeatModuleTrayClawPoint3D.getZ());//Z轴下降至夹取点使托盘落入石墨加热盘
transferModuleService.transferXMoveBy(cmdDTO.getCommandId(), cmdDTO.getCommand(), -transferModuleXPickTrayMoveDistance);//X轴进入卡槽
@ -80,7 +80,7 @@ public class OutTrayCommand extends BaseCommandHandler {
trayList.removeIf((tray) -> tray.getHeatModuleCode().equals(targetHeatModuleCode));
} finally {
deviceStateService.getCommandMutexState().get().setTransferCommandExecuting(false);
deviceStateService.getDeviceState().getTrayByHeatModuleCode(targetHeatModuleCode).setUseArm(false);//使用机械臂标志
// deviceStateService.getDeviceState().getTrayByHeatModuleCode(targetHeatModuleCode).setUseArm(false);//使用机械臂标志
}
});
}

Loading…
Cancel
Save