From e21f80c0b3c303c8f38859cc7652822f2da2913c Mon Sep 17 00:00:00 2001
From: KYH <kimyonghee@diteam.co.kr>
Date: 월, 07 6월 2021 10:36:51 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/#3381_CF_AOI_Review_전설비_FDC_TackTime_오보고_현상_개선' into develop
---
ReviewSystem/ReviewSystem/MainFrm.cpp | 1 +
ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp | 6 +++++-
ReviewSystem/ReviewSystem/CameraController.cpp | 2 ++
DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp | 12 +++++++++++-
4 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
index 4430a8c..f165cb9 100644
--- a/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
+++ b/DitGlassRawMessenger/DitGlassRawMessenger/GlassRawCPJT.cpp
@@ -207,6 +207,8 @@
strcpy(pData->GetGlassData()->m_strPath, LOCAL_AOIRAWBIN_PATH);
+ pData->GetGlassData()->m_tmReviewLoading = m_tmReviewStart;
+
return TRUE;
}
@@ -216,6 +218,7 @@
m_bReviewEndCheck = TRUE;
m_tmReviewEnd = m_tmReviewStart = CTime::GetCurrentTime();
m_tmFileCreateTime = CTime::GetCurrentTime();
+ pData->GetGlassData()->m_tmReviewEnd = m_tmReviewEnd;
//�뿬湲곗뿉�꽌 �씪�씤蹂꾨줈 �뙆�씪紐�, �샊�� Path �쐞移� 寃곗젙�븯硫대맖. AOIServer �샊�� ReviewServer�뿉�꽌 �븞�빐�룄�맖 [源��깭�쁽2019/9/4]
pData->GetGlassData()->m_strFileName;
@@ -767,10 +770,17 @@
{
SPRINTRAW(16, "*");
}
- else
+ else if(strlen(pGlassData->m_strRecipeName) <= 16)
{
SPRINTRAW(16, "%s", pGlassData->m_strRecipeName);
}
+ else if (strlen(pGlassData->m_strRecipeName) > 16)
+ {
+ CString temp = pGlassData->m_strRecipeName; // �젅�떆�뵾 17�옄由� �꽆�뼱媛�硫� DCOLL 諛쒖깮�쑝濡� �삁�쇅泥섎━ [ 21-06-02 KJG ]
+ temp = temp.Left(16);
+ SPRINTRAW(16, "%s", temp.GetBuffer(0));
+ }
+
// 52 12 SHRINK // Server or Frame Shrink �룞�옉 �뿬遺�
if (strlen(pGlassData->m_strShrinked) == 0)
{
diff --git a/ReviewSystem/ReviewSystem/CameraController.cpp b/ReviewSystem/ReviewSystem/CameraController.cpp
index 8848021..85863ca 100644
--- a/ReviewSystem/ReviewSystem/CameraController.cpp
+++ b/ReviewSystem/ReviewSystem/CameraController.cpp
@@ -115,6 +115,7 @@
if (IDOK == AfxMessageBox(strMessage, MB_OK | MB_ICONQUESTION))
{
g_pLog->DisplayMessage(_T("Align Camera Connet Fail! Exit Review System"));
+ //�뾽�뜲�씠�듃�떆
//exit(1);
return FALSE;
}
@@ -127,6 +128,7 @@
if (IDOK == AfxMessageBox(strMessage, MB_OK | MB_ICONQUESTION))
{
g_pLog->DisplayMessage(_T("Review Camera Connet Fail! Exit Review System"));
+ //�뾽�뜲�씠�듃�떆
//exit(1);
return FALSE;
}
diff --git a/ReviewSystem/ReviewSystem/MainFrm.cpp b/ReviewSystem/ReviewSystem/MainFrm.cpp
index 594f473..ee342ad 100644
--- a/ReviewSystem/ReviewSystem/MainFrm.cpp
+++ b/ReviewSystem/ReviewSystem/MainFrm.cpp
@@ -87,6 +87,7 @@
system("net use Y: \\\\126.100.100.1\\d\\DIT_ResultData pw:dit/user:Server/persistent:yes");
//LYW Align Reconnect
+ //�뾽�뜲�씠�듃�떆
//system("netsh interface set interface name = \"Align #1\" admin = disable&& netsh interface set interface name = \"Align #1\" admin = enable&& netsh interface set interface name = \"Align #2\" admin = disable&& netsh interface set interface name = \"Align #2\" admin = enable");
//Sleep(2000);
diff --git a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
index b5015e7..61ee2e5 100644
--- a/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
+++ b/ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp
@@ -1027,6 +1027,10 @@
}
+
+ // #3381 LYW CF AOI Review 전설비 FDC TackTime 오보고 현상 개선 ADD START
+ pDitRawClient->GetGlassData()->m_tmReviewLoading = CTime::GetCurrentTime();
+ // #3381 LYW CF AOI Review 전설비 FDC TackTime 오보고 현상 개선 ADD END
CString strGlassIDTemp = NULL;
@@ -4691,7 +4695,7 @@
//3360 LYW_ CF AOI QD Review WSI XY MotorMoving Error 알람 발생 원인 분석 및 조치 START
g_pLog->DisplayMessage(_T("[GantryAutoGo] No Exist Send Point,TwoGantrySyncMode OFF!"), vectorPosX.size());
g_pLog->DisplayMessage(_T("[GantryAutoGo] (%d)Gantry Path Send Fail"), pModuleStatus->GetGantryIndex()); //taek 210128
- pMotorControl->GantrySetTwoGantrySyncModeSend(1);
+ pMotorControl->GantrySetTwoGantrySyncModeSend(0);
//3360 LYW_ CF AOI QD Review WSI XY MotorMoving Error 알람 발생 원인 분석 및 조치 END
}
else
--
Gitblit v1.9.3