업로드 실패알람 조건 변경

LYW

2022-08-05 5f12658f37fed156e67b3318542c98f359341ffd

업로드 실패알람 조건 변경

 ReviewSystem/CHReviewSetting/NetworkInfo.cpp

@@ -37,6 +37,7 @@

    m_nZeroReviewAlarm         = 0;
    m_strZeroReviewAlarmExcept = _T("");
    m_nResultFileUploadFailAlarmCondition = 3;
}

void CNetworkInfo::SetInfo(const CNetworkInfo& rhs)
@@ -65,6 +66,7 @@

    m_nZeroReviewAlarm = rhs.m_nZeroReviewAlarm;
    m_strZeroReviewAlarmExcept = rhs.m_strZeroReviewAlarmExcept;
    m_nResultFileUploadFailAlarmCondition = rhs.m_nResultFileUploadFailAlarmCondition;
}

void CNetworkInfo::GetInfo(CNetworkInfo& rhs)
@@ -93,4 +95,5 @@

    rhs.m_nZeroReviewAlarm = m_nZeroReviewAlarm;
    rhs.m_strZeroReviewAlarmExcept = m_strZeroReviewAlarmExcept;
    rhs.m_nResultFileUploadFailAlarmCondition = m_nResultFileUploadFailAlarmCondition;
}

 ReviewSystem/CHReviewSetting/Sys_NetworkManager.cpp

@@ -88,6 +88,9 @@

    strItem.Format(_T("SYS_NETWORK_REVIEW_ZERO_ALARM_EXCEPTION"));
    macroFile.SetItem(strItem, networkInfo.m_strZeroReviewAlarmExcept);

    strItem.Format(_T("SYS_NETWORK_RESULT_UPLOAD_FAIL_ALARM_CONDITION"));
    macroFile.SetItem(strItem, networkInfo.m_nResultFileUploadFailAlarmCondition);
}

void CSys_NetworkManager::GetProfile(CMacroFile& macroFile)
@@ -158,5 +161,8 @@
    strItem.Format(_T("SYS_NETWORK_REVIEW_ZERO_ALARM_EXCEPTION"));
    macroFile.GetItem(strItem, networkInfo.m_strZeroReviewAlarmExcept, _T(""));

    strItem.Format(_T("SYS_NETWORK_RESULT_UPLOAD_FAIL_ALARM_CONDITION"));
    macroFile.GetItem(strItem, networkInfo.m_nResultFileUploadFailAlarmCondition, 3);

    m_networkInfo.SetInfo(networkInfo);
}

 ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.cpp

@@ -168,6 +168,7 @@
    m_nGlassCount = 0;
    m_nStackZeroReviewCondition = 0;
    m_nUploadResultFailCount = 0;
    m_nStackUploadFailGlassCount = 0;
    CDitGlassRawClient* pDitGlassRaw = CDitGlassRawClient::GetInstance();
    if(pDitGlassRaw->ConnectServer() == FALSE)
    {
@@ -8395,10 +8396,18 @@
    if (UploadResult == FALSE)
    {
        UploadResultFailCount++;
        m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is False"));
        if (UploadResultFailCount >= 3)
        {
            m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail!"));
            SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
            //SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
            m_nStackUploadFailGlassCount++;
            m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail Glass Count = %d"),m_nStackUploadFailGlassCount);
            if (m_nStackUploadFailGlassCount >= m_pSP2P->ISP2P_System_GetNetworkInfo()->m_nResultFileUploadFailAlarmCondition)
            {
                SendSignalToSignalControl(PCControlSendSignalIndex_State, PCControlSend_ResultData_Upload_Fail, 1000);
                m_nStackUploadFailGlassCount = 0;
                m_pSP2P->ISP2P_DisplayMessage(_T("ResultFile Upload Fail Alarm!"));
            }
            SetUploadResultFailCount(-1);
        }
        else
@@ -8406,6 +8415,11 @@
            SetUploadResultFailCount(UploadResultFailCount);
        }
    }
    else
    {
        m_pSP2P->ISP2P_DisplayMessage(_T("Upload Ack is True"));
        m_nStackUploadFailGlassCount = 0;
    }
}

//#3358 KYH FDC  ADD END

 ReviewSystem/ReviewSystem/SequenceProcessor_CPJT.h

@@ -432,5 +432,6 @@
    BOOL bFileFind;
    int m_nStackZeroReviewCondition;
    int m_nUploadResultFailCount;
    int m_nStackUploadFailGlassCount;
};


 ReviewSystem/ReviewSystemSetting/DlgNetwork.cpp

@@ -31,6 +31,7 @@
    , m_strWsiImagePath(_T(""))
    , m_nZeroReviewAlarm(0)
    , m_strZeroReviewAlarmExcept(_T(""))
    , m_nResultFileUploadFailAlarmCondition(3)
{
    m_nUpdateImageWidth            = 1224;
    m_nUpdateImageHeight        = 1024;
@@ -81,6 +82,7 @@
    DDV_MaxChars(pDX, m_strWsiImagePath, 255);
    DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_ZERO_COUNT_ALARM_CONDITION, m_nZeroReviewAlarm);
    DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_ZERO_COUNT_ALARM_CONDITION_2, m_strZeroReviewAlarmExcept);
    DDX_Text(pDX, IDC_EDIT_SYS_NETWORK_UPLOAD_FAIL_ALARM_CONDITION, m_nResultFileUploadFailAlarmCondition);
}

BEGIN_MESSAGE_MAP(CDlgNetwork, CDialog)
@@ -139,6 +141,7 @@

            m_nZeroReviewAlarm        = pNetworkInfo->m_nZeroReviewAlarm;
            m_strZeroReviewAlarmExcept = pNetworkInfo->m_strZeroReviewAlarmExcept;
            m_nResultFileUploadFailAlarmCondition = pNetworkInfo->m_nResultFileUploadFailAlarmCondition;

            m_ctrlButtonUseSaveOrignalImage.SetCheck(m_bUpdateImageOriginal);
            m_ctrlComboImageRotate.SetCurSel(m_nImageRotate);
@@ -193,6 +196,7 @@

    m_nZeroReviewAlarm            = 0;
    m_strZeroReviewAlarmExcept     = _T("");
    m_nResultFileUploadFailAlarmCondition = 3;

    UpdateData(FALSE);
}
@@ -231,6 +235,7 @@

            pNetworkInfo->m_nZeroReviewAlarm        = m_nZeroReviewAlarm;
            pNetworkInfo->m_strZeroReviewAlarmExcept = m_strZeroReviewAlarmExcept;
            pNetworkInfo->m_nResultFileUploadFailAlarmCondition = m_nResultFileUploadFailAlarmCondition;
        }
    }
    m_ctrlEditImageHeight.EnableWindow(TRUE);

 ReviewSystem/ReviewSystemSetting/DlgNetwork.h

@@ -61,4 +61,5 @@

    int m_nZeroReviewAlarm;
    CString m_strZeroReviewAlarmExcept;
    int m_nResultFileUploadFailAlarmCondition;
};

 ReviewSystem/ReviewSystemSetting/ReviewSystemSetting.rc

@@ -341,6 +341,9 @@
    LTEXT           "매 이상 연속 0리뷰시 발생",IDC_STATIC,162,289,85,14,SS_CENTERIMAGE
    EDITTEXT        IDC_EDIT_SYS_NETWORK_UPLOAD_ZERO_COUNT_ALARM_CONDITION_2,249,289,55,14,ES_AUTOHSCROLL
    LTEXT           "일 경우 제외",IDC_STATIC,305,290,59,14,SS_CENTERIMAGE
    RTEXT           "Result Upload Fail Alarm : ",IDC_STATIC,15,302,85,14,SS_CENTERIMAGE
    EDITTEXT        IDC_EDIT_SYS_NETWORK_UPLOAD_FAIL_ALARM_CONDITION,105,304,55,14,ES_AUTOHSCROLL
    LTEXT           "매 이상 연속 0리뷰시 발생",IDC_STATIC,162,305,85,14,SS_CENTERIMAGE
END

IDD_DIALOG_SYS_SETTING_SYSTEM_GANTRY DIALOGEX 0, 0, 363, 345

 ReviewSystem/ReviewSystemSetting/resource.h

@@ -146,6 +146,8 @@
#define IDC_BUTTON_SYS_SYSTEM_LIGHT_APPLY 1041
#define IDC_EDIT_SYS_NETWORK_UPLOAD_ZERO_COUNT_ALARM_CONDITION_2 1041
#define IDC_GRID_SYSTEM_LIGHT_INFO      1042
#define IDC_EDIT_SYS_NETWORK_UPLOAD_ZERO_COUNT_ALARM_CONDITION2 1042
#define IDC_EDIT_SYS_NETWORK_UPLOAD_FAIL_ALARM_CONDITION 1042
#define IDC_EDIT_SYS_SG_GANTRY_IDX      1043
#define IDC_EDIT_SYS_SG_HEADER_IDX      1044
#define IDC_EDIT_SYS_SC_GANTRY_IDX      1045

 ReviewSystem/include/CHReviewSetting/NetworkInfo.h

@@ -37,5 +37,6 @@

    int m_nZeroReviewAlarm;
    CString m_strZeroReviewAlarmExcept;
    int m_nResultFileUploadFailAlarmCondition;
};