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/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 033bf1c..a26b3c8 100644 Binary files a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/压力管道安装质量证明2020导出模板.docx and b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/压力管道安装质量证明2020导出模板.docx differ diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/封面导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/封面导出模板.docx index 694afff..1a7d260 100644 Binary files a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/封面导出模板.docx and b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/封面导出模板.docx differ diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装质量证明书导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装质量证明书导出模板.docx index 7336a2f..0882284 100644 Binary files a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装质量证明书导出模板.docx and b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装质量证明书导出模板.docx differ diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 80f7761..e3436b8 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,4 +1,4 @@ - + true diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx index b41d40a..6521cf7 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx @@ -53,7 +53,7 @@ - + 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 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..28c8f98 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); @@ -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) 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 控件。 /// 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 28be9c4..8cd7f1f 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,4 +1,4 @@ - + Release|Any CPU