From d55a834b266d82ca09c964eaa6e3de853e849504 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 3 Sep 2026 15:30:47 +0800 Subject: [PATCH] =?UTF-8?q?20260903=20=E4=BA=A4=E5=B7=A5=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Fastreport/JGZL/压力管道安装汇总表.frx | 4 +- .../Fastreport/JGZL/压力管道安装质量证明.frx | 37 ++++++++---------- .../JGZL/工业管道安装质量证明书导出模板.docx | Bin 16550 -> 16456 bytes ...ipelineInstallationQualityCertificate.aspx | 10 +++-- ...lineInstallationQualityCertificate.aspx.cs | 18 ++++----- ...llationQualityCertificate.aspx.designer.cs | 4 +- ...IndustrialPipelineInstallationSummary.aspx | 3 +- ...ustrialPipelineInstallationSummary.aspx.cs | 24 +++++++++--- HJGL_DS/FineUIPro.Web/Web.config | 4 +- 9 files changed, 59 insertions(+), 45 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx index b7d8a57..4d34b0a 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/压力管道安装质量证明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx index 2e7f3ec..f238465 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx @@ -1,7 +1,7 @@  - + - + @@ -25,14 +25,14 @@ - - - - - + + + + + - - + + @@ -95,19 +95,14 @@ - - - - - - - - - - + + + + + - + @@ -145,7 +140,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装质量证明书导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/工业管道安装质量证明书导出模板.docx index c154c1d6182e58771024d88b48e88868957d504b..7336a2f2827100bdad335623435c0ed146b826ab 100644 GIT binary patch delta 5710 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 U`TqBPMMi5)jU?mxHx16LJ|Pyhe` delta 5886 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 KeM$Q7>VE - + - - + + <%----%> + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs index 3ab1e81..e2dabcd 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs @@ -84,7 +84,7 @@ namespace FineUIPro.Web.JGZL txtInstallationInspection.Text = string.Empty; txtConstructionUnit.Text = string.Empty; txtSpecialEquipmentProductionLicenseCode.Text = string.Empty; - txtRemark.Text = string.Empty; + drpRemark.SelectedValue = string.Empty; } private void PageData() @@ -149,12 +149,12 @@ namespace FineUIPro.Web.JGZL } if (!string.IsNullOrEmpty(report.Remark)) { - this.txtRemark.Text = report.Remark; - } - else - { - this.txtRemark.Text = "GB50517-2023"; + this.drpRemark.SelectedValue = report.Remark; } + //else + //{ + // this.txtRemark.Text = "GB50517-2023"; + //} } else { @@ -162,7 +162,7 @@ namespace FineUIPro.Web.JGZL this.txtInstallationInspection.Text = "浙江省特种设备研究院"; this.txtConstructionUnit.Text = "浙江石油化工有限公司"; this.txtSpecialEquipmentProductionLicenseCode.Text = "TS3833339-2028"; - this.txtRemark.Text = "GB50517-2023"; + //this.txtRemark.Text = "GB50517-2023"; this.txtPipelineLength.Text = BLL.HJGL_PW_IsoInfoService.GetPipeLineLengthList(this.tvControlItem.SelectedNodeID).Value.ToString(".##"); } } @@ -376,7 +376,7 @@ namespace FineUIPro.Web.JGZL newRow["InstallationInspection"] = report.InstallationInspection; newRow["ConstructionUnit"] = report.ConstructionUnit; newRow["SpecialEquipmentProductionLicenseCode"] = report.SpecialEquipmentProductionLicenseCode; - newRow["Remark"] = report.Remark; + newRow["Remark"] = " 本工业管道的安装经质量检验，符合" + report.Remark + "要求。"; dt.Rows.Add(newRow); BLL.Common.FastReportService.AddFastreportTable(dt); @@ -591,7 +591,7 @@ namespace FineUIPro.Web.JGZL newReport.LosslessTestingAgency = this.txtLosslessTestingAgency.Text.Trim(); //newReport.SupervisoryAndInspectionAgency = this.txtSupervisoryAndInspectionAgency.Text.Trim(); newReport.ConstructionUnit = this.txtConstructionUnit.Text.Trim(); - newReport.Remark = this.txtRemark.Text.Trim(); + newReport.Remark = drpRemark.SelectedValue; //this.txtRemark.Text.Trim(); //newReport.DesignLicenseCode = this.txtDesignLicenseCode.Text.Trim(); //newReport.QualificationCertificateCode = this.txtQualificationCertificateCode.Text.Trim(); //newReport.InstitutionalApprovalCertificate = this.txtInstitutionalApprovalCertificate.Text.Trim(); diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs index c78aa7e..ee9bdbc 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.designer.cs @@ -249,13 +249,13 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.Label lblRemark; /// - /// txtRemark 控件。 + /// drpRemark 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtRemark; + protected global::FineUIPro.DropDownList drpRemark; /// /// lbld 控件。 diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx index 9de4b66..34df08e 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx @@ -101,7 +101,8 @@ - + + private void BindGrid() { - string strSql = @"SELECT * - FROM JGZL_IndustrialPipelineInstallationSummary + string strSql = @"select SummaryId, CertificateId, ProjectId, PipelineCode, PipelineLevel, PipelineStartPoint, PipelineEndPoint, +CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL(18,6)), 'G29') + ELSE DesignPressure + END AS DesignPressure, + CASE WHEN ISNUMERIC(DesignTemperature)=1 THEN FORMAT(CAST(DesignTemperature AS DECIMAL(18,6)), 'G29') + ELSE DesignTemperature + END AS DesignTemperature, + Medium, Material, Specifications, + CASE WHEN ISNUMERIC(Length)=1 THEN FORMAT(CAST(Length AS DECIMAL(18,6)), 'G29') + ELSE Length + END AS Length, + LayingMethod, WeldsNum, LosslessRatio, + VoltageResistantTestMethod, VoltageResistantTestMedium, VoltageResistantTestPressure, + LeakageTestMedium, LeakageTestPressure, CleaningMethod, CorrosionControlMethod, InsulationMethod, + Remark, CompileMan, CompileDate, Reviewer, RevieweDate, OperatingTemperature, VoltageResistantTestDate, + LeakageTestDate from JGZL_IndustrialPipelineInstallationSummary WHERE 1=1 "; List listStr = new List(); if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 1b40665..3c98f31 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + @@ -67,7 +67,7 @@ - +