From 32660397d331f1cd22b9546b1ce139a88f0516ee Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 12 Oct 2024 09:06:38 +0800
Subject: [PATCH] update

---
 app.db                                             | Bin 225280 -> 225280 bytes
 .../mainflowctrl/MainFlowCtrlScheduler.java        |   2 +-
 .../mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java |   2 +-
 .../action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java     |  27 ++++++++++-----------
 .../action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java       |   5 ++--
 .../java/a8k/service/app/appstate/type/Tube.java   |  16 ++++++------
 .../a8k/service/debug/AppDebugHelperService.java   |   2 +-
 src/main/java/a8k/type/TubeHolderScanResult.java   |   5 ++++
 src/main/java/a8k/type/TubesScanResult.java        |   6 ++++-
 9 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/app.db b/app.db
index bbb5f8308c4acaa1e9c60fc01caf3f7fc5c49806..13f59d5f3a3382181b8c12ccceba93fd77be1c49 100644
GIT binary patch
delta 1984
zcmZ|QJ#5oJ6u@!&nzsIS+Cl>f{h|;CkehS-k<bcM1X72H01^ra+C(hbD1sTTfKXYG
zU}>1LfEc@=C}Lr%keFDQp)&(wVPWE~_!4sOGI)DGJ;i_DWozHw+P7b3Cv!WBqQvxx
z=;J5~T77lKN4cHHjb{zD(?D<CP70xPcWfRtu)5N1UPT+Ky4?MA4K-8d${1CO@^s@#
zx%=xnT2@;RZlHH+shhotGAZrscqWe3ZMSv4hNipKb<{yu^4gx_esSCGUH6>pINzLI
z=aF;SnYDk~AMF?RZTqzK$NFr&wwhLCjhbK0H|BkF)l3`Tja}oRQ89A*5B-DwT(9YQ
z?YFk~ej$BNBTIQ*nLD+p*;5mKfD72K7egHTrKlVh;-Vk<wY6&HQvE`uTD^#I;nw=n
zNdSW3phUq50E#_8z>1iPMIij103f2^H~@G!2q{=d0O|ki!f+8#F)yz0%fmsDf;j+6
z5D@-meJW;wh@s#BQ!oQS^bZ7KIV=SsXm?Bm#7}C=1dEpw1^r46J`WjS?XmzQwPhe8
zR2&5&sVx&M-Vp$j+A_e}WdKNG2SoCsSiEUb;H0)}1#5R0fTXqzuy%(I0Qv9W;iPs@
z49X=8<4u7TytV|ec9Q_`*gZh{XPd>F0D{-<i9TQlFAV^%Edi{ZI|zth$Go;guz1d(
zpn%tw0M^b1fY*kAU>eV}bY*7X4&<>Rz_gubiu1fRrne>rSEgr(^Sm@B5YTd-E&^U!
zvVeB;G;yAXmdw*^-Z-Bp{MP54C4gr0#yH^fJhNn;M)O9+c^+AqZ?b<C8qG_IfJYVp
Yn`g;J#ChIWGEb9jw>MF%y*YB{F9Cw9WdHyG

delta 551
zcmZp8z}xVEcY>6V)C&d%26G@b17bb~1}4^tIz~)VFB%hC6BxH9FfHL1VB=$A;9t!j
z&d<!ZfiISiX|tlhJ6`TcHdO{`MOk%52F8hw63(2WqN2)Xj;4;zE&<LVj`|+O&OreI
zK^~6ICT5|A=0+Cg76w3IW??DDnpc{W1H*x=Kw|`9##n=maW*$JwJ;4a2{FOcZo-DD
zodr|7o13ADrEv%lVrn;FMbRF_4Ad?Rv)u-4yNi>#0Z@Ce2N0pV-rR&4RX-CJ{mzCa
z#?HV%2yn*GZ)VAaqCc1ss9#)Gof900MqvBh+?)-Zoid7(g94l#F-$NuLNQ>Q0#lkH
zquloNK&CiGM%nGhf|$}-xaHV@k;%Z&9M>eh{X-~|HRJT+2&QF>Qro2>nZ#K*WZ1>c
s%^BPIr`v}!iEa0fW!lQb!Nfn0f&V=Jyv>RVlla@`<ugs6m(QF801ljkTL1t6

diff --git a/src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java
index 23f260a..d773aa2 100644
--- a/src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java
+++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/MainFlowCtrlScheduler.java
@@ -120,7 +120,7 @@ public class MainFlowCtrlScheduler {
 	A8kErrorContext callFn(A8kStepAction key) {
 		beforeDoWhat(key.step);
 		try {
-			logger.info("doaction:{}", key.step);
+			logger.info("执行动作:{}", key.step);
 			key.doaction();
 			return new A8kErrorContext(key.step, null);
 		} catch (AppException appe) {
diff --git a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java
index b52ad16..5c545c2 100644
--- a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java
+++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_PROCESS_ERROR_TUBE.java
@@ -75,7 +75,7 @@ public class DO_PROCESS_ERROR_TUBE extends A8kStepAction {
 
 	@Override public Boolean checkCondition() {
 		Boolean cond1 = cms.isCanDoAction();
-		Boolean cond2 = cms.isHasSometubesToBeProcessed();
+		Boolean cond2 = cms.isHasSomeErrorTubeToBeProcessed();
 		return cond1 && cond2;
 	}
 
diff --git a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java
index be1dda2..b11fe20 100644
--- a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java
+++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ1_ENTER_TUBEHOLDER_AND_SCAN.java
@@ -49,7 +49,7 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction {
 
 
 	@Resource
-	GStateService           gstate;
+	GStateService                        gstate;
 	@Resource
 	CondtionMgrService                   cmgr;
 	@Resource
@@ -57,15 +57,15 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction {
 	@Resource
 	AppEventBusService                   ebus;
 	@Resource
-	A8kCanBusService        canBus;
+	A8kCanBusService                     canBus;
 	@Resource
-	TubeSettingMgrService   tubeSettingMgrService;
+	TubeSettingMgrService                tubeSettingMgrService;
 	@Resource
-	TubeStateMgrService     tubeStateMgrService;
+	TubeStateMgrService                  tubeStateMgrService;
 	@Resource
-	AppProjInfoMgrService   appProjInfoMgr;
+	AppProjInfoMgrService                appProjInfoMgr;
 	@Resource
-	AppDebugHelperService   appDebugHelper;
+	AppDebugHelperService                appDebugHelper;
 
 
 	TubeHolderScanResult scanTubeHodler() throws AppException {
@@ -209,18 +209,17 @@ public class SEQ1_ENTER_TUBEHOLDER_AND_SCAN extends A8kStepAction {
 
 		if (!appDebugHelper.isDebug()) {
 			scanResult = scanTubeHodler();
-			if (scanResult == null) {
-				stc.ejectTubeHolder();
-				return;
-			}
 		} else {
 			scanResult = appDebugHelper.takeTubeHolderScanResult();
-			if (scanResult == null) {
-				return;
-			}
-			logger.info("VIRTUAL.DO 扫描到一个试管架:{}", scanResult);
 		}
 
+		if (scanResult == null) {
+			if (!appDebugHelper.isDebug())
+				stc.ejectTubeHolder();
+			return;
+		}
+		logger.info("扫描到一个试管架:{}", scanResult);
+
 
 		logger.info("解析扫描结果");
 		TubeHolder tubeholder = parseScanResult(scanResult);
diff --git a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java
index af7a968..32b19c3 100644
--- a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java
+++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ2_SWITCH_TO_THE_NEXT_TUBE.java
@@ -46,7 +46,7 @@ public class SEQ2_SWITCH_TO_THE_NEXT_TUBE extends A8kStepAction {
 	@Resource
 	TubeStateMgrService                  tubeStateMgrService;
 	@Resource
-	CondtionMgrService      cms;
+	CondtionMgrService                   cms;
 
 
 	MainFlowCtrlState state;
@@ -75,8 +75,9 @@ public class SEQ2_SWITCH_TO_THE_NEXT_TUBE extends A8kStepAction {
 		if (appDebugHelperService.isDebug()) {
 			logger.info("VIRTUAL.DO,移动到下一个试管:{}", tubeIndex);
 			OS.forceSleep(1000);
+		} else {
+			sstc.moveTubeToPreProcessPos(tubeIndex);
 		}
-		sstc.moveTubeToPreProcessPos(tubeIndex);
 	}
 
 
diff --git a/src/main/java/a8k/service/app/appstate/type/Tube.java b/src/main/java/a8k/service/app/appstate/type/Tube.java
index ba3919e..aca97b4 100644
--- a/src/main/java/a8k/service/app/appstate/type/Tube.java
+++ b/src/main/java/a8k/service/app/appstate/type/Tube.java
@@ -18,11 +18,11 @@ public class Tube {
 	public String    sampleBarcode = ""; //用于请求用户信息的条码ID
 	public String    userid        = "";   //用户输入的样本ID，不做逻辑，只做展示
 
-	public List<ProjBriefInfo>      projInfo = new ArrayList<>(); //项目信息
+	public List<ProjBriefInfo>      projInfo            = new ArrayList<>(); //项目信息
 	//
-	public TubeState                state    = TubeState.EMPTY; //样本被处理的状态
-	public List<ProjProcessContext> projProcessContexts;
-	public A8kEcode                 ecode    = null;
+	public TubeState                state               = TubeState.EMPTY; //样本被处理的状态
+	public List<ProjProcessContext> projProcessContexts = new ArrayList<>();
+	public A8kEcode                 ecode               = null;
 
 
 	public List<Integer> getProjIndex() {
@@ -30,9 +30,9 @@ public class Tube {
 	}
 
 	Tube() {
-//		ProjBriefInfo info =  new  ProjBriefInfo(1,"hscrp","CA","#FF0000");
-//		projInfo.add(info);
-//		projInfo.add(info);
-//		projInfo.add(info);
+		//		ProjBriefInfo info =  new  ProjBriefInfo(1,"hscrp","CA","#FF0000");
+		//		projInfo.add(info);
+		//		projInfo.add(info);
+		//		projInfo.add(info);
 	}
 }
diff --git a/src/main/java/a8k/service/debug/AppDebugHelperService.java b/src/main/java/a8k/service/debug/AppDebugHelperService.java
index 55267a3..d54f504 100644
--- a/src/main/java/a8k/service/debug/AppDebugHelperService.java
+++ b/src/main/java/a8k/service/debug/AppDebugHelperService.java
@@ -129,7 +129,7 @@ public class AppDebugHelperService {
 	@ExtApiFn(name = "A8K试管架.放一个全血试管架", group = "A8K试管架.放一个全血试管架", order = 3)
 	public void insertVirtualBloodTubeHolder() {
 		TubeHolderScanResult scanResult = new TubeHolderScanResult();
-		scanResult.tubeHolderType = A8kTubeHolderType.BloodTube.name();
+		scanResult.tubeHolderType = A8kTubeHolderType.BloodTube.scanCode;
 		for (int i = 0; i < scanResult.tube.length; i++) {
 			scanResult.tube[i] = new TubesScanResult(true, false, "123456");
 		}
diff --git a/src/main/java/a8k/type/TubeHolderScanResult.java b/src/main/java/a8k/type/TubeHolderScanResult.java
index a1f6edd..eba7df4 100644
--- a/src/main/java/a8k/type/TubeHolderScanResult.java
+++ b/src/main/java/a8k/type/TubeHolderScanResult.java
@@ -1,7 +1,12 @@
 package a8k.type;
 
+import java.util.Arrays;
+
 public class TubeHolderScanResult {
 	public TubesScanResult[] tube           = new TubesScanResult[10];
 	public String            tubeHolderType = "";
 
+	public String toString(){
+		return String.format("%s %s", tubeHolderType, Arrays.toString(tube));
+	}
 }
diff --git a/src/main/java/a8k/type/TubesScanResult.java b/src/main/java/a8k/type/TubesScanResult.java
index da44d70..5476daa 100644
--- a/src/main/java/a8k/type/TubesScanResult.java
+++ b/src/main/java/a8k/type/TubesScanResult.java
@@ -15,6 +15,10 @@ public class TubesScanResult {
 	}
 
 	public String toString() {
-		return String.format("isTubeExist:%s,isHighTube:%s,tubeCode:%s", isTubeExist, isHighTube, tubeCode);
+		if(isTubeExist){
+			return String.format("%s(%s)", tubeCode, isHighTube ? "High" : "Low");
+		}else{
+			return "Null";
+		}
 	}
 }