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标准/TestReportFileT3.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git "a/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\346\240\207\345\207\206/TestReportFileT3.cs" "b/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\346\240\207\345\207\206/TestReportFileT3.cs"
index 5a8d0de..738c4fc 100644
--- "a/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\346\240\207\345\207\206/TestReportFileT3.cs"
+++ "b/TProduct.DataFile/TProduct.DataFile.PumpReport/ReportFile\346\240\207\345\207\206/TestReportFileT3.cs"
@@ -137,20 +137,20 @@
{
double bwj = 0;
var mp_inlet1 = this._allMonitorPoints.Find(x => x.MonitorType == Model.eMonitorType.鍘嬪姏 && x.Property == TProduct.Model.MonitorTypeProperty.杩涘彛);
- if (mp_inlet1 != null && mp_inlet1.PipeDia.HasValue)
- {
- SetCellValue(sheet_default, 5, "B", mp_inlet1.PipeDia.Value);
- }
+ //if (mp_inlet1 != null && mp_inlet1.PipeDia.HasValue)
+ //{
+ // SetCellValue(sheet_default, 5, "B", mp_inlet1.PipeDia.Value);
+ //}
var mp_outlet1 = this._allMonitorPoints.Find(x => x.MonitorType == Model.eMonitorType.鍘嬪姏 && x.Property == TProduct.Model.MonitorTypeProperty.鍑哄彛);
- if (mp_outlet1 != null && mp_outlet1.PipeDia.HasValue)
- {
- SetCellValue(sheet_default, 5, "E", mp_outlet1.PipeDia.Value);
- }
- if (mp_inlet1 != null && mp_inlet1.Elevation.HasValue)
- bwj = bwj - mp_inlet1.Elevation.Value;
- if (mp_inlet1 != null && mp_outlet1.Elevation.HasValue)
- bwj = bwj + mp_outlet1.Elevation.Value;
+ //if (mp_outlet1 != null && mp_outlet1.PipeDia.HasValue)
+ //{
+ // SetCellValue(sheet_default, 5, "E", mp_outlet1.PipeDia.Value);
+ //}
+ //if (mp_inlet1 != null && mp_inlet1.Elevation.HasValue)
+ // bwj = bwj - mp_inlet1.Elevation.Value;
+ //if (mp_inlet1 != null && mp_outlet1.Elevation.HasValue)
+ // bwj = bwj + mp_outlet1.Elevation.Value;
//杩涘彛鍘嬪姏琛ㄨ嚦杩涘彛鍘嬪姏琛ㄨ窛绂�
SetCellValue(sheet_default, 5, "H", bwj);
}
--
Gitblit v1.9.3