|
@@ -83,12 +83,13 @@ BOOL CPageDebug::OnInitDialog()
|
|
// 离线模式;
|
|
// 离线模式;
|
|
CRect rcBtn;
|
|
CRect rcBtn;
|
|
CRect rcEdit;
|
|
CRect rcEdit;
|
|
- GetDlgItem(BTN_LOAD_DATA)->GetWindowRect(&rcBtn);
|
|
|
|
|
|
+ GetDlgItem(CHECK_SN_GET)->GetWindowRect(&rcBtn);
|
|
GetDlgItem(EDIT_BATCH_NUMBER)->GetWindowRect(&rcEdit);
|
|
GetDlgItem(EDIT_BATCH_NUMBER)->GetWindowRect(&rcEdit);
|
|
GetDlgItem(BTN_LOAD_DATA)->ShowWindow(FALSE);
|
|
GetDlgItem(BTN_LOAD_DATA)->ShowWindow(FALSE);
|
|
|
|
+ GetDlgItem(CHECK_SN_GET)->ShowWindow(FALSE);
|
|
//GetDlgItem(EDIT_BATCH_NUMBER)->ClientToScreen(rcEdit);
|
|
//GetDlgItem(EDIT_BATCH_NUMBER)->ClientToScreen(rcEdit);
|
|
//GetDlgItem(EDIT_BATCH_NUMBER)->MoveWindow(rcEdit.left, rcEdit.top, rcEdit.Width()+rcBtn.Width(), rcEdit.Height(), TRUE);
|
|
//GetDlgItem(EDIT_BATCH_NUMBER)->MoveWindow(rcEdit.left, rcEdit.top, rcEdit.Width()+rcBtn.Width(), rcEdit.Height(), TRUE);
|
|
- GetDlgItem(EDIT_BATCH_NUMBER)->SetWindowPos(NULL, rcEdit.left, rcEdit.top, rcEdit.Width()+rcBtn.Width(), rcEdit.Height(), SWP_NOZORDER|SWP_NOMOVE);
|
|
|
|
|
|
+ GetDlgItem(EDIT_BATCH_NUMBER)->SetWindowPos(NULL, rcEdit.left, rcEdit.top, rcBtn.right - rcEdit.right + rcEdit.Width(), rcEdit.Height(), SWP_NOZORDER|SWP_NOMOVE);
|
|
|
|
|
|
TCHAR szValue[8] = {0};
|
|
TCHAR szValue[8] = {0};
|
|
SetDlgItemText(EDIT_EVALUE, GLOBAL::g_config.szDeltaEValue);
|
|
SetDlgItemText(EDIT_EVALUE, GLOBAL::g_config.szDeltaEValue);
|
|
@@ -443,7 +444,7 @@ DWORD CPageDebug::ThreadGoProc(LPVOID lpParam)
|
|
// 在线模式,上报结果;
|
|
// 在线模式,上报结果;
|
|
if ( !GLOBAL::g_config.nOffline )
|
|
if ( !GLOBAL::g_config.nOffline )
|
|
{
|
|
{
|
|
- m_pDlg->UpLoadTestData();
|
|
|
|
|
|
+ //m_pDlg->UpLoadTestData();
|
|
}
|
|
}
|
|
|
|
|
|
// 更新数据库;
|
|
// 更新数据库;
|
|
@@ -638,14 +639,37 @@ void CPageDebug::OnBnClickedTest()
|
|
::SendMessage(g_hWnd_SN_Combobox, CB_SELECTSTRING, 0, (LPARAM)&szLen); // 此方法:设置句柄文本成功;
|
|
::SendMessage(g_hWnd_SN_Combobox, CB_SELECTSTRING, 0, (LPARAM)&szLen); // 此方法:设置句柄文本成功;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ TCHAR szSN[26] = {0};
|
|
// 设置SN编辑框;
|
|
// 设置SN编辑框;
|
|
if ( g_hWnd_SN )
|
|
if ( g_hWnd_SN )
|
|
- {
|
|
|
|
- TCHAR szSN[26] = {0};
|
|
|
|
|
|
+ {
|
|
_stprintf_s(szSN, _T("%s"), strSN.GetString());
|
|
_stprintf_s(szSN, _T("%s"), strSN.GetString());
|
|
::SendMessage(g_hWnd_SN, WM_SETTEXT, 0, (LPARAM)&szSN);
|
|
::SendMessage(g_hWnd_SN, WM_SETTEXT, 0, (LPARAM)&szSN);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+#pragma region 在线模式;
|
|
|
|
+ if ( GLOBAL::g_config.nOffline == 0 )
|
|
|
|
+ {
|
|
|
|
+ // 需要判断SN是否存在;
|
|
|
|
+ if ( !CMESdb::GetInstance()->IsExitTVSN(szSN) )
|
|
|
|
+ {
|
|
|
|
+ MessageBox(_T("错误:SN未上线!"), _T("错误!"), MB_ICONERROR);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ TString strValue;
|
|
|
|
+ // 当前SN下一站点是否为当前站点(当前站点为白平衡)
|
|
|
|
+ if ( !CMESdb::GetInstance()->GetNextProcessCode(szSN, strValue) )
|
|
|
|
+ {
|
|
|
|
+ if ( strValue != _T("36") )
|
|
|
|
+ {
|
|
|
|
+ MessageBox(_T("错误:SN当前工站节点不是白平衡节点!"), _T("错误!"), MB_ICONERROR);
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+#pragma endregion
|
|
|
|
+
|
|
// 按钮Go按钮;
|
|
// 按钮Go按钮;
|
|
HWND hWnd = GLOBAL::g_procWndInfo.GetButtonWnd(_T("Go"));
|
|
HWND hWnd = GLOBAL::g_procWndInfo.GetButtonWnd(_T("Go"));
|
|
if ( hWnd )
|
|
if ( hWnd )
|
|
@@ -990,6 +1014,11 @@ void CPageDebug::UpdateList(std::vector<GLOBAL::RGB_PAT> &vtRGB)
|
|
m_ctrlList.SetItemCountEx(vtRGB.size());
|
|
m_ctrlList.SetItemCountEx(vtRGB.size());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+bool CPageDebug::UpLoadTestData()
|
|
|
|
+{
|
|
|
|
+ return true;
|
|
|
|
+}
|
|
|
|
+
|
|
void CPageDebug::OnNMCustomdrawDebugData(NMHDR *pNMHDR, LRESULT *pResult)
|
|
void CPageDebug::OnNMCustomdrawDebugData(NMHDR *pNMHDR, LRESULT *pResult)
|
|
{
|
|
{
|
|
NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
|
|
NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
|