From ea59e5356f149db6e6e2e3f063aa5ee10a44b68e Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 17:39:42 +0900
Subject: [PATCH] Ongoing80 #4669 CF AOI Review Glass Grade PT판정 처리 추가 1. Glass, Cell PT 판정 추가. 2. GlassRawMessenger 데이터 추가 3. GlassRawMessenger 동기화
---
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 210 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 193 insertions(+), 17 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index bc5e21a..9ffdfdb 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -67,7 +67,8 @@
enum CPJT_GANTRY_TYPE { GantryType_Left, GantryType_Right };
enum Judgement_CPJT {
- Judge_OK_CPJT = 0, Judge_RP_CPJT, Judge_NG_CPJT, Judge_TR_CPJT, Judge_PR_CPJT, Judge_PT_CPJT, Judge_Review_CPJT, Judge_RC_CPJT, Judge_Size_CPJT, Judge_VI_CPJT, Judge_Rework_CPJT, Judge_Unknown_CPJT
+// Judge_OK_CPJT = 0, Judge_RP_CPJT, Judge_NG_CPJT, Judge_TR_CPJT, Judge_PR_CPJT, Judge_PT_CPJT, Judge_Review_CPJT, Judge_RC_CPJT, Judge_Size_CPJT, Judge_VI_CPJT, Judge_Rework_CPJT, Judge_Unknown_CPJT
+ Judge_OK_CPJT = 0, Judge_RP_CPJT, Judge_NG_CPJT, Judge_TR_CPJT, Judge_PR_CPJT, Judge_ND_CPJT, Judge_PT_CPJT, Judge_Review_CPJT, Judge_RC_CPJT, Judge_Size_CPJT, Judge_VI_CPJT, Judge_Rework_CPJT, Judge_LN_CPJT, Judge_Unknown_CPJT, Judge_SR_CPJT ////< KEJ 20231123 - #4669 MOD >
};
enum JudgeCode_CPJT {
TRDF_CPJT = 0, BATR_CPJT, DOBB_CPJT, DOBS_CPJT, DOWW_CPJT, DOWB_CPJT, DOWS_CPJT
@@ -2369,7 +2370,7 @@
int nCount = pRcpReviewInfo->GetRcpJudgeCellDefectCount();
int nOK;
- int nCellTRJudge = 0, nCelllOKJuge = 0, nCelllPRJuge = 0;
+ int nCellTRJudge = 0, nCelllOKJuge = 0, nCelllPRJuge = 0, nCelllPTJuge = 0;
m_pSP2P->ISP2P_DisplayMessage(_T("[ReviewEnd] Start Cell Defect Rejudge"));
for (int nCellIndex = 0; nCellIndex < nCellCount; nCellIndex++)
{
@@ -2386,6 +2387,12 @@
{
nCelllPRJuge = nCelllPRJuge + 1;
}
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ else if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_PT_CPJT)
+ {
+ nCelllPTJuge = nCelllPTJuge + 1;
+ }
+ /* < KEJ 20231123 - #4669 ADD End > */
BOOL bReJudge = FALSE, bSubReJudge = FALSE;
@@ -2439,6 +2446,19 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE Cell DefectPRCount[%d] [%d]"), nCellIndex, pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePR, pRcpJudgeInfo->GetJudgeCount());
}
break;
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ case JudgeType_T8_PT:
+ if (pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePT >= pRcpJudgeInfo->GetJudgeCount())
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell DefectPTCount[%d] >= [%d]"), nCellIndex, pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePT, pRcpJudgeInfo->GetJudgeCount());
+ bReJudge = TRUE;
+ }
+ else
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE Cell DefectPTCount[%d] [%d]"), nCellIndex, pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePT, pRcpJudgeInfo->GetJudgeCount());
+ }
+ break;
+ /* < KEJ 20231123 - #4669 ADD End > */
}
// 2nd condition
@@ -2489,6 +2509,19 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE Cell DefectPRCount[%d] [%d]"), nCellIndex, pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePR, pRcpJudgeInfo->GetSubJudgeCount());
}
break;
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ case JudgeType_T8_PT:
+ if (pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePT <= pRcpJudgeInfo->GetSubJudgeCount())
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell DefectPTCount[%d] <= [%d]"), nCellIndex, pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePT, pRcpJudgeInfo->GetSubJudgeCount());
+ bSubReJudge = TRUE;
+ }
+ else
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE Cell DefectPTCount[%d] [%d]"), nCellIndex, pRawData->GetCellData(nCellIndex)->m_nDefectNumJudgePT, pRcpJudgeInfo->GetSubJudgeCount());
+ }
+ break;
+ /* < KEJ 20231123 - #4669 ADD End > */
}
if (bReJudge & bSubReJudge)
@@ -2511,7 +2544,7 @@
{
nCelllOKJuge = 0;
}
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
, nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge,nCelllPRJuge);
}
else if (pRawData->GetCellData(nCellIndex)->m_nJudgement==Judge_PR_CPJT)
@@ -2529,15 +2562,35 @@
{
nCelllPRJuge = 0;
}
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
- , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge);
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
}
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ else if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_PT_CPJT)
+ {
+ int nbfJudge = pRawData->GetCellData(nCellIndex)->m_nJudgement;
+ pRawData->GetCellData(nCellIndex)->m_nJudgement = Judge_TR_CPJT;
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition : ReJudge Cell Defect Grade! [%d]->[%s]")
+ , nCellIndex, nIdx, nbfJudge, pRcpJudgeInfo->GetReJudgeCode());
+
+
+ nCelllPTJuge -= 1;
+ nCellTRJudge += 1;
+
+ if (nCelllPTJuge < 0)
+ {
+ nCelllPTJuge = 0;
+ }
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
+ }
+ /* < KEJ 20231123 - #4669 ADD End > */
else
{
m_pSP2P->ISP2P_DisplayMessage(_T("[TEST Process::ReviewEnd][%02d]Cell [%02d] ReJudge Cell Defect Grade! [%s]->[%s]"), nCellIndex, nIdx,_T("TR"), _T("TR"));
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
- , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge);
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
}
}
else if (pRcpJudgeInfo->GetReJudgeType() == JudgeType_T8_PR)
@@ -2557,8 +2610,8 @@
{
nCelllOKJuge = 0;
}
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
- , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge);
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
}
if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_TR_CPJT)
{
@@ -2575,24 +2628,110 @@
{
nCellTRJudge = 0;
}
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
- , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge);
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
}
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_PT_CPJT)
+ {
+ int nbfJudge = pRawData->GetCellData(nCellIndex)->m_nJudgement;
+ pRawData->GetCellData(nCellIndex)->m_nJudgement = Judge_PR_CPJT;
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition : ReJudge Cell Defect Grade! [%d]->[%s]")
+ , nCellIndex, nIdx, nbfJudge, pRcpJudgeInfo->GetReJudgeCode());
+
+
+ nCelllPTJuge -= 1;
+ nCelllPRJuge += 1;
+
+ if (nCelllPTJuge < 0)
+ {
+ nCelllPTJuge = 0;
+ }
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
+ }
+ /* < KEJ 20231123 - #4669 ADD End > */
else
{
m_pSP2P->ISP2P_DisplayMessage(_T("[TEST Process::ReviewEnd][%02d]Cell [%02d] ReJudge Cell Defect Grade! [%s]->[%s]"), nCellIndex, nIdx, _T("PR"), _T("PR"));
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
- , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge);
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
}
}
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ else if (pRcpJudgeInfo->GetReJudgeType() == JudgeType_T8_PT)
+ {
+ if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_OK_CPJT)
+ {
+ int nbfJudge = pRawData->GetCellData(nCellIndex)->m_nJudgement;
+ pRawData->GetCellData(nCellIndex)->m_nJudgement = Judge_PT_CPJT;
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition : ReJudge Cell Defect Grade! [%d]->[%s]")
+ , nCellIndex, nIdx, nbfJudge, pRcpJudgeInfo->GetReJudgeCode());
+
+
+ nCelllOKJuge -= 1;
+ nCelllPTJuge += 1;
+
+ if (nCelllOKJuge < 0)
+ {
+ nCelllOKJuge = 0;
+ }
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
+ }
+ if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_TR_CPJT)
+ {
+ int nbfJudge = pRawData->GetCellData(nCellIndex)->m_nJudgement;
+ pRawData->GetCellData(nCellIndex)->m_nJudgement = Judge_PT_CPJT;
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition : ReJudge Cell Defect Grade! [%d]->[%s]")
+ , nCellIndex, nIdx, nbfJudge, pRcpJudgeInfo->GetReJudgeCode());
+
+
+ nCellTRJudge -= 1;
+ nCelllPTJuge += 1;
+
+ if (nCellTRJudge < 0)
+ {
+ nCellTRJudge = 0;
+ }
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
+ }
+ if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_PR_CPJT)
+ {
+ int nbfJudge = pRawData->GetCellData(nCellIndex)->m_nJudgement;
+ pRawData->GetCellData(nCellIndex)->m_nJudgement = Judge_PT_CPJT;
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition : ReJudge Cell Defect Grade! [%d]->[%s]")
+ , nCellIndex, nIdx, nbfJudge, pRcpJudgeInfo->GetReJudgeCode());
+
+
+ nCelllPRJuge -= 1;
+ nCelllPTJuge += 1;
+
+ if (nCelllPRJuge < 0)
+ {
+ nCelllPRJuge = 0;
+ }
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
+ }
+ else
+ {
+
+ m_pSP2P->ISP2P_DisplayMessage(_T("[TEST Process::ReviewEnd][%02d]Cell [%02d] ReJudge Cell Defect Grade! [%s]->[%s]"), nCellIndex, nIdx, _T("PT"), _T("PT"));
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
+ }
+ }
+ /* < KEJ 20231123 - #4669 ADD End > */
else//OK
{
if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_OK_CPJT || pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_Unknown_CPJT)
{
m_pSP2P->ISP2P_DisplayMessage(_T("[TEST Process::ReviewEnd][%02d]Cell [%02d] ReJudge Cell Defect Grade! [%s]->[%s]"), nCellIndex, nIdx,_T("OK"), _T("OK"));
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
- , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge);
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
}
else
{
@@ -2621,8 +2760,20 @@
nCelllPRJuge = 0;
}
}
- m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d]")
- , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge);
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ else if (pRawData->GetCellData(nCellIndex)->m_nJudgement == Judge_PT_CPJT)
+ {
+ nCelllOKJuge += 1;
+ nCelllPTJuge -= 1;
+
+ if (nCelllPTJuge < 0)
+ {
+ nCelllPTJuge = 0;
+ }
+ }
+ /* < KEJ 20231123 - #4669 ADD End > */
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]Cell [%02d]Condition CELL COUNT OK:[%d] TR[%d] PR[%d] PT[%d]")
+ , nCellIndex, nIdx, nCelllOKJuge, nCellTRJudge, nCelllPRJuge, nCelllPTJuge);
}
}
@@ -2701,6 +2852,19 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE GLASS Defect PR Count[%d] [%d]"), nIdx, pRawData->GetGlassData()->m_nDefectNumJudgePR, pRcpJudgeInfo->GetJudgeCount());
}
break;
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ case JudgeType_T8_PT:
+ if (pRawData->GetGlassData()->m_nDefectNumJudgePT >= pRcpJudgeInfo->GetJudgeCount())
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]GLASS Defect PT Count[%d] >= [%d]"), nIdx, pRawData->GetGlassData()->m_nDefectNumJudgePT, pRcpJudgeInfo->GetJudgeCount());
+ bReJudge = TRUE;
+ }
+ else
+ {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE GLASS Defect PT Count[%d] [%d]"), nIdx, pRawData->GetGlassData()->m_nDefectNumJudgePT, pRcpJudgeInfo->GetJudgeCount());
+ }
+ break;
+ /* < KEJ 20231123 - #4669 ADD End > */
}
@@ -2750,6 +2914,18 @@
m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE GLASS Defect PR Count[%d] [%d]"), nIdx, pRawData->GetGlassData()->m_nDefectNumJudgePR, pRcpJudgeInfo->GetSubJudgeCount());
}
break;
+ /* < KEJ 20231123 - #4669 ADD Start > */
+ case JudgeType_T8_PT:
+ if (pRawData->GetGlassData()->m_nDefectNumJudgePT <= pRcpJudgeInfo->GetSubJudgeCount())
+ {
+ bSubReJudge = TRUE;
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]GLASS Defect PT Count[%d] <= [%d]"), nIdx, pRawData->GetGlassData()->m_nDefectNumJudgePT, pRcpJudgeInfo->GetSubJudgeCount());
+ }
+ else {
+ m_pSP2P->ISP2P_DisplayMessage(_T("[SequenceProcessor::ReviewEnd] [%02d]ELSE GLASS Defect PT Count[%d] [%d]"), nIdx, pRawData->GetGlassData()->m_nDefectNumJudgePT, pRcpJudgeInfo->GetSubJudgeCount());
+ }
+ break;
+ /* < KEJ 20231123 - #4669 ADD End > */
}
--
Gitblit v1.9.3