代码冲突

src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java

@@ -51,8 +51,8 @@ public class LiquidPreFillStartCommand extends BaseCommandHandler {
             deviceStateService.getDeviceState().getSolutionModule().setIdle(false);//设置占用
             deviceStateService.getDeviceState().getSolutionModule().setPumping(true);//设置正在加液
             solutionModuleService.liquidValveSwitch(cmdDTO.getCommandId(), cmdDTO.getCommand(), valveStateCode);//电磁阀对应的酸液通道打开
-            transferModuleService.transferMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatArea1TrayClawPoint);//移动至加热位1
             solutionModuleService.solutionMotorMoveZero(cmdDTO.getCommandId(), cmdDTO.getCommand());//加液机械臂上升
+            transferModuleService.transferXMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatArea1TrayClawPoint.getX());//移动至加热位1
             solutionModuleService.solutionMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(),liquidAreaPreFillPoint);//加液机械臂下降至至预充点位
             solutionModuleService.liquidPumpMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), position);//预充开始 todo 泵一直转
         });