diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx index bf9ae25..de5a6fa 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表2020.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表2020.frx index 2991c62..1d639b3 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表2020.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表2020.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -41,7 +41,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装汇总表（安装）.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装汇总表（安装）.docx new file mode 100644 index 0000000..88c5ca2 Binary files /dev/null and b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装汇总表（安装）.docx differ diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs index f9cb2ab..4f09ba1 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs @@ -1,6 +1,7 @@ using Aspose.Words; using Aspose.Words.Tables; using BLL; +using FineUIPro.Web.common.BaseInfo; using Model; using Newtonsoft.Json.Linq; using NPOI.SS.Formula.Functions; @@ -392,10 +393,20 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL int i = 0; foreach (var row in rows) { + string pipeLineClass = string.Empty; + string isoNo = row["PipelineCode"].ToString(); + var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoNo(isoNo, projectId); + if (isoInfo != null) + { + if (!string.IsNullOrEmpty(isoInfo.PipeLineClass) && isoInfo.PipeLineClass != "/") + { + pipeLineClass = isoInfo.PipeLineClass + "/"; + } + } var newRow = dt.NewRow(); newRow["Num"] = (i + 1).ToString(); - newRow["PipelineCode"] = row["PipelineCode"].ToString(); - newRow["PipelineLevel"] = row["PipelineLevel"].ToString(); + newRow["PipelineCode"] = isoNo; + newRow["PipelineLevel"] = pipeLineClass + row["PipelineLevel"].ToString(); newRow["DesignPressure"] = row["DesignPressure"].ToString(); newRow["DesignTemperature"] = row["DesignTemperature"].ToString(); newRow["OperatingTemperature"] = row["OperatingTemperature"].ToString(); @@ -850,8 +861,19 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL if (obj == DBNull.Value) return ""; return obj.ToString().Replace("\r", "").Replace("\n", "").Trim(); } + + string pipeLineClass = string.Empty; + string isoNo = dr["PipelineCode"].ToString(); + var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoNo(isoNo, this.tvControlItem.SelectedNodeID); + if (isoInfo != null) + { + if (!string.IsNullOrEmpty(isoInfo.PipeLineClass) && isoInfo.PipeLineClass != "/") + { + pipeLineClass = isoInfo.PipeLineClass + "/"; + } + } string pipeCode = GetCellValue(dr["PipelineCode"]); - string pipeLevel = GetCellValue(dr["PipelineLevel"]); + string pipeLevel = GetCellValue(pipeLineClass + dr["PipelineLevel"]); string startPoint = GetCellValue(dr["PipelineStartPoint"]); string endPoint = GetCellValue(dr["PipelineEndPoint"]); string desPressure = TrimEndZero(dr["DesignPressure"]); diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs index 307c841..75ee00a 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs @@ -396,10 +396,20 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL int i = 0; foreach (var row in rows) { + string pipeLineClass = string.Empty; + string isoNo = row["PipelineCode"].ToString(); + var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoNo(isoNo, this.tvControlItem.SelectedNodeID); + if (isoInfo != null) + { + if (!string.IsNullOrEmpty(isoInfo.PipeLineClass) && isoInfo.PipeLineClass != "/") + { + pipeLineClass = isoInfo.PipeLineClass + "/"; + } + } var newRow = dt.NewRow(); newRow["Num"] = (i + 1).ToString(); - newRow["PipelineCode"] = row["PipelineCode"].ToString(); - newRow["PipelineLevel"] = row["PipelineLevel"].ToString(); + newRow["PipelineCode"] = isoNo; + newRow["PipelineLevel"] = pipeLineClass + row["PipelineLevel"].ToString(); newRow["DesignPressure"] = row["DesignPressure"].ToString(); newRow["DesignTemperature"] = row["DesignTemperature"].ToString(); newRow["OperatingTemperature"] = row["OperatingTemperature"].ToString(); @@ -1058,9 +1068,19 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL dataRow.RowFormat.HeightRule = HeightRule.Exactly; dataRow.RowFormat.AllowBreakAcrossPages = false; + string pipeLineClass = string.Empty; + string isoNo = dr["PipelineCode"].ToString(); + var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoNo(isoNo, this.tvControlItem.SelectedNodeID); + if (isoInfo != null) + { + if (!string.IsNullOrEmpty(isoInfo.PipeLineClass) && isoInfo.PipeLineClass != "/") + { + pipeLineClass = isoInfo.PipeLineClass + "/"; + } + } dataRow.Cells.Add(CreateCell((i + 1).ToString(), doc, 22.68, "", ""));//序号 dataRow.Cells.Add(CreateCell(dr["PipelineCode"].ToString(), doc, 65.49, "", ""));//单线号 - dataRow.Cells.Add(CreateCell(dr["PipelineLevel"].ToString(), doc, 37.14, "", ""));//管道级别 + dataRow.Cells.Add(CreateCell(pipeLineClass + dr["PipelineLevel"].ToString(), doc, 37.14, "", ""));//管道级别 dataRow.Cells.Add(CreateCell(dr["DesignPressure"].ToString(), doc, 27.78, "", ""));//设计压力 dataRow.Cells.Add(CreateCell(dr["DesignTemperature"].ToString(), doc, 28.06, "", ""));//设计温度 dataRow.Cells.Add(CreateCell(dr["OperatingTemperature"].ToString(), doc, 28, "", ""));//操作温度