From 12c02f064db12d6d94063bf6dd9e4eb80f4252b8 Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 월, 11 10월 2021 15:30:00 +0900 Subject: [PATCH] Ongoing60 #3662 CF AOI Review 전설비 알람 발생 조치 - Review History File Mapping 해제 - Review Inner History 다운 현상 예외처리 추가 - Review End 시 Review 다운 현상 예외처리 추가 --- ReviewSystem/ReviewSystem/DlgReviewHistoryTool.cpp | 78 ++++++++++++++++++++++++-------------- 1 files changed, 49 insertions(+), 29 deletions(-) diff --git a/ReviewSystem/ReviewSystem/DlgReviewHistoryTool.cpp b/ReviewSystem/ReviewSystem/DlgReviewHistoryTool.cpp index 47d6c1d..87e2a37 100644 --- a/ReviewSystem/ReviewSystem/DlgReviewHistoryTool.cpp +++ b/ReviewSystem/ReviewSystem/DlgReviewHistoryTool.cpp @@ -674,33 +674,44 @@ void CDlgReviewHistoryTool::OnDblclkList1() { - // TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎. - CString strSelect, strGlassID, strStepID, strStepTime; - int nTemp, nTemp2; - int nidx = 0; + /*< LYW 20211005 - #3662 ADD Start >*/ + try + { + // TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎. + CString strSelect, strGlassID, strStepID, strStepTime; + int nTemp, nTemp2; + int nidx = 0; - nidx = m_ctrlHistoryList.GetCurSel(); + nidx = m_ctrlHistoryList.GetCurSel(); - SetSelectIndex(nidx); - bool bSelect = false; + SetSelectIndex(nidx); + bool bSelect = false; - CGlassResult* pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(0); + CGlassResult* pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(0); - pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(GetSelectIndex()); - SetHistoryTemp(GetSelectIndex()); - const SDefectFilter *pDefectFilter = m_pDDL2P->ISP2P_GetDefectFilter(); //taek 210213 + pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(GetSelectIndex()); + SetHistoryTemp(GetSelectIndex()); + const SDefectFilter *pDefectFilter = m_pDDL2P->ISP2P_GetDefectFilter(); //taek 210213 - if(pHistoryResult == NULL) return; - if(pDefectFilter == NULL) return; + if (pHistoryResult == NULL) return; + if (pDefectFilter == NULL) return; - //�뵒�럺 留� �몴�쁽 諛� 洹몃━�뱶 �몴�쁽 - m_pDlgDefectHistory->UpdateProcessStatus(pHistoryResult); //洹몃━�뱶 �몴�쁽 - m_pDlgDefectHistoryMap->UpdateDefectFilter(pDefectFilter); - m_pDlgDefectHistoryMap->UpdateProcessStatus(pHistoryResult); //�뵒�럺 留� �몴�쁽 - UpdateProcess(pHistoryResult); - SetDefectImage(GetReviewName(), m_pHistoryTemp); - GetHistoryList(); //�븳踰� 媛깆떊 �빐二쇨퀬 泥섎━�븯�옄 - m_bHistory = true; + //�뵒�럺 留� �몴�쁽 諛� 洹몃━�뱶 �몴�쁽 + m_pDlgDefectHistory->UpdateProcessStatus(pHistoryResult); //洹몃━�뱶 �몴�쁽 + m_pDlgDefectHistoryMap->UpdateDefectFilter(pDefectFilter); + m_pDlgDefectHistoryMap->UpdateProcessStatus(pHistoryResult); //�뵒�럺 留� �몴�쁽 + UpdateProcess(pHistoryResult); + SetDefectImage(GetReviewName(), m_pHistoryTemp); + GetHistoryList(); //�븳踰� 媛깆떊 �빐二쇨퀬 泥섎━�븯�옄 + m_bHistory = true; + } + catch (...) + { + return; + } + /*< LYW 20211005 - #3662 ADD End >*/ + + } @@ -828,15 +839,24 @@ void CDlgReviewHistoryTool::OnBnClickedUseDefect() { + /*< LYW 20211005 - #3662 ADD Start >*/ + try + { // TODO: �뿬湲곗뿉 而⑦듃濡� �븣由� 泥섎━湲� 肄붾뱶瑜� 異붽��빀�땲�떎. - BOOL bCheck = ((CButton*)GetDlgItem(IDC_USE_DEFECT))->GetCheck(); -// CGlassResult* pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(0); -// pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(GetSelectIndex()); - SetHistoryTemp(GetSelectIndex()); - SetAllDefect(bCheck); - m_pDlgDefectHistoryMap->SetHistoryDefect(bCheck); - m_pDlgDefectHistoryMap->UpdateProcessStatus(m_pHistoryTemp); //�뵒�럺 留� �몴�쁽 - m_pDlgDefectHistory->UpdateProcessStatus(m_pHistoryTemp); + BOOL bCheck = ((CButton*)GetDlgItem(IDC_USE_DEFECT))->GetCheck(); + // CGlassResult* pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(0); + // pHistoryResult = m_pDDL2P->ISP2P_GetHistoryResult(GetSelectIndex()); + SetHistoryTemp(GetSelectIndex()); + SetAllDefect(bCheck); + m_pDlgDefectHistoryMap->SetHistoryDefect(bCheck); + m_pDlgDefectHistoryMap->UpdateProcessStatus(m_pHistoryTemp); //�뵒�럺 留� �몴�쁽 + m_pDlgDefectHistory->UpdateProcessStatus(m_pHistoryTemp); + } + catch (...) + { + return; + } + /*< LYW 20211005 - #3662 ADD End >*/ } -- Gitblit v1.9.3