From 14ac7e93d2d96f5e318d03d56eca2e73c7ae79f2 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Mon, 14 Oct 2024 10:59:51 +0800
Subject: [PATCH] update

---
 app.db                                             | Bin 225280 -> 225280 bytes
 .../app/appctrl/mainflowctrl/action/DO_STOP.java   |  15 ++++++++++++--
 .../appstate/ProjectProcessContextMgrService.java  |  22 +++++++++++++++++----
 .../a8k/service/debug/AppDebugHelperService.java   |   4 +---
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/app.db b/app.db
index 24e942673e71a764ee0165884e404a1a69c8bbad..d44b0b5df7e2666c6f13f65967a23e9cd43cd2ca 100644
GIT binary patch
delta 235
zcmZp8z}xVEcY?HF3IhX!IS`uxF$V(!i_t_KW5$%mgw_PctqDv^__wk!F$rvEQ(*cf
z&&a!(@c^U1cBTNP6h=nV?dgF`ag2;6+m8h?t!HL5on98kbdb?#`iD@a=Iy(~L2`!M
zr6QTcSvZW@#m&tb+xe&4hck(7_m5@T`iP5}Pn&^1lkXIt_GU!|Sw7}Q8T0A=yv*WE
zZS2$a8JVS~C-O08G0B*L1SJ^nPuF9Ch-Cw9+V99DF}=l~xmlJS=xh@pHUeUhH}rs5
Q8;A{o*mS!}0P`Jr0RJX7m;e9(

delta 603
zcmZp8z}xVEcY?H_Hv<EMIS`uxF)ITDi^fD9V@B`Bgw_PctqDv^_yySbm>Bq1^M~^@
z^KIaZ<zw2cDDaM#JCaS6L0VB(osofYqN9W}r>Ll?vYDf)qq9qZbBLq9N3nBIKtPa(
zqqB)wsG+%$g{7H+fsvt!xuF<qUTIDa3<t6TjS++yV+}UO+1$|7!ZgGr!~{dTnF$-J
zb{0(SZf=Gqmc}7Kh@suoj1@(D5HnD_FwAxvu<b5R<_19R!5%<_?s`)rW>o!5SoAv^
znix9+10lc}L%)d`6N>&|MxcIiS#?fuAaaB4cXM+#aCVw5z|1Vgi=ud$0+WIOFoqbI
z_`d;322=ju{NJ_<EMR)Z&jsWfng9uHscivFX^e~p+tUM?;usnAw;u~)TF=aAFug2{
z=^&%-^bes-&D(c}gXDC!OGPq?vvBCKi<_G>w)0Q74`&kF?jOsv^${B*e<lNe=4M5O
tcz)(a5!31W7cxmqZ}DetmSq9j0<y^nh(XCl56U+M(%Rcq0+{c}0|3A;iC+K!

diff --git a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java
index ac1cd88..3bf556f 100644
--- a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java
+++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/DO_STOP.java
@@ -3,6 +3,7 @@ package a8k.service.app.appctrl.mainflowctrl.action;
 import a8k.service.app.appctrl.mainflowctrl.base.A8kActionStepType;
 import a8k.service.app.appctrl.mainflowctrl.base.A8kStepAction;
 import a8k.service.app.appstate.GStateService;
+import a8k.service.app.appstate.ProjectProcessContextMgrService;
 import a8k.service.app.appstate.resource.A8kPublicResourceType;
 import a8k.service.app.appstate.type.MainFlowCtrlState;
 import a8k.service.app.appstate.type.state.A8kWorkState;
@@ -25,9 +26,11 @@ public class DO_STOP extends A8kStepAction {
 	}
 
 	@Resource
-	GStateService gstate;
+	GStateService                   gstate;
 	@Resource
-	AppDebugHelperService appDebugHelper;
+	AppDebugHelperService           appDebugHelper;
+	@Resource
+	ProjectProcessContextMgrService projectProcessContextMgrService;
 
 
 	MainFlowCtrlState mfcs;
@@ -39,6 +42,14 @@ public class DO_STOP extends A8kStepAction {
 
 	@Override public void doaction() throws AppException {
 		mfcs.workStateChangeFlag = false;
+
+		if (appDebugHelper.isDebug()) {
+			appDebugHelper.doVirtualThings("清空设备", 1);
+		}
+
+		projectProcessContextMgrService.finishedAll();
+
+		//清空所有孵育盘中的孔位
 	}
 
 	@Override public Boolean checkCondition() {
diff --git a/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java b/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java
index e4d9c48..44d82ce 100644
--- a/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java
+++ b/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java
@@ -2,10 +2,7 @@ package a8k.service.app.appstate;
 
 import a8k.service.app.appdata.AppProjInfoMgrService;
 import a8k.service.app.appstate.type.*;
-import a8k.service.app.appstate.type.state.IncubationSubTankState;
-import a8k.service.app.appstate.type.state.OptScanModuleState;
-import a8k.service.app.appstate.type.state.ProjProcessState;
-import a8k.service.app.appstate.type.state.TubeState;
+import a8k.service.app.appstate.type.state.*;
 import a8k.service.db.DeviceStatisticDBService;
 import a8k.service.db.SampleRecordDBService;
 import a8k.service.db.type.SampleRecord;
@@ -125,6 +122,7 @@ public class ProjectProcessContextMgrService {
 			}
 		}
 	}
+
 	synchronized public List<ProjProcessContext> getAllContexts() {
 		return contexts;
 	}
@@ -400,4 +398,20 @@ public class ProjectProcessContextMgrService {
 		tube.setState(TubeState.PROCESS_COMPLETE);
 	}
 
+
+	synchronized public void finishedAll() {
+		//所有的板夹仓状态设置为空
+		for (IncubationSubTank incubationSubTank : gstate.getIncubationPlate().subtanks) {
+			incubationSubTank.state = IncubationSubTankState.EMPTY;
+		}
+		//当前正在处理的试管架状态，试管状态均设置成处理IDLE和EMPTY
+		for (Tube tube : gstate.getTubeHolder().tubes) {
+			tube.setState(TubeState.EMPTY);
+		}
+		gstate.getTubeHolder().setState(TubeHolderState.IDLE);
+		//光学模组状态设置为null
+		gstate.getOptScanModule().state = OptScanModuleState.EMPTY;
+		//所有正在处理的上下文均设置为空
+		contexts.clear();
+	}
 }
diff --git a/src/main/java/a8k/service/debug/AppDebugHelperService.java b/src/main/java/a8k/service/debug/AppDebugHelperService.java
index 3f853d4..b546502 100644
--- a/src/main/java/a8k/service/debug/AppDebugHelperService.java
+++ b/src/main/java/a8k/service/debug/AppDebugHelperService.java
@@ -456,10 +456,8 @@ public class AppDebugHelperService {
 	}
 
 	synchronized public void doVirtualThings(String dowhat, Integer time) {
-		//		for (int i = 0; i < time; i++) {
 		logger.info("VirtualDoing:" + dowhat);
-		OS.forceSleep(100);
-		//		}
+		OS.forceSleep(1500);
 	}