From e0b138b3e057de6f57021e6c8963868f5c5acc5a Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期二, 22 四月 2025 11:07:06 +0800
Subject: [PATCH] 大改

---
 TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcNpshTestData/CalcNpshTestDataByHDlg.cs |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcNpshTestData/CalcNpshTestDataByHDlg.cs b/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcNpshTestData/CalcNpshTestDataByHDlg.cs
index 3911024..0d21fc0 100644
--- a/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcNpshTestData/CalcNpshTestDataByHDlg.cs
+++ b/TProduct.WinFrmUI/TProduct.WinFrmUI.TPump/CalcNpshTestData/CalcNpshTestDataByHDlg.cs
@@ -406,14 +406,14 @@
             double p1_mpa = 0;
             CurrentViewModel moinitor_press_inlet =
                 this._bindingData.Find(x => x.Entity.MonitorType == Model.eMonitorType.鍘嬪姏 && x.Entity.Property == TProduct.Model.MonitorTypeProperty.杩涘彛);
-            if (moinitor_press_inlet != null &&
-                moinitor_press_inlet.Entity != null &&
-                moinitor_press_inlet.Entity.PipeDia != null &&
-                moinitor_press_inlet.Entity.PipeDia > 10)
-            {
-                double mm_inlet_dia = moinitor_press_inlet.Entity.PipeDia.Value;
-                rPipeInV = OtherPressCoeff * total_flow_m3h / mm_inlet_dia / mm_inlet_dia;
-            }
+            //if (moinitor_press_inlet != null &&
+            //    moinitor_press_inlet.Entity != null &&
+            //    moinitor_press_inlet.Entity.PipeDia != null &&
+            //    moinitor_press_inlet.Entity.PipeDia > 10)
+            //{
+            //    double mm_inlet_dia = moinitor_press_inlet.Entity.PipeDia.Value;
+            //    rPipeInV = OtherPressCoeff * total_flow_m3h / mm_inlet_dia / mm_inlet_dia;
+            //}
 
             if (_ratedParas.IsInletPress)
             {//鍙兘娴嬬偣鏈�,閰嶆湁鏍囬珮
@@ -441,24 +441,24 @@
             double p2_mpa = Eventech.Common.UnitHHelper.toMPa(press_unit, moinitor_press_outlet.DispValue.Value);
 
             double rPipeOutV = 0;
-            if (moinitor_press_outlet.Entity.PipeDia != null && moinitor_press_outlet.Entity.PipeDia > 10)
-            {
-                double mm_outlet_dia = moinitor_press_outlet.Entity.PipeDia.Value;
-                rPipeOutV = OtherPressCoeff * total_flow_m3h / mm_outlet_dia / mm_outlet_dia;
-            }
+            //if (moinitor_press_outlet.Entity.PipeDia != null && moinitor_press_outlet.Entity.PipeDia > 10)
+            //{
+            //    double mm_outlet_dia = moinitor_press_outlet.Entity.PipeDia.Value;
+            //    rPipeOutV = OtherPressCoeff * total_flow_m3h / mm_outlet_dia / mm_outlet_dia;
+            //}
 
             //楂樺樊
             double gc = 0;
-            if (moinitor_press_outlet.Entity.Elevation != null)
-            {
-                gc += moinitor_press_outlet.Entity.Elevation.Value;
-            }
-            if (moinitor_press_inlet != null &&
-                moinitor_press_inlet.Entity != null &&
-                moinitor_press_inlet.Entity.Elevation != null)
-            {
-                gc -= moinitor_press_inlet.Entity.Elevation.Value;
-            }
+            //if (moinitor_press_outlet.Entity.Elevation != null)
+            //{
+            //    gc += moinitor_press_outlet.Entity.Elevation.Value;
+            //}
+            //if (moinitor_press_inlet != null &&
+            //    moinitor_press_inlet.Entity != null &&
+            //    moinitor_press_inlet.Entity.Elevation != null)
+            //{
+            //    gc -= moinitor_press_inlet.Entity.Elevation.Value;
+            //}
 
             double rVDif = (rPipeOutV * rPipeOutV - rPipeInV * rPipeInV) / (TProduct.ConstantParas.g * 2.0);
             double total_head = Math.Round(UnitConvert_MPa2M(p2_mpa - p1_mpa) + rVDif + gc, 2);

--
Gitblit v1.9.3