From 011976390eaa41bbd114f828401817712bdbd8dc Mon Sep 17 00:00:00 2001
From: lh <2334563547@qq.com>
Date: Wed, 9 Sep 2026 14:24:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(nmNum):=20=E4=BF=9D=E7=95=99=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E4=BA=95=E4=B8=89=E7=9B=B8=E5=85=A8=E5=85=B3=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=B5=81=E9=87=8F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 三相全部关闭时保留有效 Flow Gauge Code 和流动段索引
- 最后一相切换为“无”时不再清空流量记录选择
- 仅在流量记录无效或不可选择时清空相关配置
- 保持不可计算井自动取消包含的现有行为
---
 Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp b/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp
index e805650..fa6eacc 100644
--- a/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp
+++ b/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp
@@ -576,8 +576,7 @@ void nmWxIncludeOtherWells::normalizeFlowSelection(WellDataRow& data) const
 {
 	const nmFlowGaugeRecord* pRecord = findFlowRecord(
 			data.m_vecFlowRecords, data.m_sFlowGaugeCode);
-	if(pRecord == nullptr ||
-	   pRecord->eStatus != NM_GaugeRecord_Usable) {
+	if(pRecord == nullptr || !nmIsSelectableFlowRecord(*pRecord)) {
 		data.m_sFlowGaugeCode.clear();
 		data.m_bUseOilRate = false;
 		data.m_bUseGasRate = false;
@@ -592,12 +591,6 @@ void nmWxIncludeOtherWells::normalizeFlowSelection(WellDataRow& data) const
 			isSelectableFlowPhase(*pRecord, PHASE_Gas);
 	data.m_bUseWaterRate = data.m_bUseWaterRate &&
 			isSelectableFlowPhase(*pRecord, PHASE_Water);
-	if(!data.m_bUseOilRate && !data.m_bUseGasRate &&
-	   !data.m_bUseWaterRate) {
-		data.m_sFlowGaugeCode.clear();
-		data.m_nFlowSegmentIndex = 0;
-		return;
-	}
 
 	const int nSegmentCount = flowRecordSegmentCount(*pRecord);
 	if(nSegmentCount <= 0) {
@@ -819,10 +812,6 @@ void nmWxIncludeOtherWells::onRateSourceChanged(int nIndex)
 	const QString sGaugeCode = pComboBox->itemData(nIndex).toString();
 	if(sGaugeCode.isEmpty()) {
 		setRowPhaseUsed(oData, ePhase, false);
-		if(!oData.m_bUseOilRate && !oData.m_bUseGasRate &&
-		   !oData.m_bUseWaterRate) {
-			switchRowFlowGaugeCode(oData, QString());
-		}
 	} else {
 		const nmFlowGaugeRecord* pRecord = findFlowRecord(
 				oData.m_vecFlowRecords, sGaugeCode);