From 91c9a697ea7c254e9d904520c496e10cc76ba68d Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 8 Sep 2026 11:38:00 +0800
Subject: [PATCH] =?UTF-8?q?20260908=20=E5=B7=A5=E4=B8=9A=E7=AE=A1=E9=81=93?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Fastreport/JGZL/压力管道安装质量证明.frx  | 28 +++++++++----------
 .../File/Fastreport/JGZL/工程交工验收证书.frx |  6 ++--
 .../FineUIPro.Web/FineUIPro.Web.csproj.user   |  2 +-
 ...ustrialPipelineInstallationSummary.aspx.cs | 11 +++++---
 HJGL_DS/WebAPI/WebAPI.csproj.user             |  2 +-
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx
index f238465..467c6d2 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/23/2026 17:12:17" ReportInfo.Modified="09/03/2026 15:08:28" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/23/2026 17:12:17" ReportInfo.Modified="09/04/2026 14:36:41" ReportInfo.CreatorVersion="2017.1.16.0">
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF9Yu2tPE4XnZAHvGq5Vj6Kw==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFlxMSY6UNhBg4HnW9rPVVrg==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="CertificateCode" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="EngineeringName" DataType="System.String" PropName="image_series"/>
@@ -25,13 +25,13 @@
       </TableDataSource>
     </MsSqlDataConnection>
   </Dictionary>
-  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="368.55,642.6,170.1,463.05,330.75,0,646.4,112.27,356.84,469.11,102.82,74.47,543.58,47.25,292.95,387.45,434.7,244.57">
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="368.55,642.6,170.1,463.05,330.75,0,646.4,112.27,356.84,469.11,102.82,74.47,244.57,37.8,283.5,292.95,387.45,434.7,543.58">
     <PageHeaderBand Name="PageHeader1" Width="646.38" Height="113.4" Guides="18.9,47.25,75.6,85.05,113.4">
       <TextObject Name="Text1" Left="368.55" Top="18.9" Width="274.05" Height="28.35" Text="ZDS-T6.38.047.A/1.2025" HorzAlign="Right" VertAlign="Center" Font="宋体, 15pt"/>
       <TextObject Name="Text2" Left="170.1" Top="47.25" Width="292.95" Height="28.35" Text="工业管道安装质量证明书" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
       <TextObject Name="Text4" Left="330.75" Top="85.05" Width="311.85" Height="28.35" Text=" 编号：[Data.CertificateCode]" VertAlign="Center" Font="宋体, 12pt"/>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="117.4" Width="646.38" Height="896.55" Guides="0,896.55,62.36,115.27,52.91,158.73,43.46,202.19,245.65,289.11,332.57,376.03,476.19,546.95,28.35,47.25,609.31,671.67,752.93,81.26,796.39,100.16">
+    <DataBand Name="Data1" Top="117.4" Width="646.38" Height="896.55" Guides="0,896.55,62.36,115.27,52.91,158.73,43.46,202.19,245.65,289.11,332.57,376.03,476.19,100.16,546.95,28.35,47.25,609.31,671.67,752.93,81.26,796.39">
       <TableObject Name="Table1" Width="646.4" Height="896.55">
         <TableColumn Name="Column1" Width="112.27"/>
         <TableColumn Name="Column2" Width="244.57"/>
@@ -95,15 +95,15 @@
           <TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row10" Height="100.16">
-          <TableCell Name="Cell46" Border.Lines="Left, Right" Text="[Data.Remark]" Padding="10, 10, 10, 10" Font="宋体, 12pt" ColSpan="5"/>
-          <TableCell Name="Cell47" Border.Lines="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell48" Border.Lines="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell49" Border.Lines="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell50" Border.Lines="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell46" Border.Lines="Left, Right, Top" Text="[Data.Remark]" Padding="35, 10, 10, 10" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell47" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell48" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell49" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell50" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row11" Height="70.76">
           <TableCell Name="Cell51" Border.Lines="Left" VertAlign="Center" Font="宋体, 12pt">
-            <TextObject Name="Text8" Left="47.25" Top="28.35" Width="245.7" Height="18.9" Text="附：《工业管道安装汇总表》共" Font="宋体, 12pt"/>
+            <TextObject Name="Text8" Left="37.8" Top="28.35" Width="245.7" Height="18.9" Text="附：《工业管道安装汇总表》共" Font="宋体, 12pt"/>
             <TextObject Name="Text9" Left="292.95" Top="28.35" Width="94.5" Height="18.9" Border.Lines="Bottom" Font="宋体, 12pt"/>
             <TextObject Name="Text10" Left="387.45" Top="28.35" Width="47.25" Height="18.9" Text="页" Font="宋体, 12pt"/>
           </TableCell>
@@ -115,15 +115,15 @@
         <TableRow Name="Row12" Height="62.36">
           <TableCell Name="Cell56" Border.Lines="Left" Text="检验员：" Padding="50, 1, 2, 1" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
           <TableCell Name="Cell57" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell58" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell59" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell58" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell59" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell60" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row13" Height="62.36">
           <TableCell Name="Cell61" Border.Lines="Left" Text="质量保证工程师：" Padding="50, 1, 2, 1" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
           <TableCell Name="Cell62" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell63" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell64" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell63" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell64" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell65" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row14" Height="81.26">
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx
index d75e8f7..e6585ed 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" TextQuality="ClearType" ReportInfo.Created="12/12/2025 11:03:02" ReportInfo.Modified="04/22/2026 16:57:14" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" TextQuality="ClearType" ReportInfo.Created="12/12/2025 11:03:02" ReportInfo.Modified="09/07/2026 17:14:54" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -32,7 +32,7 @@ namespace FastReport
     <Parameter Name="HeaderMan" DataType="System.String"/>
     <Parameter Name="SupervisoryOpinion" DataType="System.String"/>
   </Dictionary>
-  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="0,646.4,160.28,51.79,386.71,99.04,471.76,108.49,127.39,339.46,424.51,405.61,580.25,85.05,174.64,287.67,642.6,161.6,323.2,484.8">
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="0,646.4,160.28,51.79,386.71,99.04,471.76,108.49,127.39,85.05,174.64,287.67,642.6,161.6,323.2,484.8">
     <PageHeaderBand Name="PageHeader1" Width="646.38" Height="830.18" Guides="0,830.18,82.54,22.68,59.86,114.05,31.51,145.56,167.62,22.06,414.08,28.35,66.15,37.8,226.8,246.46,436.14,590.5,154.36,622.01,644.07,798.43,31.75">
       <TableObject Name="Table1" Width="646.4" Height="830.18">
         <TableColumn Name="Column1" Width="108.49"/>
@@ -42,7 +42,7 @@ namespace FastReport
         <TableColumn Name="Column10" Width="85.05"/>
         <TableColumn Name="Column5" Width="174.64"/>
         <TableRow Name="Row1" Height="22.68">
-          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3503—J107B" HorzAlign="Center" VertAlign="Center" Font="黑体, 10.5pt" ColSpan="2" RowSpan="2"/>
+          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3503—J107A" HorzAlign="Center" VertAlign="Center" Font="黑体, 10.5pt" ColSpan="2" RowSpan="2"/>
           <TableCell Name="Cell2" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell3" Border.Lines="All" Text="工程交工验收证书" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold" ColSpan="2" RowSpan="2"/>
           <TableCell Name="Cell4" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs
index 3e34091..7ec5b71 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs
@@ -124,14 +124,17 @@ namespace FineUIPro.Web.JGZL
                             Model.JGZL_IndustrialPipelineInstallationSummary newSummary = new JGZL_IndustrialPipelineInstallationSummary();
                             newSummary.SummaryId = SQLHelper.GetNewID(typeof(Model.JGZL_IndustrialPipelineInstallationSummary));
                             newSummary.ProjectId = this.tvControlItem.SelectedNodeID;
-                            newSummary.CertificateId = this.drpCertificateCode.SelectedValue;
+                            if (!string.IsNullOrEmpty(this.drpCertificateCode.SelectedValue))
+                            {
+                                newSummary.CertificateId = this.drpCertificateCode.SelectedValue;
+                            }
                             newSummary.PipelineCode = item.ISO_IsoNo;
                             if (!string.IsNullOrEmpty(item.ISC_ID))
                             {
                                 newSummary.PipelineLevel = BLL.HJGL_PipingClassService.GetPipingClassByPipingClassId(item.ISC_ID).ISC_IsoName;
                             }
-                            newSummary.DesignPressure = item.ISO_DesignPress.Value.ToString("#.00");
-                            newSummary.DesignTemperature = item.ISO_DesignTemperature.Value.ToString("#.00");
+                            newSummary.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("#.00") : "";
+                            newSummary.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("#.00") : "";
                             if (!string.IsNullOrEmpty(item.SER_ID))
                             {
                                 newSummary.Medium = BLL.HJGL_MediumService.GetServiceBySERID(item.SER_ID).SER_Name;
@@ -145,7 +148,7 @@ namespace FineUIPro.Web.JGZL
                             {
                                 newSummary.Specifications = jointInfo.JOT_JointDesc;
                             }
-                            newSummary.Length = item.PipeLineLength.Value.ToString("#.00");
+                            newSummary.Length = item.PipeLineLength.HasValue ? item.PipeLineLength.Value.ToString("#.00") : "";
                             newSummary.WeldsNum = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(item.ISO_ID).ToString();
                             if (!string.IsNullOrEmpty(item.Joty_B_Rate))
                             {
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 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>