gjm/envi-code
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: gjm/envi-code:b96cb1bed23bb70e367345f2b2ffef812ace14dc
gjm/envi-code:main
...
compare: gjm/envi-code:main
gjm/envi-code:main
4 Commits
b96cb1bed2 ... main
Author SHA1 Message Date
gjm 63ed4744fb Merge pull request 'fix(FlangeDlg): 修正 GetEndF1/GetEndF2 端面取值下标' (#5) from company-desktop-computer/company-ai-dev into main 
Reviewed-on: #5
 2026-10-09 14:12:16 +08:00
company-desktop-computer 9d9077a03e fix(FlangeDlg): 修正 GetEndF1/GetEndF2 端面取值下标 
- CFlangeDlg::GetEndF1/GetEndF2 原先取 m_arFlangeVals 下标 0/1（公称直径/法兰外径），
  端面型式实际在下标 5/6，导致 PIPE_FLANGF 被写成 DN 字符串
- 改为下标 5/6，且为空时回退 "FF"
 2026-10-09 14:09:23 +08:00
gjm 8628fcc7e0 Merge pull request 'test: 验证 company-desktop-computer 账号的 PR 作者' (#4) from company-desktop-computer/pr-test-company into main 
Reviewed-on: #4
 2026-10-09 10:48:18 +08:00
gjm b7b9827994 test: 验证 company-desktop-computer 账号的 PR 作者 2026-10-09 10:46:59 +08:00
1 changed files with 5 additions and 4 deletions
Expand all files Collapse all files
SourceCode/Code2026/PipelineCmd/FlangeDlg.cpp
+5 -4
View File
@@ -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);
}