update

src/main/java/a8k/service/app/appctrl/mainflowctrl/actionv2/DO_FINISH_TUBE_PROCESS.java

@@ -32,7 +32,7 @@ public class DO_FINISH_TUBE_PROCESS extends A8kStepAction {
 	static Logger logger = LoggerFactory.getLogger(DO_FINISH_TUBE_PROCESS.class);
 
 	DO_FINISH_TUBE_PROCESS() {
-		super(A8kActionStepType.PROCESS_INCUBATE_COMPLETED_PLATE);
+		super(A8kActionStepType.DO_FINISH_TUBE_PROCESS);
 	}
 
 	@Resource

src/main/java/a8k/service/app/appctrl/mainflowctrl/actionv2/PLATE_OPT_SCAN.java

@@ -40,7 +40,7 @@ public class PLATE_OPT_SCAN extends A8kStepAction {
 	static Logger logger = LoggerFactory.getLogger(PLATE_OPT_SCAN.class);
 
 	PLATE_OPT_SCAN() {
-		super(A8kActionStepType.PROCESS_INCUBATE_COMPLETED_PLATE);
+		super(A8kActionStepType.PLATE_OPT_SCAN);
 	}
 
 	@Resource

src/main/java/a8k/service/app/appctrl/mainflowctrl/actionv2/SEQ5_PROCESS.java

@@ -44,12 +44,10 @@ import java.util.concurrent.*;
 @MainFlowProcesser
 @Slf4j
 public class SEQ5_PROCESS extends A8kStepAction {
-	static  Logger          logger = LoggerFactory.getLogger(SEQ5_PROCESS.class);
-	@Autowired
-	private PosMeasureUtils posMeasureUtils;
+	static Logger logger = LoggerFactory.getLogger(SEQ5_PROCESS.class);
 
 	SEQ5_PROCESS() {
-		super(A8kActionStepType.PROCESS_INCUBATE_COMPLETED_PLATE);
+		super(A8kActionStepType.SEQ5_PROCESS);
 	}
 
 	public interface Fn {
@@ -222,6 +220,10 @@ public class SEQ5_PROCESS extends A8kStepAction {
 			deviceCtrlScripter.doSampleProcessPostProcess(cxt);
 			resourceMgrService.releaseResource(A8kPublicAreaResource.IncubationPlateArea);
 
+			//TODO:状态加锁
+			projectProcessContextMgrService.startIncubating(cxt);
+
+
 		}
 		sampleProcessFinished = true;
 	}
@@ -316,9 +318,9 @@ public class SEQ5_PROCESS extends A8kStepAction {
 		if (!errors.isEmpty()) {
 			return errors;
 		}
-		projectProcessContextMgrService.tubePreProcessingOK();
+		//		changeTubeStateToError
+		//		projectProcessContextMgrService.tubePreProcessingOK();
 		projectProcessContextMgrService.processIngTubeOK();
-		projectProcessContextMgrService.postProcessTubeOK();
 		return List.of();
 	}
 }

src/main/java/a8k/service/app/appctrl/mainflowctrl/processer/MainFlowStateChangeProcesser.java

@@ -68,6 +68,8 @@ public class MainFlowStateChangeProcesser implements IMainFlowStateChangeProcess
 		hbotCtrlService.dropTip();
 		//hbot快速归零
 		hbotCtrlService.moveQuickToZero();
+
+		projectProcessContextMgrService.finishedAll();
 	}
 
 	@Override

src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java

@@ -305,16 +305,16 @@ public class ProjectProcessContextMgrService {
 		setProjProcessState(tube, ProjProcessState.PROCESS);
 	}
 
-	synchronized public void startTubePreProcessing() {
-		Tube tube = gstate.getCurProcessingTube();
-		tube.setState(TubeState.PRE_PROCESSING);
-	}
-
-	synchronized public void tubePreProcessingOK() {
-		Tube tube = gstate.getCurProcessingTube();
-		tube.setState(TubeState.PRE_PROCESSED);
-		priChangeReactionPlateStateTo(tube, IncubationSubTankState.WAITING_FOR_DROP);
-	}
+//	synchronized public void startTubePreProcessing() {
+//		Tube tube = gstate.getCurProcessingTube();
+//		tube.setState(TubeState.PRE_PROCESSING);
+//	}
+//
+//	synchronized public void tubePreProcessingOK() {
+//		Tube tube = gstate.getCurProcessingTube();
+//		tube.setState(TubeState.PRE_PROCESSED);
+//		priChangeReactionPlateStateTo(tube, IncubationSubTankState.WAITING_FOR_DROP);
+//	}
 
 
 	synchronized public void startProcessTube() {
@@ -338,15 +338,15 @@ public class ProjectProcessContextMgrService {
 	}
 
 
-	synchronized public void postProcessTube() {
-		Tube tube = gstate.getCurProcessingTube();
-		tube.setState(TubeState.POST_PROCESSING);
-	}
-
-	synchronized public void postProcessTubeOK() {
-		Tube tube = gstate.getCurProcessingTube();
-		tube.setState(TubeState.POST_PROCESSED);
-	}
+//	synchronized public void postProcessTube() {
+//		Tube tube = gstate.getCurProcessingTube();
+//		tube.setState(TubeState.POST_PROCESSING);
+//	}
+//
+//	synchronized public void postProcessTubeOK() {
+//		Tube tube = gstate.getCurProcessingTube();
+//		tube.setState(TubeState.POST_PROCESSED);
+//	}
 
 
 	synchronized public void newPlateToOptScanPos(IncubationSubTank tank) {