Merge remote-tracking branch 'origin/feature/#3381_CF_AOI_Review_전설비_FDC_Ta...

KYH

2021-06-07 e21f80c0b3c303c8f38859cc7652822f2da2913c

Merge remote-tracking branch 'origin/feature/#3381_CF_AOI_Review_전설비_FDC_TackTime_오보고_현상_개선' into develop

 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)
    {

 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;
                }

 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);


 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