From c112cf54a238afa473e7eb0ea6298e06f4957658 Mon Sep 17 00:00:00 2001
From: kojingeun <diteam.co.kr>
Date: 금, 24 11월 2023 14:44:30 +0900
Subject: [PATCH] Merge branch 'feature/#4539_CF_AOI_Review_Log_미출력_현상_개선' into develop
---
ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h b/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h
index f5460fe..439f10d 100644
--- a/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h
+++ b/ReviewSystem/include/CHReviewRecipe/RcpPriorityInfo.h
@@ -21,7 +21,11 @@
enum RECIPE_PRIORITY_CSOT_STACK_TYPE { RCP_PRIORITY_STACK_ALL = 0, RCP_PRIORITY_STACK_NONE_STACK, RCP_PRIORITY_STACK,RCP_PRIORITY_STACK_REVIEWED,RCP_PRIORITY_STACK_COUNT};
enum RECIPE_PRIORITY_CPJT_JUDGEMENT {
- RCP_PRIORITY_Judge_ALL = 0, RCP_PRIORITY_Judge_OK, RCP_PRIORITY_Judge_RP, RCP_PRIORITY_Judge_NG, RCP_PRIORITY_Judge_TR, RCP_PRIORITY_Judge_PR, RCP_PRIORITY_Judge_PT, RCP_PRIORITY_Judge_Review, RCP_PRIORITY_Judge_RC, RCP_PRIORITY_Judge_Size, RCP_PRIORITY_Judge_VI, RCP_PRIORITY_Judge_Rework, RCP_PRIORITY_Judge_Unknown, RCP_PRIORITY_GRADE_COUNT
+ RCP_PRIORITY_Judge_ALL = 0, RCP_PRIORITY_Judge_OK, RCP_PRIORITY_Judge_RP, RCP_PRIORITY_Judge_NG, RCP_PRIORITY_Judge_TR, RCP_PRIORITY_Judge_PR, RCP_PRIORITY_Judge_ND, RCP_PRIORITY_Judge_PT, RCP_PRIORITY_Judge_Review, RCP_PRIORITY_Judge_RC, RCP_PRIORITY_Judge_Size, RCP_PRIORITY_Judge_VI, RCP_PRIORITY_Judge_Rework, RCP_PRIORITY_Judge_Unknown, RCP_PRIORITY_GRADE_COUNT
+};
+
+enum RECIPE_PRIORITY_CPJT_DEFECTCODE_TYPE {
+ RCP_PRIORITY_DEFECT_CODE_ALL = 0, RCP_PRIORITY_DEFECT_CODE_TRDF, RCP_PRIORITY_DEFECT_CODE_BATR, RCP_PRIORITY_DEFECT_CODE_DOBB, RCP_PRIORITY_DEFECT_CODE_DOBS, RCP_PRIORITY_DEFECT_CODE_DOWW, RCP_PRIORITY_DEFECT_CODE_DOWB, RCP_PRIORITY_DEFECT_CODE_DOWS, RCP_PRIORITY_DEFECTCODE_COUNT
};
@@ -46,6 +50,7 @@
int GetPriorityDefectMaxSize() const { return m_nDefectumMaxSize; }
BOOL GetPriorityDefectSizeOption() const { return m_bUseSizeOption; }
int GetPriorityGradeData() const { return m_nDefectGradeData; }
+ CString GetPriorityDefectCode() const { return m_strPriorityDefectCode; }//20210608 TRDF 占쏙옙占쏙옙占쏙옙
// setter
void SetInfo(const CRcpPriorityInfo& rhs);
@@ -59,15 +64,16 @@
void SetPriorityDefectMaxSize(int nSize) { m_nDefectumMaxSize = nSize; }
void SetPriorityDefectSizeOption(bool bUse) { m_bUseSizeOption = bUse; }
void SetPriorityGradeData(int nData) {m_nDefectGradeData = nData; }
-
+ void SetPriorityDefectCode(CString StrData) { m_strPriorityDefectCode = StrData;} //20210608
protected:
- int m_nPriorityOpticData; // 우선순위 optic 데이터
- int m_nPriorityGrayData; // 우선순위 gray 데이터
- int m_nPriorityStackData; // 우선순위 stack 데이터
- int m_nPriorityModelData; // 우선순위 Midek 데이터
+ int m_nPriorityOpticData; // 占쎌선占쏙옙占쏙옙 optic 占쏙옙占쏙옙占쏙옙
+ int m_nPriorityGrayData; // 占쎌선占쏙옙占쏙옙 gray 占쏙옙占쏙옙占쏙옙
+ int m_nPriorityStackData; // 占쎌선占쏙옙占쏙옙 stack 占쏙옙占쏙옙占쏙옙
+ int m_nPriorityModelData; // 占쎌선占쏙옙占쏙옙 Midek 占쏙옙占쏙옙占쏙옙
int m_nPriorityDefectType;
int m_nPriorityDefectTypeNum;
int m_nDefectGradeData;
+ CString m_strPriorityDefectCode; // 占쎌선占쏙옙占쏙옙 占싯삼옙 DefectCode 占쏙옙占쏙옙占쏙옙//20210608
BOOL m_bUseSizeOption;
int m_nDefectumMinSize;
--
Gitblit v1.9.3