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 c154c1d..7336a2f 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/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx index 66b1fc8..f16fbe0 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx @@ -111,10 +111,14 @@ - + - - + + <%----%> + + + + 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 @@ - +