From f77e8008cac062596058fca2aeddda62b80bedbf Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 14 7월 2023 17:03:10 +0900
Subject: [PATCH] Merge branch 'feature/#4517_CF_AOI_Review_결과_파일_찾기_실패_개선' into develop
---
ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp | 44 +++++++++++++++++++++++++++++---------------
1 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp b/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp
index 0319682..8159f88 100644
--- a/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp
+++ b/ReviewSystem/CHReviewRecipe/Rcp_RsReviewManager.cpp
@@ -9,7 +9,7 @@
{
}
-void CRcp_RsReviewManager::SetFlanFile(CMacroFile& macroFile)//0117 공유메모리 플랜
+void CRcp_RsReviewManager::SetFlanFile(CMacroFile& macroFile)//0117 占쏙옙占쏙옙占쌨몌옙 占시뤄옙
{
int nPlanIdx, nSlotIdx, nLightIdx, nAFMRecipeIdx, nUserDefectIdx, nReflowParameterIdx, nLightIdxWsi, nAFMRecipeIdxWsi;
int nPlanCount, nLightCount, nAFMRecipeCount, nUserDefectCount, nLightCountWsi, nAFMRecipeCountWsi;
@@ -120,8 +120,11 @@
const CRcpPriorityInfo *pRcpPriorityInfo = m_rsRcpReviewInfo.GetRcpPriorityInfo(nPriorityIdx);
if (pRcpPriorityInfo==NULL) continue;
- strItem.Format(_T("RCP_REVIEW_PRIORITY_OPTIC_DATA_%02d"), nPriorityIdx);
- macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityOpticData());
+ /* strItem.Format(_T("RCP_REVIEW_PRIORITY_OPTIC_DATA_%02d"), nPriorityIdx);
+ macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityOpticData());*/
+ strItem.Format(_T("RCP_REVIEW_PRIORITY_DEFECTCODE_DATA_%02d"), nPriorityIdx);
+ macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityDefectCode());
+
strItem.Format(_T("RCP_REVIEW_PRIORITY_USE_SIZEOPTION_%02d"), nPriorityIdx);
macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityDefectSizeOption());
@@ -187,7 +190,7 @@
strItem.Format(_T("RCP_REVIEW_DEFOCUS_VALUE"));
macroFile.SetItem(strItem, m_rsRcpReviewInfo.GetDefocusValue());
- // wsi 우선순위
+ // wsi 占쎌선占쏙옙占쏙옙
// Priority
int nWsiPriorityCount = m_rsRcpReviewInfo.GetRcpWsiPriorityInfoCount();
strItem.Format(_T("RCP_WSI_PRIORITY_COUNT"));
@@ -198,8 +201,11 @@
const CRcpPriorityInfo *pRcpPriorityInfo = m_rsRcpReviewInfo.GetRcpWsiPriorityInfo(nPriorityIdx);
if (pRcpPriorityInfo==NULL) continue;
- strItem.Format(_T("RCP_WSI_PRIORITY_DEFECT_TYPE_%02d"), nPriorityIdx);
- macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityOpticData());
+ //strItem.Format(_T("RCP_WSI_PRIORITY_DEFECT_TYPE_%02d"), nPriorityIdx);
+ //macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityOpticData());
+
+ strItem.Format(_T("RCP_WSI_PRIORITY_DEFECTCODE_DATA_%02d"), nPriorityIdx);//20210608
+ macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityDefectCode());
strItem.Format(_T("RCP_WSI_PRIORITY_USE_SIZEOPTION_%02d"), nPriorityIdx);
macroFile.SetItem(strItem, pRcpPriorityInfo->GetPriorityDefectSizeOption());
@@ -763,11 +769,14 @@
{
CRcpPriorityInfo* pRcpPriorityInfo = m_rsRcpReviewInfo.GetRcpPriorityInfo(nPriorityIdx);
if(pRcpPriorityInfo == NULL) continue;
-
+ CString strData = _T("");
int nData = 0;
- strItem.Format(_T("RCP_REVIEW_PRIORITY_OPTIC_DATA_%02d"), nPriorityIdx);
+ /*strItem.Format(_T("RCP_REVIEW_PRIORITY_OPTIC_DATA_%02d"), nPriorityIdx); //210608
macroFile.GetItem(strItem, nData);
- pRcpPriorityInfo->SetPriorityOpticData(nData);
+ pRcpPriorityInfo->SetPriorityOpticData(nData);*/
+ strItem.Format(_T("RCP_REVIEW_PRIORITY_DEFECTCODE_DATA_%02d"), nPriorityIdx); //210608
+ macroFile.GetItem(strItem, strData);
+ pRcpPriorityInfo->SetPriorityDefectCode(strData);
strItem.Format(_T("RCP_REVIEW_PRIORITY_USE_SIZEOPTION_%02d"), nPriorityIdx);
macroFile.GetItem(strItem, nData);
@@ -858,11 +867,14 @@
{
CRcpPriorityInfo* pRcpPriorityInfo = m_rsRcpReviewInfo.GetRcpWsiPriorityInfo(nPriorityIdx);
if(pRcpPriorityInfo == NULL) continue;
-
+ CString strData = _T("");
int nData = 0;
- strItem.Format(_T("RCP_WSI_PRIORITY_DEFECT_TYPE_%02d"), nPriorityIdx);
+ /*strItem.Format(_T("RCP_WSI_PRIORITY_DEFECT_TYPE_%02d"), nPriorityIdx);
macroFile.GetItem(strItem, nData);
- pRcpPriorityInfo->SetPriorityOpticData(nData);
+ pRcpPriorityInfo->SetPriorityOpticData(nData);*/
+ strItem.Format(_T("RCP_WSI_PRIORITY_DEFECTCODE_DATA_%02d"), nPriorityIdx); //210608
+ macroFile.GetItem(strItem, strData);
+ pRcpPriorityInfo->SetPriorityDefectCode(strData);
strItem.Format(_T("RCP_WSI_PRIORITY_USE_SIZEOPTION_%02d"), nPriorityIdx);
macroFile.GetItem(strItem, nData);
@@ -1108,9 +1120,11 @@
macroFile.GetItem(strItem, nData);
pScheduleInfo->SetMaxPointCount(nData);
- strItem.Format(_T("RCP_REVIEW_SINGLE_GANRTY_PATH"));
- macroFile.GetItem(strItem, nData);
- pScheduleInfo->SetSingleGantryPath(nData);
+ /*< LYW 20220610 - #4185 Delete Start >*/
+// strItem.Format(_T("RCP_REVIEW_SINGLE_GANRTY_PATH"));
+// macroFile.GetItem(strItem, nData);
+// pScheduleInfo->SetSingleGantryPath(nData);
+ /*< LYW 20220610 - #4185 Delete End >*/
strItem.Format(_T("RCP_REVIEW_MAX_WSI_POINT_COUNT"));
--
Gitblit v1.9.3