Merge remote-tracking branch 'origin/master'

src/main/java/a8k/service/devicectrl/testscript/TestScript.java

@@ -203,18 +203,22 @@ public class TestScript {
 			AppRet<String> 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<Boolean> isExistTube = tubeRackMoveCtrl.judgeTubeExist(0);
 			AppRet<Boolean> isHighTube  = tubeRackMoveCtrl.moveTubeToAltitJudgXPos(0);
+			tubeRackMoveCtrl.moveTubeToPreProcessPos(0);
 
 			if (!isExistTube.getData()) {
 				tubeRackMoveCtrl.ejectTubeHolder();
+				logger.info("试管架上没有试管");
 				return AppRet.message("试管架上没有试管", null);
 			}