From 9d9077a03ea56c1d27704518801a6cbc508c0def Mon Sep 17 00:00:00 2001 From: company-desktop-computer Date: Fri, 9 Oct 2026 14:09:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(FlangeDlg):=20=E4=BF=AE=E6=AD=A3=20GetEndF1?= =?UTF-8?q?/GetEndF2=20=E7=AB=AF=E9=9D=A2=E5=8F=96=E5=80=BC=E4=B8=8B?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - CFlangeDlg::GetEndF1/GetEndF2 原先取 m_arFlangeVals 下标 0/1（公称直径/法兰外径）， 端面型式实际在下标 5/6，导致 PIPE_FLANGF 被写成 DN 字符串 - 改为下标 5/6，且为空时回退 "FF" --- SourceCode/Code2026/PipelineCmd/FlangeDlg.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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); } -- 2.54.0