From e0b138b3e057de6f57021e6c8963868f5c5acc5a Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期二, 22 四月 2025 11:07:06 +0800
Subject: [PATCH] 大改
---
TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile力夫/TestReportFileLIFU1.cs | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git "a/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\345\212\233\345\244\253/TestReportFileLIFU1.cs" "b/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\345\212\233\345\244\253/TestReportFileLIFU1.cs"
index 30c6f50..01b5165 100644
--- "a/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\345\212\233\345\244\253/TestReportFileLIFU1.cs"
+++ "b/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\345\212\233\345\244\253/TestReportFileLIFU1.cs"
@@ -102,11 +102,11 @@
if (_ratedParas == null)
_ratedParas = TProduct.Model.RatedParas4Pump.ToModel(this._currentPump.RatedParas);
- if (this._featTestItem.ItemParas != null && this._featTestItem.ItemParas.IsEntendZeroH)
+ if (this._featTestItem.ItemParas != null && this._featTestItem.ItemParas.ExtendPointH != null)
{
max_flow_real_ls = Math.Round(Eventech.Common.UnitQHelper.fromM3H(
Eventech.Model.UnitQ.LMIN,
- this._featTestItem.ItemParas.FlowInZeroH), 2);
+ this._featTestItem.ItemParas.ExtendPointH.Value), 2);
}
if (_ratedParas.MaxQ != null && _ratedParas.MaxQ > 0)
@@ -363,41 +363,41 @@
//鍑哄彛琛ㄤ綅楂�
var mp_outlet_press = this._allMonitorPoints.Find(x => x.Property == TProduct.Model.MonitorTypeProperty.鍑哄彛 &&
x.MonitorType == Model.eMonitorType.鍘嬪姏);
- if (mp_outlet_press != null && mp_outlet_press.Elevation != null)
- {
- SetCellValue(sheet, 4, "N", mp_outlet_press.Elevation.Value);
- }
- //鍑哄彛鍙ｅ緞
- if (mp_outlet_press != null && mp_outlet_press.PipeDia != null &&
- mp_outlet_press.PipeDia.Value > 0)
- {
- SetCellValue(sheet, 5, "N", mp_outlet_press.PipeDia.Value);
- }
- else
- {
- var pipeParas = new Model.PipeParas4Pump(this._workBench.PipeParas);
- if (pipeParas != null && pipeParas.OutletDia != null)
- {
- SetCellValue(sheet, 5, "N", pipeParas.OutletDia.Value);
- }
- }
+ //if (mp_outlet_press != null && mp_outlet_press.Elevation != null)
+ //{
+ // SetCellValue(sheet, 4, "N", mp_outlet_press.Elevation.Value);
+ //}
+ ////鍑哄彛鍙ｅ緞
+ //if (mp_outlet_press != null && mp_outlet_press.PipeDia != null &&
+ // mp_outlet_press.PipeDia.Value > 0)
+ //{
+ // SetCellValue(sheet, 5, "N", mp_outlet_press.PipeDia.Value);
+ //}
+ //else
+ //{
+ // var pipeParas = new Model.PipeParas4Pump(this._workBench.PipeParas);
+ // if (pipeParas != null && pipeParas.OutletDia != null)
+ // {
+ // SetCellValue(sheet, 5, "N", pipeParas.OutletDia.Value);
+ // }
+ //}
//杩涘彛鍙ｅ緞
var mp_inlet_press = this._allMonitorPoints.Find(x =>
x.Property == TProduct.Model.MonitorTypeProperty.杩涘彛 &&
x.MonitorType == Model.eMonitorType.鍘嬪姏);
- if (mp_inlet_press != null && mp_inlet_press.PipeDia != null &&
- mp_inlet_press.PipeDia.Value > 0)
- {
- SetCellValue(sheet, 5, "I", mp_inlet_press.PipeDia.Value);
- }
- else
- {
- var pipeParas = new Model.PipeParas4Pump(this._workBench.PipeParas);
- if (pipeParas != null && pipeParas.InletDia != null)
- {
- SetCellValue(sheet, 5, "I", pipeParas.InletDia.Value);
- }
- }
+ //if (mp_inlet_press != null && mp_inlet_press.PipeDia != null &&
+ // mp_inlet_press.PipeDia.Value > 0)
+ //{
+ // SetCellValue(sheet, 5, "I", mp_inlet_press.PipeDia.Value);
+ //}
+ //else
+ //{
+ // var pipeParas = new Model.PipeParas4Pump(this._workBench.PipeParas);
+ // if (pipeParas != null && pipeParas.InletDia != null)
+ // {
+ // SetCellValue(sheet, 5, "I", pipeParas.InletDia.Value);
+ // }
+ //}
//璇曟牱鏉ユ簮
if (this._testProject.ProjectParas.TestNature == Model.eTestProjectNature.渚嬭娴嬭瘯)
{
--
Gitblit v1.9.3