gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20261013

Browse Source
This commit is contained in:
毕文静
2026-10-13 16:29:00 +08:00
parent b2ea7df94d
commit e3f033a8cc
5 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="10/12/2026 16:09:37" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="10/13/2026 16:09:56" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
} }
</ScriptText> </ScriptText>
<Dictionary> <Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF/J7hkNTyMxeqnl8XIPwd9A=="> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFGAuPUX4+1p6Hpm3DKm9KJQ==">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data"> <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
<Column Name="Num" DataType="System.String" PropName="attach_image_id"/> <Column Name="Num" DataType="System.String" PropName="attach_image_id"/>
<Column Name="PipelineCode" DataType="System.String" PropName="image_series"/> <Column Name="PipelineCode" DataType="System.String" PropName="image_series"/>
HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表2020.frx
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="10/13/2026 14:40:54" ReportInfo.CreatorVersion="2017.1.16.0"> <Report ScriptLanguage="CSharp" DoublePass="true" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="10/13/2026 16:15:01" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System; <ScriptText>using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
@@ -41,7 +41,7 @@ namespace FastReport
} }
</ScriptText> </ScriptText>
<Dictionary> <Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFseSRJtXaQbOUCyymXaQv1w=="> <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFjoj0apwefOc2l/sd78fdnQ==">
<TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data"> <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
<Column Name="Num" DataType="System.String" PropName="attach_image_id"/> <Column Name="Num" DataType="System.String" PropName="attach_image_id"/>
<Column Name="PipelineCode" DataType="System.String" PropName="image_series"/> <Column Name="PipelineCode" DataType="System.String" PropName="image_series"/>
HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装汇总表（安装）.docx
BIN
View File
Binary file not shown.
HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs
+25 -3
View File
@@ -1,6 +1,7 @@
using Aspose.Words; using Aspose.Words;
using Aspose.Words.Tables; using Aspose.Words.Tables;
using BLL; using BLL;
using FineUIPro.Web.common.BaseInfo;
using Model; using Model;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
@@ -392,10 +393,20 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
int i = 0; int i = 0;
foreach (var row in rows) 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(); var newRow = dt.NewRow();
newRow["Num"] = (i + 1).ToString(); newRow["Num"] = (i + 1).ToString();
newRow["PipelineCode"] = row["PipelineCode"].ToString(); newRow["PipelineCode"] = isoNo;
newRow["PipelineLevel"] = row["PipelineLevel"].ToString(); newRow["PipelineLevel"] = pipeLineClass + row["PipelineLevel"].ToString();
newRow["DesignPressure"] = row["DesignPressure"].ToString(); newRow["DesignPressure"] = row["DesignPressure"].ToString();
newRow["DesignTemperature"] = row["DesignTemperature"].ToString(); newRow["DesignTemperature"] = row["DesignTemperature"].ToString();
newRow["OperatingTemperature"] = row["OperatingTemperature"].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 ""; if (obj == DBNull.Value) return "";
return obj.ToString().Replace("\r", "").Replace("\n", "").Trim(); 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 pipeCode = GetCellValue(dr["PipelineCode"]);
string pipeLevel = GetCellValue(dr["PipelineLevel"]); string pipeLevel = GetCellValue(pipeLineClass + dr["PipelineLevel"]);
string startPoint = GetCellValue(dr["PipelineStartPoint"]); string startPoint = GetCellValue(dr["PipelineStartPoint"]);
string endPoint = GetCellValue(dr["PipelineEndPoint"]); string endPoint = GetCellValue(dr["PipelineEndPoint"]);
string desPressure = TrimEndZero(dr["DesignPressure"]); string desPressure = TrimEndZero(dr["DesignPressure"]);
HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs
+23 -3
View File
@@ -396,10 +396,20 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
int i = 0; int i = 0;
foreach (var row in rows) 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(); var newRow = dt.NewRow();
newRow["Num"] = (i + 1).ToString(); newRow["Num"] = (i + 1).ToString();
newRow["PipelineCode"] = row["PipelineCode"].ToString(); newRow["PipelineCode"] = isoNo;
newRow["PipelineLevel"] = row["PipelineLevel"].ToString(); newRow["PipelineLevel"] = pipeLineClass + row["PipelineLevel"].ToString();
newRow["DesignPressure"] = row["DesignPressure"].ToString(); newRow["DesignPressure"] = row["DesignPressure"].ToString();
newRow["DesignTemperature"] = row["DesignTemperature"].ToString(); newRow["DesignTemperature"] = row["DesignTemperature"].ToString();
newRow["OperatingTemperature"] = row["OperatingTemperature"].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.HeightRule = HeightRule.Exactly;
dataRow.RowFormat.AllowBreakAcrossPages = false; 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((i + 1).ToString(), doc, 22.68, "", ""));//序号
dataRow.Cells.Add(CreateCell(dr["PipelineCode"].ToString(), doc, 65.49, "", ""));//单线号 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["DesignPressure"].ToString(), doc, 27.78, "", ""));//设计压力
dataRow.Cells.Add(CreateCell(dr["DesignTemperature"].ToString(), doc, 28.06, "", ""));//设计温度 dataRow.Cells.Add(CreateCell(dr["DesignTemperature"].ToString(), doc, 28.06, "", ""));//设计温度
dataRow.Cells.Add(CreateCell(dr["OperatingTemperature"].ToString(), doc, 28, "", ""));//操作温度 dataRow.Cells.Add(CreateCell(dr["OperatingTemperature"].ToString(), doc, 28, "", ""));//操作温度