diff --git a/SourceCode/Code2026/PipelineCmd/FlangeDlg.cpp b/SourceCode/Code2026/PipelineCmd/FlangeDlg.cpp index a40ec96..af67d5a 100644 --- a/SourceCode/Code2026/PipelineCmd/FlangeDlg.cpp +++ b/SourceCode/Code2026/PipelineCmd/FlangeDlg.cpp @@ -312,15 +312,16 @@ void CFlangeDlg::SetAdoDb(CUIISQLiteServer *pDb) void CFlangeDlg::GetEndF1(CString &sEndF) { + //端面型式在 m_arFlangeVals 的下标 5(0公称直径 1法兰外径 2法兰高度 3法兰厚度 4法兰颈 5端面1 6端面2) sEndF = _T("FF"); - if (m_arFlangeVals.GetSize() > 0) - sEndF = m_arFlangeVals.GetAt(0); + if (m_arFlangeVals.GetSize() > 5 && !m_arFlangeVals.GetAt(5).IsEmpty()) + sEndF = m_arFlangeVals.GetAt(5); } void CFlangeDlg::GetEndF2(CString &sEndF) { sEndF = _T("FF"); - if (m_arFlangeVals.GetSize() > 1) - sEndF = m_arFlangeVals.GetAt(1); + if (m_arFlangeVals.GetSize() > 6 && !m_arFlangeVals.GetAt(6).IsEmpty()) + sEndF = m_arFlangeVals.GetAt(6); }