From 0a0f0e891ef2455d7202011e4242a60677a9091e Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 1 Aug 2024 19:23:25 +0800
Subject: [PATCH] update

---
 .../service/devicectrl/testscript/TestScript.java  |   6 +++++-
 zhaohe_app.db                                      | Bin 188416 -> 188416 bytes
 2 files changed, 5 insertions(+), 1 deletion(-)

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<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);
 			}
 
diff --git a/zhaohe_app.db b/zhaohe_app.db
index 7d6148ec18006cede763e6ecc51cda0a25e2f10a..cdf383ce6dd3509f078b0f217221052fb63bf3d7 100644
GIT binary patch
delta 613
zcma)&yGmq15Qfj0i|7t|Hdk<$2{b9J?yl1pOaz}{!iA~6)Jq7C1{&*=D2SN)7#sK=
z25zu@CNR_qD*HbE;=6jCUA@lk_S?7ngY)+7dU>;KpO>SH%avF|DrN$UIs+9Z2;Kz9
zAq87PChP4ysGvk}I$iAVZc}s-qadVW98k^?VsRR@=`j~FnJLY^6RO5!ZS=ihDq_Kg
zlz`A{;N%i;!Ie>weIGK;MG^&t<F%sL_C_d!<i5Ve9)VSTi#1}5oW*4`_g2JP9IcHY
z!A6Y*0(${c#zN3WfEk5NPCXS@H>#nqT^l|rf9kBy;3@)CQvlah&=NUXZ7D>qir3!!
zXqslLn>F2SN8O+9Z}-s6o__y&-&-Az7wskyw+3*NcGCg;BH3rL$pEf4DK#F*O#+RM
c#*3Yy%Xe9JYmeq<y{DbCkHeSA<LKYXe+&<t^8f$<

delta 613
zcma)&J4!=Q5Qgu~3uB1aK7vXLZ3fR{&I=pCHKY`BUb6|o#6oLbi9!(DEWy&9SZLw7
z5iB*uG{gV>GknYSXt^FeOzOACgUkBuc78XnU*?_bn+0Pb2@?}UMiww73tmeJjxb}8
zIa`^gjyq1o`u*8tyyGQut~7$?SpeqX!DppG2o++|m^hD9YX}R`+YrRK_n0}5(HT&f
z06}{P=);19kIZ?}Q=*8Dv+mCkr<^v1gNTX%gH{l-2ta5QNrhSqHMN?^YS!5hWtBy=
z86-tns#69R4FVdkl8>=`K;=duIIA~=(1hoXN^9__0J)XmV~W6~%$kz1Udn=4VdZXB
zRfA?!HKXRed1|n^Z?0CyM<08O)9$R^M&h6iZsV@s2LDj@YpmA>7k&#<-8Q+6pw3Bm
aHf+88r)6AxRQqLC!;8<u*WPpI>+BmtGo2j(