diff --git a/src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java index 39591c8..6574628 100644 --- a/src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java +++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/CondtionMgrService.java @@ -75,8 +75,7 @@ public class CondtionMgrService { //试管架处于空闲状态 Boolean cond1 = gstate.getTubeHolder().getState().equals(TubeHolderState.IDLE); //入料通道是否为空 - Boolean cond2 = getTubeholderEnterPosPPS(); - return cond0 && cond1 && cond2; + return cond0 && cond1 && getTubeholderEnterPosPPS(); } public Boolean isTimeToSwitchNextTube() { diff --git a/src/main/resources/app.db b/src/main/resources/app.db index 19bb1c1..5a9d845 100644 Binary files a/src/main/resources/app.db and b/src/main/resources/app.db differ