Merge pull request 'fix(FlangeDlg): 修正 GetEndF1/GetEndF2 端面取值下标' (#5 ) from company-desktop-computer/company-ai-dev into main

Reviewed-on: #5
fix(FlangeDlg): 修正 GetEndF1/GetEndF2 端面取值下标
2026-10-09 14:12:16 +08:00 · 2026-10-09 14:09:23 +08:00 · 2026-10-09 10:48:18 +08:00 · 2026-10-09 10:46:59 +08:00 · 2026-10-09 10:33:03 +08:00 · 2026-10-09 10:31:04 +08:00
3 changed files with 104 additions and 5 deletions
@@ -1,5 +1,5 @@
 Arx/
-Zrx/
+ZRX/
 cmake_output/
 bin/
 lib/
@@ -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);
 }


@@ -18033,6 +18033,103 @@ void DBL_AEC_DBEWFIT()
 			AecDbEwFitting* pEw = AecDbEwFitting::cast(pEnt);
 			if (pEw != NULL)
 			{
+				//法兰：双击弹出法兰对话框，把选中的法兰/垫片数据应用到该法兰对象
+				if (pEw->GetFittingType() == eFlange)
+				{
+					CString dbPath = FilePath::GetSysDir();
+					dbPath += _T("\\Plumbing.db");
+
+					CUIISQLiteServer * pADOServer = new CUIISQLiteServer;
+					if (!pADOServer->InitADOServer(dbPath))
+					{
+						AfxMessageBox(_T("数据库驱动加载数据库Plumbing.db失败!"));
+						delete pADOServer;
+						pEnt->close();
+						return;
+					}
+
+					//取当前法兰参数作为对话框初值
+					const AecDbObjXDataMap* pMap = pEw->GetSpecialtyData(AcDb::kForRead);
+
+					double dDN = 0.0;
+					pMap->GetAt(PIPE_DN, dDN);
+
+					double dPre = 1.0;
+					pMap->GetAt(PIPE_PRESSURE, dPre);
+
+					CString sODNo, sPro, sLevel;
+					pMap->GetAt(PIPE_ODSN, sODNo);
+					pMap->GetAt(DOC_PROJECT, sPro);
+					pMap->GetAt(PIPE_LEVEL, sLevel);
+
+					if (!sLevel.IsEmpty() && sPro.IsEmpty())
+					{
+						AecDbObjXDataMap xMap;
+						KTModelLayoutXData::ReadModelXData(KT_PIPEINIT, xMap);
+						xMap.GetAt(DOC_PROJECT, sPro);
+					}
+
+					{
+						CAcModuleResourceOverride rcTmp;
+						CFlangeDlg flgDlg;
+						flgDlg.SetAdoDb(pADOServer);
+						flgDlg.SetDN((int)dDN);
+						flgDlg.SetPressure(dPre);
+						flgDlg.SetLevel(sODNo, sPro, sLevel);
+
+						if (IDOK == flgDlg.DoModal())
+						{
+							//提取旧的接口
+							pEw->GetInterface(arOldInfs);
+
+							CStringArray arValuesF, arValuesG;
+							flgDlg.GetFlangeValues(arValuesF);
+							flgDlg.GetGasketValues(arValuesG);
+
+							//列: 0公称直径 1法兰外径 2法兰高度 3法兰厚度 4法兰颈 5端面
+							if (arValuesF.GetSize() >= 5)
+							{
+								double dWD  = _ttof(arValuesF.GetAt(1));	//法兰盘外径
+								double dWh  = _ttof(arValuesF.GetAt(3));	//法兰盘厚度
+								double dThk = _ttof(arValuesF.GetAt(3));	//法兰总厚
+								double dN   = _ttof(arValuesF.GetAt(4));	//法兰颈
+
+								CString sEndF = _T("FF");
+								if (arValuesF.GetSize() > 5) sEndF = arValuesF.GetAt(5);
+
+								pEw->upgradeOpen();
+
+								AecDbObjXDataMap* pXDataMapSrc = pEw->GetSpecialtyData(AcDb::kForWrite);
+
+								pXDataMapSrc->SetAt(PIPE_WD, dWD);
+								pXDataMapSrc->SetAt(PIPE_WTHICK, dWh);
+								pXDataMapSrc->SetAt(PIPE_THICK, dThk);
+								pXDataMapSrc->SetAt(PIPE_N, dN);
+								pXDataMapSrc->SetAt(PIPE_FLANGF, sEndF);
+
+								if (arValuesG.GetSize() > 4)
+								{
+									pXDataMapSrc->SetAt(PIPE_GASKETM, arValuesG.GetAt(1));
+									pXDataMapSrc->SetAt(PIPE_PRESSURE, _ttof(arValuesG.GetAt(2)));
+									pXDataMapSrc->RemoveAt(PIPE_GASKET);
+									pXDataMapSrc->SetAt(PIPE_GASKET, _ttof(arValuesG.GetAt(3)));
+									pXDataMapSrc->SetAt(PIPE_GASKETDSC, arValuesG.GetAt(4));
+								}
+
+								pEw->ReCreateDraw2d();
+								pEw->ReCreateDraw3d();
+
+								pEw->downgradeOpen();
+
+								pEw->GetInterface(arNewInfs);
+							}
+						}
+					}
+
+					delete pADOServer;
+				}
+				else
+				{
 				WPipe::PipeParam* pParam = NULL;
 				pParam = pEw->GetPipeParam();

@@ -18094,6 +18191,7 @@ void DBL_AEC_DBEWFIT()
 						pEw->GetInterface(arNewInfs);
 					}
 				}
+				}
 			}
 			pEnt->close();
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
gjm	b96cb1bed2	Merge pull request '法兰双击改用法兰对话框：AecDbEwFitting 法兰双击弹出 CFlangeDlg 并回写法兰/垫片数据' (#3 ) from home-lenovo-legion-r9000/company-ai-dev into main Reviewed-on: #3	2026-10-09 10:33:03 +08:00
gjm	d107cfd47f	法兰双击改用法兰对话框：AecDbEwFitting 法兰双击弹出 CFlangeDlg 并回写法兰/垫片数据 - DBL_AEC_DBEWFIT：GetFittingType()==eFlange 时改用 CFlangeDlg（其余管件仍用 CGJSXDlg） - 对话框初值取自实体专业数据(DN/压力/等级/项目/外径系列) - 确定后回写 PIPE_WD/PIPE_WTHICK/PIPE_THICK/PIPE_N/PIPE_FLANGF 及垫片数据并重绘 - 沿用接口位移后收缩相邻管段逻辑	2026-10-09 10:31:04 +08:00
gjm	84f255ff22	Merge pull request 'fix(.gitignore): 修正 ZRX 目录大小写，避免在大小写敏感环境误提交 SDK' (#2 ) from home-lenovo-legion-r9000/company-ai-dev into main Reviewed-on: #2	2026-10-09 09:36:55 +08:00
gjm	a94ecf8d40	fix(.gitignore): 修正 ZRX 目录大小写，避免在大小写敏感环境误提交 SDK	2026-10-09 09:33:24 +08:00