代码冲突

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

@@ -51,7 +51,6 @@ public class LiquidPreFillStartCommand extends BaseCommandHandler {
             deviceStateService.getDeviceState().getSolutionModule().setIdle(false);//设置占用
             deviceStateService.getDeviceState().getSolutionModule().setPumping(true);//设置正在加液
             solutionModuleService.liquidValveSwitch(cmdDTO.getCommandId(), cmdDTO.getCommand(), valveStateCode);//电磁阀对应的酸液通道打开
-            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 泵一直转

src/main/java/com/iflytop/sgs/hardware/type/driver/HeaterRodSlavedId.java

@@ -4,10 +4,10 @@ import com.iflytop.sgs.common.enums.cmd.CmdDevice;
 import com.iflytop.sgs.hardware.type.MId;
 
 public enum HeaterRodSlavedId {
-    HEATER_ROD1_ID(CmdDevice.heat_rod_1, 0, MId.IO1_ADC, 0),
-    HEATER_ROD2_ID(CmdDevice.heat_rod_2, 1, MId.IO1_ADC, 1),
-    HEATER_ROD3_ID(CmdDevice.heat_rod_3, 2, MId.IO1_ADC, 2),
-    HEATER_ROD4_ID(CmdDevice.heat_rod_4, 3, MId.IO1_ADC, 3),
+    HEATER_ROD1_ID(CmdDevice.heat_rod_1, 1, MId.IO1_ADC, 0),
+    HEATER_ROD2_ID(CmdDevice.heat_rod_2, 2, MId.IO1_ADC, 1),
+    HEATER_ROD3_ID(CmdDevice.heat_rod_3, 3, MId.IO1_ADC, 2),
+    HEATER_ROD4_ID(CmdDevice.heat_rod_4, 4, MId.IO1_ADC, 3),
     ;
 
     private final CmdDevice cmdDevice;