From a5660eda30ab9d6f9118a1306a9471f3cfe1fde4 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 24 Sep 2026 20:23:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?20260924=20=E7=84=8A=E6=9D=A1=E7=83=98?= =?UTF-8?q?=E7=83=A4=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FineUIPro.Web/FineUIPro.Web.csproj.user | 4 +-- .../FineUIPro.Web/JGZL/WeldingRodBaking.aspx | 8 +++--- .../JGZL/WeldingRodBaking.aspx.cs | 27 ++++++++++++++++--- .../JGZL/WeldingRodBaking.aspx.designer.cs | 9 +++++++ HJGL_DS/FineUIPro.Web/Web.config | 2 +- HJGL_DS/WebAPI/WebAPI.csproj.user | 4 +-- 6 files changed, 43 insertions(+), 11 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index abef49a..e3436b8 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,8 +1,8 @@ - + true - Debug|Any CPU + Release|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx index 249d99a..3ce2c20 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx @@ -19,17 +19,19 @@ + OnSort="Grid1_Sort" EnableTextSelection="True" AllowPaging="true" IsDatabasePaging="true" PageSize="50" + OnPageIndexChange="Grid1_PageIndexChange" > - - + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs index e637fc6..c09409b 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.cs @@ -33,7 +33,10 @@ namespace FineUIPro.Web.JGZL this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1"); this.drpProjectId.DataBind(); Funs.FineUIPleaseSelect(this.drpProjectId); - this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + + BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, null, true); + BindGrid(); } } @@ -86,13 +89,18 @@ namespace FineUIPro.Web.JGZL strSql += " AND BakeRecords.BakeDate <= @endDate"; listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim())); } + if (this.drpUnitStore.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitStore.SelectedValue)) + { + strSql += " AND BakeRecords.UnitStoreId =@unitStoreId "; + listStr.Add(new SqlParameter("@unitStoreId", this.drpUnitStore.SelectedValue)); + } strSql += " order by BakeRecords.BakeDate desc"; SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); Grid1.RecordCount = tb.Rows.Count; - //var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = tb; + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; Grid1.DataBind(); } #endregion @@ -111,6 +119,19 @@ namespace FineUIPro.Web.JGZL } #endregion + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + Grid1.PageIndex = e.NewPageIndex; + BindGrid(); + } + #endregion + #region 提交 /// /// 确定按钮 diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs index 5e94cdf..f07a1d4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldingRodBaking.aspx.designer.cs @@ -104,6 +104,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.DatePicker txtEndDate; + /// + /// drpUnitStore 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitStore; + /// /// txtBrand 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 070a5f8..3c98f31 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index a48b337..8cd7f1f 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - + - Debug|Any CPU + Release|Any CPU FolderProfile true From 466941bdaa411677a605b5cdeed28721cbcf997f Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 8 Oct 2026 14:11:45 +0800 Subject: [PATCH 2/3] 20261008 --- .../JGZL/压力管道安装质量证明2020.frx | 4 ++-- .../压力管道安装质量证明2020导出模板.docx | Bin 16155 -> 16243 bytes ...ustrialPipelineQualityCertificate2020.aspx | 21 +++++++++++------- ...rialPipelineQualityCertificate2020.aspx.cs | 2 +- ...ineQualityCertificate2020.aspx.designer.cs | 18 +++++++++++++++ 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明2020.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明2020.frx index 24f4ea7..882f1f5 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明2020.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明2020.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/压力管道安装质量证明2020导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/压力管道安装质量证明2020导出模板.docx index 033bf1cff8cfa69fe4797d2b0e270e0953eb81ee..0a27fe1893dce20cbd8487b75e85307b739d1a96 100644 GIT binary patch delta 7084 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 Js?eP9P8d{C9 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 diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx index c1a4aa6..32310ba 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx @@ -103,14 +103,19 @@ - - - - - - - - + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs index ac22b8b..1692ef2 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs @@ -288,7 +288,7 @@ namespace FineUIPro.Web.JGZL newRow["InstallationInspection"] = report.InstallationInspection; newRow["ConstructionUnit"] = report.ConstructionUnit; newRow["SpecialEquipmentProductionLicenseCode"] = report.SpecialEquipmentProductionLicenseCode; - newRow["Remark"] = " 本工业管道的安装经质量检验，符合" + report.Remark + "要求。"; + newRow["Remark"] = " 本压力管道的安装经质量检验，符合《工业管道安装技术规程》（TSG 31-2025）、设计文件和" + report.Remark + "要求。"; dt.Rows.Add(newRow); BLL.Common.FastReportService.AddFastreportTable(dt); diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.designer.cs index 412e3a1..6f4fb5d 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.designer.cs @@ -275,6 +275,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.TextBox txtConstructionUnit; + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + /// /// lblRemark 控件。 /// @@ -284,6 +293,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Label lblRemark; + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + /// /// drpRemark 控件。 /// From 7c81259fbb47d1db0a3d2f00408c10c341b0678b Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 9 Oct 2026 16:48:18 +0800 Subject: [PATCH 3/3] 20261009 --- .../Fastreport/JGZL/压力管道安装汇总表.frx | 154 +++++++++--------- .../JGZL/压力管道安装汇总表2020.frx | 152 ++++++++--------- .../压力管道安装质量证明2020导出模板.docx | Bin 16243 -> 16200 bytes .../File/Word/JGZL/封面导出模板.docx | Bin 21723 -> 21760 bytes .../JGZL/工业管道安装质量证明书导出模板.docx | Bin 16456 -> 16727 bytes HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx | 2 +- ...ipelineInstallationQualityCertificate.aspx | 16 +- ...lineInstallationQualityCertificate.aspx.cs | 17 +- ...llationQualityCertificate.aspx.designer.cs | 18 ++ ...ustrialPipelineInstallationSummary.aspx.cs | 55 ++++--- ...ialPipelineInstallationSummary2020.aspx.cs | 48 ++++-- ...rialPipelineQualityCertificate2020.aspx.cs | 10 +- 12 files changed, 272 insertions(+), 200 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx index a4c9844..48ffa5d 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 } - + @@ -79,8 +79,8 @@ namespace FastReport - - + + @@ -106,11 +106,11 @@ namespace FastReport - + - + @@ -119,10 +119,10 @@ namespace FastReport - + - + @@ -131,54 +131,54 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -208,29 +208,29 @@ 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 f013eab..e33a4c6 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; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -80,7 +80,7 @@ namespace FastReport - + @@ -106,11 +106,11 @@ namespace FastReport - + - + @@ -118,10 +118,10 @@ namespace FastReport - + - + @@ -131,54 +131,54 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -208,29 +208,29 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/压力管道安装质量证明2020导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/压力管道安装质量证明2020导出模板.docx index 0a27fe1893dce20cbd8487b75e85307b739d1a96..a26b3c8c9b298dd8bb51cb610a4b2c0f19c26439 100644 GIT binary patch delta 7669 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 E0w`u!A^-pY delta 7700 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 T?=Xl(6hSY|h_)jBkN5uo?W1md diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/封面导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/封面导出模板.docx index 694afff932c578d468e08162521bdde32dbda4e6..1a7d26044dddac9e01a8dd82bc43a8872fc07639 100644 GIT binary patch delta 10313 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 TZyYcx45gB!K?)W7kN1B7a(FF8 delta 7244 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 - + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx index 2a90b91..fcc1ef3 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx @@ -111,13 +111,19 @@ - + - + + <%----%> - - - + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs index 821eb08..7812327 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs @@ -386,7 +386,7 @@ namespace FineUIPro.Web.JGZL newRow["InstallationInspection"] = report.InstallationInspection; newRow["ConstructionUnit"] = report.ConstructionUnit; newRow["SpecialEquipmentProductionLicenseCode"] = report.SpecialEquipmentProductionLicenseCode; - newRow["Remark"] = " 本工业管道的安装经质量检验，符合" + report.Remark + "要求。"; + newRow["Remark"] = " 本压力管道的安装经质量检验，符合《工业管道安装技术规程》（TSG 31-2025）、设计文件和" + report.Remark + "要求。"; dt.Rows.Add(newRow); BLL.Common.FastReportService.AddFastreportTable(dt); @@ -710,17 +710,26 @@ namespace FineUIPro.Web.JGZL Bookmark pipelineLevel = doc.Range.Bookmarks["PipelineLevel"]; if (pipelineLevel != null) { - pipelineLevel.Text = report.PipelineLevel; + if (report.PipelineLevel != null) + { + pipelineLevel.Text = report.PipelineLevel; + } } Bookmark pipelineLength = doc.Range.Bookmarks["PipelineLength"]; if (pipelineLength != null) { - pipelineLength.Text = report.PipelineLength; + if (report.PipelineLength != null) + { + pipelineLength.Text = report.PipelineLength; + } } Bookmark designUnit = doc.Range.Bookmarks["DesignUnit"]; if (designUnit != null) { - designUnit.Text = report.DesignUnit; + if (report.DesignUnit != null) + { + designUnit.Text = report.DesignUnit; + } } Bookmark losslessTestingAgency = doc.Range.Bookmarks["LosslessTestingAgency"]; if (losslessTestingAgency != null) diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs index ee9bdbc..c19316b 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs @@ -239,6 +239,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.TextBox txtConstructionUnit; + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + /// /// lblRemark 控件。 /// @@ -248,6 +257,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Label lblRemark; + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + /// /// drpRemark 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs index 941e2f3..d5e1142 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs @@ -146,7 +146,7 @@ namespace FineUIPro.Web.JGZL var jointInfo = (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == item.ISO_ID select x).FirstOrDefault(); if (jointInfo != null) { - newSummary.Specifications = jointInfo.JOT_JointDesc; + newSummary.Specifications = HttpUtility.HtmlDecode(jointInfo.JOT_JointDesc); } newSummary.Length = item.PipeLineLength.HasValue ? item.PipeLineLength.Value.ToString("#.00") : ""; newSummary.WeldsNum = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(item.ISO_ID).ToString(); @@ -401,7 +401,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL newRow["OperatingTemperature"] = row["OperatingTemperature"].ToString(); newRow["Medium"] = row["Medium"].ToString(); newRow["Material"] = row["Material"].ToString(); - newRow["Specifications"] = row["Specifications"].ToString(); + newRow["Specifications"] = HttpUtility.HtmlDecode(row["Specifications"].ToString()); newRow["Length"] = row["Length"].ToString(); newRow["LayingMethod"] = row["LayingMethod"].ToString(); newRow["WeldsNum"] = row["WeldsNum"].ToString(); @@ -621,7 +621,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL DesignTemperature = values.Value("DesignTemperature"), Medium = values.Value("Medium"), Material = values.Value("Material"), - Specifications = values.Value("Specifications"), + Specifications = HttpUtility.HtmlDecode(values.Value("Specifications").Replace('×', 'x')), Length = values.Value("Length"), LayingMethod = values.Value("LayingMethod"), WeldsNum = values.Value("WeldsNum"), @@ -667,7 +667,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL string filePath = string.Empty; //每页显示的固定数据行数 - int rowsPerPage = 4; + int rowsPerPage = 5; string projectId = this.tvControlItem.SelectedNodeID; if (!string.IsNullOrEmpty(projectId)) @@ -739,7 +739,9 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL for (int i = 0; i < tb.Rows.Count; i++) { //创建行 - Aspose.Words.Tables.Row row = new Aspose.Words.Tables.Row(doc); + Aspose.Words.Tables.Row row = new Aspose.Words.Tables.Row(doc); + //row.RowFormat.Height = 50; + //row.RowFormat.HeightRule = HeightRule.Exactly; row.Cells.Add(CreateCell(tb.Rows[i]["PipelineCode"].ToString(), doc, 32.3, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["PipelineLevel"].ToString(), doc, 33.7, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["PipelineStartPoint"].ToString(), doc, 31.75, "", "")); @@ -748,7 +750,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL row.Cells.Add(CreateCell(tb.Rows[i]["DesignTemperature"].ToString(), doc, 36, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["Medium"].ToString(), doc, 30.6, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["Material"].ToString(), doc, 31.47, "", "")); - row.Cells.Add(CreateCell(tb.Rows[i]["Specifications"].ToString(), doc, 32.3, "", "")); + row.Cells.Add(CreateCell(HttpUtility.HtmlDecode(tb.Rows[i]["Specifications"].ToString()), doc, 32.3, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["Length"].ToString(), doc, 30, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["LayingMethod"].ToString(), doc, 31.49, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["WeldsNum"].ToString(), doc, 30, "", "")); @@ -760,7 +762,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL row.Cells.Add(CreateCell(tb.Rows[i]["LeakageTestPressure"].ToString(), doc, 41.67, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["CleaningMethod"].ToString(), doc, 34.3, "", "")); row.Cells.Add(CreateCell(tb.Rows[i]["CorrosionControlMethod"].ToString(), doc, 31.2, "", "")); - row.Cells.Add(CreateCell(tb.Rows[i]["InsulationMethod"].ToString(), doc, 43.9, "", "")); + row.Cells.Add(CreateCell(tb.Rows[i]["InsulationMethod"].ToString(), doc, 43.9, "", "")); table.Rows.Insert(i + 3, row); } @@ -775,6 +777,8 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL for (int i = 0; i < needBlankRows - 1; i++) { Aspose.Words.Tables.Row blankRow = new Aspose.Words.Tables.Row(doc); + blankRow.RowFormat.Height = 50; + blankRow.RowFormat.HeightRule = HeightRule.Exactly; // 空白行的单元格宽度和数据行保持一致 blankRow.Cells.Add(CreateCell("", doc, 32.3, "", "")); blankRow.Cells.Add(CreateCell("", doc, 33.7, "", "")); @@ -839,6 +843,17 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL { Cell cell = new Cell(doc); Paragraph p = new Paragraph(doc); + + if (!string.IsNullOrEmpty(CenterPage)) + { + //序号，在最开始就拼接空格 + value = " " + value; + } + + Run run = new Run(doc, value); + run.Font.Size = 8; + run.Font.Name = "楷体"; + if (!string.IsNullOrEmpty(cellMerge)) { if (cellMerge == "0") @@ -847,19 +862,14 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL } else { - cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.Previous;//竖直方向合并的第一个单元格 + cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.Previous;//竖直方向合并的后续单元格 } - } else { cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; } - if (!string.IsNullOrEmpty(CenterPage)) - { - //序号 - value = " " + value; - } + if (!string.IsNullOrEmpty(cellUnitLeft)) { p.ParagraphFormat.Alignment = ParagraphAlignment.Left;//表格中字体居左 @@ -869,19 +879,26 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL p.ParagraphFormat.Alignment = ParagraphAlignment.Center;//表格中字体居中 } - - p.AppendChild(new Run(doc, value)); + // 把带字体样式的run加入段落 + p.AppendChild(run); cell.CellFormat.Width = cellWidth; - cell.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center; - cell.CellFormat.Borders.LineWidth = 0.75; + // 单元格内边距 + cell.CellFormat.LeftPadding = 1; + cell.CellFormat.RightPadding = 1; + cell.CellFormat.TopPadding = 1; + cell.CellFormat.BottomPadding = 1; + + //清除段落段前段后间距 + p.ParagraphFormat.SpaceBefore = 0; + p.ParagraphFormat.SpaceAfter = 0; + cell.AppendChild(p); return cell; } - #endregion } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs index 6421a5f..da74b0b 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs @@ -147,7 +147,7 @@ namespace FineUIPro.Web.JGZL var jointInfo = (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == item.ISO_ID select x).FirstOrDefault(); if (jointInfo != null) { - newSummary.Specifications = jointInfo.JOT_JointDesc; + newSummary.Specifications = HttpUtility.HtmlDecode(jointInfo.JOT_JointDesc); } newSummary.Length = item.PipeLineLength.HasValue ? item.PipeLineLength.Value.ToString("#.00") : ""; newSummary.WeldsNum = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(item.ISO_ID).ToString(); @@ -401,7 +401,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL newRow["OperatingTemperature"] = row["OperatingTemperature"].ToString(); newRow["Medium"] = row["Medium"].ToString(); newRow["Material"] = row["Material"].ToString(); - newRow["Specifications"] = row["Specifications"].ToString(); + newRow["Specifications"] = HttpUtility.HtmlDecode(row["Specifications"].ToString()); newRow["Length"] = row["Length"].ToString(); newRow["LayingMethod"] = row["LayingMethod"].ToString(); newRow["WeldsNum"] = row["WeldsNum"].ToString(); @@ -622,7 +622,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL OperatingTemperature = values.Value("OperatingTemperature"), Medium = values.Value("Medium"), Material = values.Value("Material"), - Specifications = values.Value("Specifications"), + Specifications = HttpUtility.HtmlDecode(values.Value("Specifications").Replace('×', 'x')), Length = values.Value("Length"), LayingMethod = values.Value("LayingMethod"), WeldsNum = values.Value("WeldsNum"), @@ -670,7 +670,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL string filePath = string.Empty; //每页显示的固定数据行数 - int rowsPerPage = 4; + int rowsPerPage = 8; string projectId = this.tvControlItem.SelectedNodeID; if (!string.IsNullOrEmpty(projectId)) @@ -756,7 +756,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL row.Cells.Add(CreateCell(tb.Rows[i]["OperatingTemperature"].ToString(), doc, 28, "", ""));//操作温度 row.Cells.Add(CreateCell(tb.Rows[i]["Medium"].ToString(), doc, 34.87, "", ""));//输送介质 row.Cells.Add(CreateCell(tb.Rows[i]["Material"].ToString(), doc, 43.66, "", ""));//管道材质牌号及标准 - row.Cells.Add(CreateCell(tb.Rows[i]["Specifications"].ToString(), doc, 59.82, "", ""));//管道规格（外径×壁厚mm） + row.Cells.Add(CreateCell(HttpUtility.HtmlDecode(tb.Rows[i]["Specifications"].ToString()), doc, 59.82, "", ""));//管道规格（外径×壁厚mm） row.Cells.Add(CreateCell(tb.Rows[i]["Length"].ToString(), doc, 34.58, "", ""));//管道长度(m) row.Cells.Add(CreateCell(tb.Rows[i]["LayingMethod"].ToString(), doc, 33.74, "", ""));//铺设方式 row.Cells.Add(CreateCell(tb.Rows[i]["WeldsNum"].ToString(), doc, 27, "", ""));//焊口数量 @@ -784,6 +784,8 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL for (int i = 0; i < needBlankRows - 1; i++) { Aspose.Words.Tables.Row blankRow = new Aspose.Words.Tables.Row(doc); + blankRow.RowFormat.Height = 33; + blankRow.RowFormat.HeightRule = HeightRule.Exactly; // 空白行的单元格宽度和数据行保持一致 blankRow.Cells.Add(CreateCell("", doc, 22.68, "", "")); blankRow.Cells.Add(CreateCell("", doc, 65.49, "", "")); @@ -844,6 +846,17 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL { Cell cell = new Cell(doc); Paragraph p = new Paragraph(doc); + + if (!string.IsNullOrEmpty(CenterPage)) + { + //序号，在最开始就拼接空格 + value = " " + value; + } + + Run run = new Run(doc, value); + run.Font.Size = 8; + run.Font.Name = "楷体"; + if (!string.IsNullOrEmpty(cellMerge)) { if (cellMerge == "0") @@ -852,19 +865,14 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL } else { - cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.Previous;//竖直方向合并的第一个单元格 + cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.Previous;//竖直方向合并的后续单元格 } - } else { cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; } - if (!string.IsNullOrEmpty(CenterPage)) - { - //序号 - value = " " + value; - } + if (!string.IsNullOrEmpty(cellUnitLeft)) { p.ParagraphFormat.Alignment = ParagraphAlignment.Left;//表格中字体居左 @@ -874,15 +882,23 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL p.ParagraphFormat.Alignment = ParagraphAlignment.Center;//表格中字体居中 } - - p.AppendChild(new Run(doc, value)); + // 把带字体样式的run加入段落 + p.AppendChild(run); cell.CellFormat.Width = cellWidth; - cell.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center; - cell.CellFormat.Borders.LineWidth = 0.75; + // 单元格内边距 + cell.CellFormat.LeftPadding = 1; + cell.CellFormat.RightPadding = 1; + cell.CellFormat.TopPadding = 1; + cell.CellFormat.BottomPadding = 1; + + //清除段落段前段后间距 + p.ParagraphFormat.SpaceBefore = 0; + p.ParagraphFormat.SpaceAfter = 0; + cell.AppendChild(p); return cell; } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs index 1692ef2..28c8f98 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs @@ -450,12 +450,18 @@ namespace FineUIPro.Web.JGZL Bookmark pipelineLevel = doc.Range.Bookmarks["PipelineLevel"]; if (pipelineLevel != null) { - pipelineLevel.Text = report.PipelineLevel; + if (report.PipelineLevel != null) + { + pipelineLevel.Text = report.PipelineLevel; + } } Bookmark pipelineLength = doc.Range.Bookmarks["PipelineLength"]; if (pipelineLength != null) { - pipelineLength.Text = report.PipelineLength; + if (report.PipelineLength != null) + { + pipelineLength.Text = report.PipelineLength; + } } Bookmark designUnit = doc.Range.Bookmarks["DesignUnit"]; if (designUnit != null)