From 3706f7e4618878c9f1a76850e1d2c5f8e0e6cda0 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 18 Oct 2024 21:48:50 +0800
Subject: [PATCH] update

---
 app.db                                             | Bin 225280 -> 225280 bytes
 .../mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java  |   4 +---
 .../a8k/service/app/appdata/ProjCfgMgrService.java |  16 +++++++++++++---
 .../appstate/ProjectProcessContextMgrService.java  |   8 ++------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app.db b/app.db
index 3fb029e60e4a280b0d8147ea9fcad9969581c3ad..054f92b8e7924ab57bcaae075427f528a5d96f01 100644
GIT binary patch
delta 80
zcmZp8z}xVEcY>6V6B7digE<hJ0kIMT1Mj+tIz~)ROdAvKUtrAH>~JxTkuiJo{7W)S
jj9HuaT=~t&n7Mh!wTFz18O^h9w9mT1xP8_QrnKn*#|<41

delta 80
zcmZp8z}xVEcY>6V<7);626G@b17alx2HqtTb&QxCUvEsfe}OT5v%|$WM#i+w^DoIT
kF{W<bbLBT9W6I_o*B&x5CO6Nz(LU=2<MvrMn9`;L04*{eyZ`_I

diff --git a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java
index f3b8207..f061df0 100644
--- a/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java
+++ b/src/main/java/a8k/service/app/appctrl/mainflowctrl/action/SEQ3_APPLAY_RESOURCE.java
@@ -90,9 +90,7 @@ public class SEQ3_APPLAY_RESOURCE extends A8kStepAction {
 		Assert.isTrue(applyIncubatorPos,"applyIncubatorPos");
 		logger.info("Tube:{} 申请资源成功", tube.getSampleId());
 
-		boolean assProjInfoSuc = projectProcessContextMgrService.prepareProjInfoData(tube);
-		Assert.isTrue(assProjInfoSuc,"assProjInfoSuc");
-
+		projectProcessContextMgrService.prepareProjInfoData(tube);
 
 		//创建项目处理上下文
 		projectProcessContextMgrService.prepareRecourseOK();
diff --git a/src/main/java/a8k/service/app/appdata/ProjCfgMgrService.java b/src/main/java/a8k/service/app/appdata/ProjCfgMgrService.java
index 8416acd..84da3e2 100644
--- a/src/main/java/a8k/service/app/appdata/ProjCfgMgrService.java
+++ b/src/main/java/a8k/service/app/appdata/ProjCfgMgrService.java
@@ -1,6 +1,5 @@
 package a8k.service.app.appdata;
 
-
 import a8k.service.db.A8kProjIdCardDBService;
 import a8k.service.db.A8kProjInfoDBService;
 import a8k.service.db.A8kProjOptConfigDBService;
@@ -10,6 +9,7 @@ import a8k.utils.ProjBriefInfo;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +25,6 @@ public class ProjCfgMgrService {
 	@Resource
 	A8kProjOptConfigDBService a8kProjOptConfigDBService;
 
-
 	public A8kProjCfg findByProjIndex(String lotid) {
 		A8kProjCfg projCfg = new A8kProjCfg();
 		projCfg.idCardInfo        = a8kProjIdCardDBService.getByLotId(lotid);
@@ -34,6 +33,17 @@ public class ProjCfgMgrService {
 		return projCfg;
 	}
 
+	public A8kProjCfg findByProjIndexWithCheck(String lotid) {
+		A8kProjCfg projCfg = new A8kProjCfg();
+		projCfg.idCardInfo        = a8kProjIdCardDBService.getByLotId(lotid);
+		projCfg.projectInfo       = a8kProjInfoDBService.findByProjIndex(projCfg.idCardInfo.projIndex);
+		projCfg.projOptConfigList = a8kProjOptConfigDBService.findByProjIndex(projCfg.idCardInfo.projIndex);
+		Assert.isTrue(projCfg.idCardInfo != null, "ID卡信息不存在");
+		Assert.isTrue(projCfg.projectInfo != null, "项目信息不存在");
+		Assert.isTrue(projCfg.projOptConfigList != null, "项目配置信息不存在");
+		return projCfg;
+	}
+
 	public List<ProjBriefInfo> getProjBriefInfo(List<Integer> projIndex) {
 		List<ProjBriefInfo> ret = new ArrayList<>();
 		for (Integer index : projIndex) {
@@ -47,9 +57,9 @@ public class ProjCfgMgrService {
 		return ret;
 	}
 
-
 	/**
 	 * 通过项目索引获取流程
+	 *
 	 * @param projIndex 项目索引
 	 * @return 流程
 	 */
diff --git a/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java b/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java
index bf9ddbf..8c2574c 100644
--- a/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java
+++ b/src/main/java/a8k/service/app/appstate/ProjectProcessContextMgrService.java
@@ -289,16 +289,12 @@ public class ProjectProcessContextMgrService {
 	}
 
 
-	synchronized public Boolean prepareProjInfoData(Tube tube) {
+	synchronized public void prepareProjInfoData(Tube tube) {
 		for (Integer projIndex : tube.getProjIndex()) {
 			ProjProcessContext cxt = getProjProcessContext(tube.getSampleId(), projIndex);
 			Assert.isTrue(cxt != null,"cxt != null");
-			cxt.projCfg = projCfgMgrService.findByProjIndex(cxt.consumable.lotId);
-			if (cxt.projCfg == null) {
-				return false;
-			}
+			cxt.projCfg = projCfgMgrService.findByProjIndexWithCheck(cxt.consumable.lotId);
 		}
-		return true;
 	}
 
 	synchronized public void prepareRecourseOK() {