From 6ddff3b54f3e22a6c2d81ce40ba78b7f492ff76e Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 30 Oct 2024 13:04:29 +0800 Subject: [PATCH] update --- .../appctrl/mainflowctrl/CondtionMgrService.java | 3 +-- src/main/resources/app.db | Bin 225280 -> 225280 bytes 2 files changed, 1 insertion(+), 2 deletions(-) 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 19bb1c1fa56b2bb0a5a2f9a17834e6ff4d844b59..5a9d84567e2031c09924817c54e081d9b8d98bd6 100644 GIT binary patch delta 5415 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