From 29b057b25d57dab9ed33aa2a1bc22b6dc68e1a4d Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 금, 01 4월 2022 10:31:31 +0900
Subject: [PATCH] Ongoing70 #4006 CF AOI Review Align Fail시 재판정 Off 기능 추가

---
 DitGlassRawMessenger/Extern/DitGlassRawStruct.h |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/DitGlassRawMessenger/Extern/DitGlassRawStruct.h b/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
index e5f7a55..5a336e2 100644
--- a/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
+++ b/DitGlassRawMessenger/Extern/DitGlassRawStruct.h
@@ -61,6 +61,11 @@
 
 	int m_nGlassSizeWidth;
 	int m_nGlassSizeHeight;
+    /* <KYH 211129 : #3796 ADD Start> */
+	int			m_nDefectNumJudgeND;
+	/* <KYH 211129 : #3796 ADD End> */
+	//DUMY DATA
+	int			Dumy_int[9];
 
 	//설비정보
 	char m_strLine[32];
@@ -120,7 +125,9 @@
 	int			m_nDefectNumJudgeRV;
 	int			m_nDefectNumJudgeTR;
 	int			m_nDefectNumJudgePR;
-
+	/*< LHS 20211029 - #3783 MOD Start >*/
+	int			m_nDefectNumJudgeLine;
+	/*< LHS 20211029 - #3783 MOD End >*/
 	int			m_nDefectNumStackTD;
 	int			m_nDefectNumStackSD;
 	int			m_nDefectNumStackPD;
@@ -175,7 +182,7 @@
 	char m_strFlowHistory[2];
 	char m_strCount1[2];
 	char m_strCount2[2];
-
+	char m_StrMergeList[10][12];
 	//Mura Data 0412 nwh
 	char m_strMaxAvgGray[12];
 	char m_strMaxPortion[12];
@@ -195,15 +202,22 @@
 	int m_nStackNum;
 	BOOL m_bStackRead;
 
+	/*< KJG 20211024 - #3487 ADD Start >*/
 	int m_nRawMergeNum;
 	BOOL m_bRawMergeRead;
+	/*< KJG 20211024 - #3487 ADD End >*/
 	//210203 CJH - CutOff 대상 결함 수
 	int m_nCutOffDefectNum;
 	//210323 CJH - Server/Frame Shrink 정보 추가
 	char m_strShrinked[6];
 	//210326 CJH - RAW 입력 Defect 수량 상한 사용여부
 	BOOL m_bRawCutoff;
-
+	//210907 KJG - EdgeCrack 검사 사용 유무
+	BOOL m_bEdgeCrackUse;
+	BOOL m_bRawMergeUse;
+	/* < KJG 20220225 - #3850 ADD Start >*/ 
+	char m_strRawMergeStepID[32];
+	/* < KJG 20220225 - #3850 ADD End >*/
 };
 struct _grmBlockData
 {
@@ -257,6 +271,11 @@
 	int			m_nDefectNumTypeMD;
 	int			m_nDefectNumTypeCD;
 	int			m_nDefectNumTypeMC;
+	/* <KYH 211129 : #3796 ADD Start> */
+	int			m_nDefectNumJudgeND;
+	/* <KYH 211129 : #3796 ADD End> */
+	//DUMY DATA
+	int			Dumy_int[9];
 
 	//Mura Data nwh 0404 
 	char		m_strProImage[32];
@@ -308,7 +327,9 @@
 	int			m_nDefectNumJudgeRV;
 	int			m_nDefectNumJudgeTR;
 	int			m_nDefectNumJudgePR;
-
+	/*< LHS 20211029 - #3783 MOD Start >*/
+	int			m_nDefectNumJudgeLine;
+	/*< LHS 20211029 - #3783 MOD End >*/
 	int			m_nReflowResult[8];			// 0: Reflow X 1: Reflow OK 2: Reflow NG
 
 	// Filtering된 Stack별 수
@@ -512,7 +533,10 @@
 	int				m_nAlignRectTop;
 	int				m_nAlignRectBottom;
 	int				m_nAlignRectRight;
-
+	/*< LHS 20211029 - #3783 MOD Start >*/
+	char			m_strLNDefectCode[12];
+	short/*LineDefectType*/ m_LineDefectType;
+	/*< LHS 20211029 - #3783 MOD End >*/
 
 	_grmDefectReviewData m_ReviewDefect;
 };
@@ -565,7 +589,9 @@
 	int m_nCellMaxDataNum;
 	int m_nDefectMaxDataNum;
 	int m_nStackMaxDataNum;
+	/*< KJG 20211024 - #3487 ADD Start >*/
 	int m_nRawMergeMaxDataNum;
+	/*< KJG 20211024 - #3487 ADD End >*/
 
 	//Char 기준 자료가 있는 시작 위치 [김태현 2018/11/12]
 	int m_nGlassDataPoint;
@@ -573,14 +599,18 @@
 	int m_nCellDataPoint;
 	int m_nDefectDataPoint;
 	int m_nStackDataPoint;
+	/*< KJG 20211024 - #3487 ADD Start >*/
 	int m_nRawMergeDataPoint;
+	/*< KJG 20211024 - #3487 ADD End >*/
 
 	int m_nSizeOfGlassData;
 	int m_nSizeOfBlockData;
 	int m_nSizeOfCellData;
 	int m_nSizeOfDefectData;
 	int m_nSizeOfStackData;
+	/*< KJG 20211024 - #3487 ADD Start >*/
 	int m_nSizeOfRawMergeData;
+	/*< KJG 20211024 - #3487 ADD End >*/
 };
 struct _grmDitGlassRawInfo : public _grmDitMemInfo, public _grmDitCommand
 {

--
Gitblit v1.9.3