diff --git a/src/main/java/com/iflytop/a800/task/MaterialLoadTask.java b/src/main/java/com/iflytop/a800/task/MaterialLoadTask.java index aaf4970..29480f2 100644 --- a/src/main/java/com/iflytop/a800/task/MaterialLoadTask.java +++ b/src/main/java/com/iflytop/a800/task/MaterialLoadTask.java @@ -10,6 +10,8 @@ import com.iflytop.uf.model.UfMdbRuntimeVariable; import com.iflytop.uf.util.UfCommon; import java.util.Base64; import java.util.Map; +import java.util.Objects; + public class MaterialLoadTask extends TaskBase { // error message private String errorMessage = null; @@ -45,6 +47,8 @@ public class MaterialLoadTask extends TaskBase { // 加载测试板卡 private void loadTestCards() { + var incubator = Device.getInstance().incubator; + var temperature = incubator.destTemperature; var cardMan = Device.getInstance().testCard; cardMan.clear(); @@ -71,17 +75,25 @@ public class MaterialLoadTask extends TaskBase { if ( null == project ) { throw new RuntimeException(String.format("不支持的项目编号 %s", box.projectCode)); } + if ( null != temperature && 0 != project.temperature && !Objects.equals(project.temperature, temperature)) { + throw new RuntimeException(String.format("项目【%s】温度无法匹配", project.name)); + } + if ( 0 != project.temperature ) { + temperature = project.temperature; + } + box.projectName = project.name; box.projectColor = UfMdbOption.getString(String.format("ProjectColor.%d", i)); box.project = project; - project.color = box.projectColor; - box.lotCode = parts[1]; box.mfDate = parts[2]; box.cardCode = parts[4]; box.cardAmount = 25; box.isLoaded = true; + project.color = box.projectColor; } + + incubator.destTemperature = temperature; } // 加载缓冲液