大改

tx

8 天以前 e0b138b3e057de6f57021e6c8963868f5c5acc5a

 TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFileÁ¦·ò/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.例行测试)
            {