From a8194481e665540970ade3e93734cfb4b9201d8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Thu, 29 May 2025 14:04:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=A2=84=E5=85=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java    | 8 +++-----
 .../com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java | 4 ++--
 .../com/iflytop/sgs/common/enums/data/DevicePositionCode.java     | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java
index 154bfe5..d67f568 100644
--- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java
+++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStartCommand.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * 添加溶液
+ * 预充溶液
  */
 @Slf4j
 @Component
@@ -48,15 +48,13 @@ public class LiquidPreFillStartCommand extends BaseCommandHandler {
         Double liquidAreaPreFillPoint = devicePositionService.getPosition(DevicePositionCode.liquidAreaPreFillPoint).getPositon(); //加液模块电机预充时下降进入试管抽取位置
         double position = devicePositionService.getPosition(DevicePositionCode.solutionPreFillDistance).getDistance();//溶液首次预充距离
         return runAsync(() -> {
-            deviceStateService.getDeviceState().getSolutionModule().setIdle(true);//设置占用
+            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());//加液机械臂上升
             solutionModuleService.solutionMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(),liquidAreaPreFillPoint);//加液机械臂下降至至预充点位
-            solutionModuleService.liquidPumpMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), position);//预充开始
-            deviceStateService.getDeviceState().getSolutionModule().setIdle(false);//设置占用
-            deviceStateService.getDeviceState().getSolutionModule().setPumping(false);//设置正在加液
+            solutionModuleService.liquidPumpMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), position);//预充开始 todo 泵一直转
         });
     }
 }
diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java
index b11a5df..a70d3b8 100644
--- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java
+++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidPreFillStopCommand.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * 添加溶液
+ * 预充结束
  */
 @Slf4j
 @Component
@@ -34,7 +34,7 @@ public class LiquidPreFillStopCommand extends BaseCommandHandler {
     public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
         return runAsync(() -> {
             solutionModuleService.liquidPumpStop(cmdDTO.getCommandId(), cmdDTO.getCommand());//停止预充
-            deviceStateService.getDeviceState().getSolutionModule().setIdle(false);//设置占用解除
+            deviceStateService.getDeviceState().getSolutionModule().setIdle(true);//设置占用解除
             deviceStateService.getDeviceState().getSolutionModule().setPumping(false);//设置加液结束
         });
     }
diff --git a/src/main/java/com/iflytop/sgs/common/enums/data/DevicePositionCode.java b/src/main/java/com/iflytop/sgs/common/enums/data/DevicePositionCode.java
index fa52d7c..87cde6b 100644
--- a/src/main/java/com/iflytop/sgs/common/enums/data/DevicePositionCode.java
+++ b/src/main/java/com/iflytop/sgs/common/enums/data/DevicePositionCode.java
@@ -50,9 +50,9 @@ public enum DevicePositionCode {
      */
     solutionModuleMotorDownInTubeExtPositon(DevicePositionType.POSITION, "加液模块电机下降进入试管抽取位置"),
     /**
-     * 加液模块电机预充时下降进入试管抽取位置 30mm
+     * 加液模块电机预充时下降位置 30mm
      * */
-    liquidAreaPreFillPoint(DevicePositionType.POSITION,"加液模块电机预充时下降进入试管抽取位置" ),
+    liquidAreaPreFillPoint(DevicePositionType.POSITION,"加液模块电机预充时下降取位置" ),
     /**
      * 开门位置
      */