From 5e73135f98e2c4ad96cdd08d44d10c53457dba37 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 10 Oct 2024 15:16:00 +0800
Subject: [PATCH] update

---
 app.db                                             | Bin 225280 -> 225280 bytes
 .../app/appstate/type/IncubationSubTank.java       |  11 +++++++++--
 .../java/a8k/service/app/appstate/type/Tube.java   |   6 ++++++
 .../java/a8k/type/consumables/ConsumableState.java |   4 ++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app.db b/app.db
index 55edcd18f44e3ef27a4e921f1641f5ec8a197874..ccbe6d660eb962d33f5b75d86f05a3601630303f 100644
GIT binary patch
delta 101
zcmZp8z}xVEcY?HF0|NttIS`uxF&_g1<K2lm#*7V(39Si?TN9X4f|!~(w;u~)(qLw4
zV&DEDl<5H@XA>K{xUMc^fAnVUH>;SZH%Bw2GBt5+e-+K-#>mvf(QXvWwB0C{`J4~{
Dj7%L*

delta 101
zcmZp8z}xVEcY?H_DFXw8IS`uxF&_g1<Nk>{#*C(o39Si?TN9X4f|weswjT>((qLw4
ztl0h`l<5H@XJa|LxUMc^fAnVUH>;SZH%Bw2GBs9je-+K-#>muI*=`iewB0C{`J4~{
Dp?)6A

diff --git a/src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java b/src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java
index c8d1ade..fa53112 100644
--- a/src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java
+++ b/src/main/java/a8k/service/app/appstate/type/IncubationSubTank.java
@@ -5,6 +5,7 @@ import a8k.service.app.appstate.type.state.IncubationSubTankState;
 import a8k.type.IncubatorPos;
 import a8k.type.type.BloodType;
 import a8k.utils.ProjBriefInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
 
@@ -24,8 +25,14 @@ public class IncubationSubTank {
 	public ProjProcessContext projProcessContxt;
 
 	//孵育时间
-	public Date    startIncubatedTime; //开始孵育时间
-	public Integer incubatedTimeSec; //目标孵育时间
+
+	public Date    startIncubatedTime = new Date(); //开始孵育时间
+	public Integer incubatedTimeSec   = 0; //目标孵育时间
+
+	public Long getStartIncubatedTime(){
+		return startIncubatedTime.getTime();
+
+	}
 
 	public A8kEcode error = A8kEcode.SUC;
 
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 5fa7b30..ba3919e 100644
--- a/src/main/java/a8k/service/app/appstate/type/Tube.java
+++ b/src/main/java/a8k/service/app/appstate/type/Tube.java
@@ -29,4 +29,10 @@ public class Tube {
 		return ProjBriefInfo.toPorjIndex(projInfo);
 	}
 
+	Tube() {
+//		ProjBriefInfo info =  new  ProjBriefInfo(1,"hscrp","CA","#FF0000");
+//		projInfo.add(info);
+//		projInfo.add(info);
+//		projInfo.add(info);
+	}
 }
diff --git a/src/main/java/a8k/type/consumables/ConsumableState.java b/src/main/java/a8k/type/consumables/ConsumableState.java
index 78ac953..daec07c 100644
--- a/src/main/java/a8k/type/consumables/ConsumableState.java
+++ b/src/main/java/a8k/type/consumables/ConsumableState.java
@@ -4,7 +4,11 @@ import java.util.Date;
 
 public class ConsumableState {
 
+
 	public Date   scanDate = new Date();
+	public Long getScanDate() {
+		return scanDate.getTime();
+	}
 	public Tips[] tips     = new Tips[3];
 
 	public ReactionPlateGroup[] reactionPlateGroup = new ReactionPlateGroup[6];