diff --git a/src/main/java/a8k/service/devicectrl/testscript/TestScript.java b/src/main/java/a8k/service/devicectrl/testscript/TestScript.java index 36607da..5c9c723 100644 --- a/src/main/java/a8k/service/devicectrl/testscript/TestScript.java +++ b/src/main/java/a8k/service/devicectrl/testscript/TestScript.java @@ -203,18 +203,22 @@ public class TestScript { AppRet scanResult = tubeRackMoveCtrl.moveTubeRackToScanPosAndScan(); if (!scanResult.isSuccess()) { tubeRackMoveCtrl.ejectTubeHolder(); + logger.info("没有扫到试管架的码"); return AppRet.message("没有扫到试管架的码", null); } - if (scanResult.getData().equals("1111\r")) { + if (!scanResult.getData().equals("1111\r")) { tubeRackMoveCtrl.ejectTubeHolder(); + logger.info("不是全血试管架 {}", scanResult.getData()); return AppRet.message("不是全血试管架", null); } AppRet isExistTube = tubeRackMoveCtrl.judgeTubeExist(0); AppRet isHighTube = tubeRackMoveCtrl.moveTubeToAltitJudgXPos(0); + tubeRackMoveCtrl.moveTubeToPreProcessPos(0); if (!isExistTube.getData()) { tubeRackMoveCtrl.ejectTubeHolder(); + logger.info("试管架上没有试管"); return AppRet.message("试管架上没有试管", null); } diff --git a/zhaohe_app.db b/zhaohe_app.db index 7d6148e..cdf383c 100644 Binary files a/zhaohe_app.db and b/zhaohe_app.db differ