20260910 工业管道安装质量证明（2020版）

DataBase/版本日志/HJGLDB_DS_2026-09-09_bwj.sql

@@ -0,0 +1,7 @@
+
+alter table JGZL_IndustrialPipelineInstallationSummary add FromType char(1)
+go
+
+update JGZL_IndustrialPipelineInstallationSummary set FromType='1'
+go
+

DataBase/版本日志/HJGLDB_DS_2026-09-10_bwj.sql

@@ -0,0 +1,5 @@
+
+update Sys_Menu set MenuName='工业管道安装质量证明书（安装）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='工业管道安装质量证明书（2020版）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='工业管道安装汇总表（安装）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='工业管道安装汇总表（2020版）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'

HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationQualityCertificateService.cs

@@ -117,11 +117,11 @@ namespace BLL
         /// <param name="dropName"></param>
         /// <param name="projectId"></param>
         /// <param name="isShowPlease"></param>
-        public static void InitIndustrialPipelineInstallationQualityCertificateDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        public static void InitIndustrialPipelineInstallationQualityCertificateDownList(FineUIPro.DropDownList dropName, string projectId,string fromType, bool isShowPlease)
         {
             dropName.DataValueField = "CertificateId";
             dropName.DataTextField = "CertificateCode";
-            dropName.DataSource = GetIndustrialPipelineInstallationQualityCertificateList(projectId);
+            dropName.DataSource = GetIndustrialPipelineInstallationQualityCertificateList(projectId,fromType);
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -134,11 +134,11 @@ namespace BLL
         /// </summary>
         /// <param name="projectId">项目Id</param>
         /// <returns></returns>
-        public static List<Model.JGZL_IndustrialPipelineInstallationQualityCertificate> GetIndustrialPipelineInstallationQualityCertificateList(string projectId)
+        public static List<Model.JGZL_IndustrialPipelineInstallationQualityCertificate> GetIndustrialPipelineInstallationQualityCertificateList(string projectId, string fromType)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                var q = (from x in db.JGZL_IndustrialPipelineInstallationQualityCertificate orderby x.CertificateCode descending select x).ToList();
+                var q = (from x in db.JGZL_IndustrialPipelineInstallationQualityCertificate where x.FromType == fromType orderby x.CertificateCode descending select x).ToList();
                 if (!string.IsNullOrWhiteSpace(projectId))
                 {
                     q = q.Where(x => x.ProjectId == projectId).ToList();

HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationSummaryService.cs

@@ -19,9 +19,9 @@ namespace BLL
             return Funs.DB.JGZL_IndustrialPipelineInstallationSummary.FirstOrDefault(e => e.SummaryId == Id);
         }
 
-        public static Model.JGZL_IndustrialPipelineInstallationSummary GetIndustrialPipelineInstallationSummaryByPipelineCode(string pipelineCode)
+        public static Model.JGZL_IndustrialPipelineInstallationSummary GetIndustrialPipelineInstallationSummaryByPipelineCode(string pipelineCode,string fromType)
         {
-            return Funs.DB.JGZL_IndustrialPipelineInstallationSummary.FirstOrDefault(e => e.PipelineCode == pipelineCode);
+            return Funs.DB.JGZL_IndustrialPipelineInstallationSummary.FirstOrDefault(e => e.PipelineCode == pipelineCode && e.FromType == fromType);
         }
 
         public static List<Model.JGZL_IndustrialPipelineInstallationSummary> GetIndustrialPipelineInstallationSummaryByProjectId(string projectId)
@@ -69,6 +69,7 @@ namespace BLL
             newModel.OperatingTemperature = model.OperatingTemperature;
             newModel.VoltageResistantTestDate = model.VoltageResistantTestDate;
             newModel.LeakageTestDate = model.LeakageTestDate;
+            newModel.FromType = model.FromType;
             db.JGZL_IndustrialPipelineInstallationSummary.InsertOnSubmit(newModel);
             db.SubmitChanges();
         }
@@ -117,11 +118,11 @@ namespace BLL
         /// 根据项目Id删除工业管道安装汇总表
         /// </summary>
         /// <param name="Id"></param>
-        public static void DeleteIndustrialPipelineInstallationSummaryByProjectId(string projectId)
+        public static void DeleteIndustrialPipelineInstallationSummaryByProjectId(string projectId,string fromType)
         {
             SGGLDB db = Funs.DB;
-            var q = (from x in db.JGZL_IndustrialPipelineInstallationSummary where x.ProjectId == projectId select x).ToList();
+            var q = (from x in db.JGZL_IndustrialPipelineInstallationSummary where x.ProjectId == projectId && x.FromType==fromType select x).ToList();
-            if (q.Count>0)
+            if (q.Count > 0)
             {
                 db.JGZL_IndustrialPipelineInstallationSummary.DeleteAllOnSubmit(q);
                 db.SubmitChanges();

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="09/03/2026 14:11:13" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="09/09/2026 16:50:18" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFLzarpzxJ5t1Cmolz0+jmoQ==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFPBBtNNSbxRL0XXYTtAoVIA==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="Num" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="PipelineCode" DataType="System.String" PropName="image_series"/>
@@ -66,9 +66,9 @@ namespace FastReport
         <Column Name="CleaningMethod" DataType="System.String" PropName="Column"/>
         <Column Name="CorrosionControlMethod" DataType="System.String" PropName="Column"/>
         <Column Name="InsulationMethod" DataType="System.String" PropName="Column"/>
-        <Column Name="PipelineStartPoint" DataType="System.String" PropName="Column"/>
-        <Column Name="PipelineEndPoint" DataType="System.String" PropName="Column1"/>
         <Column Name="Remark" DataType="System.String" PropName="Column"/>
+        <Column Name="PipelineStartPoint" DataType="System.String"/>
+        <Column Name="PipelineEndPoint" DataType="System.String"/>
       </TableDataSource>
     </MsSqlDataConnection>
     <Parameter Name="CertificateCode" DataType="System.String"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表2020.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="09/08/2026 14:55:26" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="09/10/2026 09:47:10" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFlBt8xBbgCj/ddySgEk+6Gg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFSNC6k3/Jky1tLKNl3mNErg==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="Num" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="PipelineCode" DataType="System.String" PropName="image_series"/>
@@ -75,19 +75,19 @@ namespace FastReport
     <Parameter Name="DeliveryUnit" DataType="System.String"/>
     <Parameter Name="DeliveryUnitCode" DataType="System.String"/>
   </Dictionary>
-  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" RawPaperSize="9" LeftMargin="16" TopMargin="22" RightMargin="13.2" BottomMargin="17" Guides="718.2,1001.7,311.85,670.95,500.85,642.6,973.35,0,999.81,151.2,85.05,9.45,37.8,519.75,207.9,255.15,292.95,349.65,415.8,453.6,481.95,650.16,54.81,47.25,56.7,18.9,113.4,103.95,330.75,387.45,491.4,548.1,602.91,744.66,687.96,697.41,754.11,876.96,801.36,839.16,848.61,895.86,914.76,952.56,66.15,28.35,791.91,829.71,94.5,274.05,368.55,803.25,897.75,538.65,633.15">
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" RawPaperSize="9" LeftMargin="16" TopMargin="22" RightMargin="13.2" BottomMargin="17" Guides="718.2,1001.7,311.85,670.95,500.85,642.6,973.35,0,1009.26,151.2,85.05,9.45,37.8,56.7,66.15,28.35,631.26,54.81,47.25,18.9,113.4,198.45,236.25,274.05,368.55,434.7,472.5,529.2,584.01,735.21,886.41,924.21,962.01,669.06,782.46,820.26,103.95,803.25,897.75,538.65,633.15">
-    <PageHeaderBand Name="PageHeader1" Width="1012.28" Height="236.25" Guides="0,18.9,56.7,85.05,236.25,37.8,151.2,75.6,94.5,170.1">
+    <PageHeaderBand Name="PageHeader1" Width="1012.28" Height="236.25" Guides="0,18.9,56.7,85.05,236.25,37.8,151.2,75.6">
       <TextObject Name="Text1" Left="718.2" Width="283.5" Height="18.9" Text="ZDS-T6.38.047.A/0.2020" HorzAlign="Center" VertAlign="Center" Font="Times New Roman, 15pt"/>
       <TextObject Name="Text2" Left="311.85" Top="18.9" Width="359.1" Height="37.8" Text="二、压力管道安装汇总表" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
       <TextObject Name="Text3" Left="500.85" Top="56.7" Width="141.75" Height="28.35" Text="质量证明书编号：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
       <TextObject Name="Text4" Left="642.6" Top="56.7" Width="330.75" Height="28.35" Text="[CertificateCode]" VertAlign="Center" Font="宋体, 10.5pt"/>
-      <TableObject Name="Table1" Top="85.05" Width="999.81" Height="151.2" Border.Lines="Bottom">
+      <TableObject Name="Table1" Top="85.05" Width="1009.26" Height="151.2" Border.Lines="Bottom">
         <TableColumn Name="Column1" Width="18.9"/>
         <TableColumn Name="Column23" Width="85.05"/>
         <TableColumn Name="Column2" Width="9.45"/>
         <TableColumn Name="Column3" Width="37.8"/>
-        <TableColumn Name="Column4" Width="56.7"/>
+        <TableColumn Name="Column4" Width="47.25"/>
-        <TableColumn Name="Column5" Width="47.25"/>
+        <TableColumn Name="Column5" Width="37.8"/>
         <TableColumn Name="Column70" Width="37.8"/>
         <TableColumn Name="Column7" Width="37.8"/>
         <TableColumn Name="Column8" Width="56.7"/>
@@ -98,10 +98,10 @@ namespace FastReport
         <TableColumn Name="Column13" Width="54.81"/>
         <TableColumn Name="Column14" Width="47.25"/>
         <TableColumn Name="Column15" Width="37.8"/>
-        <TableColumn Name="Column16" Width="56.7"/>
+        <TableColumn Name="Column16"/>
         <TableColumn Name="Column17" Width="47.25"/>
         <TableColumn Name="Column18" Width="37.8"/>
-        <TableColumn Name="Column73" Width="47.25"/>
+        <TableColumn Name="Column73"/>
         <TableColumn Name="Column20" Width="37.8"/>
         <TableColumn Name="Column21" Width="37.8"/>
         <TableColumn Name="Column22" Width="47.25"/>
@@ -110,7 +110,7 @@ namespace FastReport
           <TableCell Name="Cell77" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
           <TableCell Name="Cell2" Border.Lines="Right, Top, Bottom" VertAlign="Center"/>
           <TableCell Name="Cell3" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
-          <TableCell Name="Cell4" Border.Lines="All" VertAlign="Center" ColSpan="8"/>
+          <TableCell Name="Cell4" Border.Lines="All" Text="[DeliveryUnit]" VertAlign="Center" ColSpan="8"/>
           <TableCell Name="Cell5" Border.Lines="All" VertAlign="Center"/>
           <TableCell Name="Cell172"/>
           <TableCell Name="Cell27" Border.Lines="All" VertAlign="Center"/>
@@ -183,13 +183,13 @@ namespace FastReport
       </TableObject>
     </PageHeaderBand>
     <DataBand Name="Data1" Top="240.25" Width="1012.28" Height="85.05" Guides="0,85.05">
-      <TableObject Name="Table2" Width="999.81" Height="85.05" Border.Lines="Bottom" ManualBuildEvent="Table2_ManualBuild">
+      <TableObject Name="Table2" Width="1009.26" Height="85.05" Border.Lines="Bottom" ManualBuildEvent="Table2_ManualBuild">
         <TableColumn Name="Column24" Width="18.9"/>
         <TableColumn Name="Column25" Width="75.6"/>
         <TableColumn Name="Column26" Width="18.9"/>
         <TableColumn Name="Column27" Width="37.8"/>
-        <TableColumn Name="Column28" Width="56.7"/>
+        <TableColumn Name="Column28" Width="47.25"/>
-        <TableColumn Name="Column29" Width="47.25"/>
+        <TableColumn Name="Column29" Width="37.8"/>
         <TableColumn Name="Column71" Width="37.8"/>
         <TableColumn Name="Column31" Width="37.8"/>
         <TableColumn Name="Column32" Width="56.7"/>
@@ -200,49 +200,49 @@ namespace FastReport
         <TableColumn Name="Column37" Width="54.81"/>
         <TableColumn Name="Column38" Width="47.25"/>
         <TableColumn Name="Column39" Width="37.8"/>
-        <TableColumn Name="Column40" Width="56.7"/>
+        <TableColumn Name="Column40"/>
         <TableColumn Name="Column41" Width="47.25"/>
         <TableColumn Name="Column42" Width="37.8"/>
-        <TableColumn Name="Column74" Width="47.25"/>
+        <TableColumn Name="Column74"/>
         <TableColumn Name="Column44" Width="37.8"/>
         <TableColumn Name="Column45" Width="37.8"/>
         <TableColumn Name="Column46" Width="47.25"/>
         <TableRow Name="Row6" Height="85.05">
-          <TableCell Name="Cell126" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell126" Border.Lines="All" Text="[Data.Num]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell127" Border.Lines="All" Text="[Data.PipelineCode]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt" ColSpan="2"/>
           <TableCell Name="Cell128" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell129" Border.Lines="All" Text="[Data.PipelineLevel]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell130" Border.Lines="All" Text="[Data.DesignPressure]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell131" Border.Lines="All" Text="[Data.DesignTemperature]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
-          <TableCell Name="Cell175" Border.Lines="All" Font="Arial, 8pt"/>
+          <TableCell Name="Cell175" Border.Lines="All" Text="[Data.OperatingTemperature]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
-          <TableCell Name="Cell133" Border.Lines="All" Text="[Data.Medium]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell133" Border.Lines="All" Text="[Data.Medium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 8pt"/>
           <TableCell Name="Cell134" Border.Lines="All" Text="[Data.Material]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell135" Border.Lines="All" Text="[Data.Specifications]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell136" Border.Lines="All" Text="[Data.Length]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell137" Border.Lines="All" Text="[Data.LayingMethod]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell138" Border.Lines="All" Text="[Data.WeldsNum]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
           <TableCell Name="Cell139" Border.Lines="All" Text="[Data.LosslessRatio]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
-          <TableCell Name="Cell140" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell140" Border.Lines="All" Text="[Data.VoltageResistantTestMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 8pt"/>
-          <TableCell Name="Cell141" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell141" Border.Lines="All" Text="[Data.VoltageResistantTestPressure]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
-          <TableCell Name="Cell142" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell142" Border.Lines="All" Text="[Data.VoltageResistantTestDate]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
-          <TableCell Name="Cell143" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell143" Border.Lines="All" Text="[Data.LeakageTestMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 8pt"/>
-          <TableCell Name="Cell144" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell144" Border.Lines="All" Text="[Data.LeakageTestPressure]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
-          <TableCell Name="Cell180" Border.Lines="All" Font="Arial, 8pt"/>
+          <TableCell Name="Cell180" Border.Lines="All" Text="[Data.LeakageTestDate]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
-          <TableCell Name="Cell146" Border.Lines="All" Text="[Data.CleaningMethod]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell146" Border.Lines="All" Text="[Data.CleaningMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 8pt"/>
-          <TableCell Name="Cell147" Border.Lines="All" Text="[Data.CorrosionControlMethod]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell147" Border.Lines="All" Text="[Data.CorrosionControlMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 8pt"/>
-          <TableCell Name="Cell148" Border.Lines="All" Text="[Data.InsulationMethod]" HorzAlign="Center" VertAlign="Center" Font="Arial, 8pt"/>
+          <TableCell Name="Cell148" Border.Lines="All" Text="[Data.InsulationMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 8pt"/>
         </TableRow>
       </TableObject>
     </DataBand>
     <ColumnFooterBand Name="ColumnFooter1" Top="418.35" Width="1012.28">
       <ChildBand Name="Child1" Top="329.3" Width="1012.28" Height="85.05" Guides="0,85.05" FillUnusedSpace="true">
-        <TableObject Name="Table3" Width="999.81" Height="85.05" Border.Lines="Bottom">
+        <TableObject Name="Table3" Width="1009.26" Height="85.05" Border.Lines="Bottom">
           <TableColumn Name="Column47" Width="18.9"/>
           <TableColumn Name="Column48" Width="75.6"/>
           <TableColumn Name="Column49" Width="18.9"/>
           <TableColumn Name="Column50" Width="37.8"/>
-          <TableColumn Name="Column51" Width="56.7"/>
+          <TableColumn Name="Column51" Width="47.25"/>
-          <TableColumn Name="Column52" Width="47.25"/>
+          <TableColumn Name="Column52" Width="37.8"/>
           <TableColumn Name="Column72" Width="37.8"/>
           <TableColumn Name="Column54" Width="37.8"/>
           <TableColumn Name="Column55" Width="56.7"/>
@@ -253,10 +253,10 @@ namespace FastReport
           <TableColumn Name="Column60" Width="54.81"/>
           <TableColumn Name="Column61" Width="47.25"/>
           <TableColumn Name="Column62" Width="37.8"/>
-          <TableColumn Name="Column63" Width="56.7"/>
+          <TableColumn Name="Column63"/>
           <TableColumn Name="Column64" Width="47.25"/>
           <TableColumn Name="Column65" Width="37.8"/>
-          <TableColumn Name="Column75" Width="47.25"/>
+          <TableColumn Name="Column75"/>
           <TableColumn Name="Column67" Width="37.8"/>
           <TableColumn Name="Column68" Width="37.8"/>
           <TableColumn Name="Column69" Width="47.25"/>

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/04/2026 14:36:41" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/23/2026 17:12:17" ReportInfo.Modified="09/10/2026 11:10:02" ReportInfo.CreatorVersion="2017.1.16.0">
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFlxMSY6UNhBg4HnW9rPVVrg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFRLE3fVb1N0D74ri9q0f0Mg==">
       <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"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测数量统计表.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="04/22/2026 22:22:55" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="09/10/2026 14:12:26" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF+jEvKxLL874QPxeZpe4mMg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFsoKsInwAGXf7JXNSZ89jqA==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="IsoNo" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="NDTR_Name" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测数量统计表.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="02/03/2026 11:01:08" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="09/10/2026 14:22:00" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF2tKnmFHGYxmZtRT5hZjQMw==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFNSrLsmhmwUFwAlp5vIclNg==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="IsoNo" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="NDTR_Name" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx

@@ -34,8 +34,7 @@
                 <Items>                   
                     <f:Tree ID="tvControlItem" ShowHeader="false" Height="480px" Title="管道无损检测数量统计表节点树"
                         OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
-                        EnableSingleClickExpand="true" OnNodeExpand="tvControlItem_NodeExpand" AutoLeafIdentification="true"
+                        AutoLeafIdentification="true" EnableTextSelection="true" Expanded="true">
-                        EnableTextSelection="true" Expanded="true">
                     </f:Tree>
                 </Items>
             </f:Panel>

HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.cs

@@ -45,7 +45,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
         {
             this.tvControlItem.Nodes.Clear();
             TreeNode rootNode = new TreeNode();
-            rootNode.Text = "施工号-装置";
+            rootNode.Text = "施工号";
             rootNode.ToolTip = "项目";
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
@@ -63,15 +63,16 @@ namespace FineUIPro.Web.HJGL.CheckManage
                 rootProjectNode.Text = item.ProjectCode;
                 rootProjectNode.NodeID = item.ProjectId;
                 rootProjectNode.EnableExpandEvent = true;
+                rootProjectNode.EnableClickEvent = true;
                 rootProjectNode.ToolTip = item.ProjectName;
                 rootProjectNode.CommandName = "施工号";
                 rootNode.Nodes.Add(rootProjectNode);
 
-                TreeNode tn = new TreeNode();
+                //TreeNode tn = new TreeNode();
-                tn.NodeID = "temp";
+                //tn.NodeID = "temp";
-                tn.Text = "正在加载...";
+                //tn.Text = "正在加载...";
 
-                rootProjectNode.Nodes.Add(tn);
+                //rootProjectNode.Nodes.Add(tn);
             }
         }
 
@@ -80,38 +81,38 @@ namespace FineUIPro.Web.HJGL.CheckManage
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e)
+        //protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e)
-        {
+        //{
-            if (e.Node.Nodes != null)
+        //    if (e.Node.Nodes != null)
-            {
+        //    {
-                e.Node.Nodes.Clear();
+        //        e.Node.Nodes.Clear();
-            }
+        //    }
-            List<Model.Project_Installation> list = (from x in Funs.DB.Project_Installation where x.ProjectId == e.NodeID select x).ToList();
+        //    List<Model.Project_Installation> list = (from x in Funs.DB.Project_Installation where x.ProjectId == e.NodeID select x).ToList();
 
-            this.BindNodes(e.Node, list);
+        //    this.BindNodes(e.Node, list);
-        }
+        //}
 
         /// <summary>
         ///  绑定树节点
         /// </summary>
         /// <param name="node"></param>
-        private void BindNodes(TreeNode node, List<Model.Project_Installation> treeLists)
+        //private void BindNodes(TreeNode node, List<Model.Project_Installation> treeLists)
-        {
+        //{
-            if (node.CommandName == "施工号")
+        //    if (node.CommandName == "施工号")
-            {
+        //    {
-                var lists = (from x in treeLists orderby x.InstallationCode descending select x).Distinct();
+        //        var lists = (from x in treeLists orderby x.InstallationCode descending select x).Distinct();
-                foreach (var item in lists)
+        //        foreach (var item in lists)
-                {
+        //        {
-                    TreeNode newNode = new TreeNode();
+        //            TreeNode newNode = new TreeNode();
-                    newNode.Text = item.InstallationCode;
+        //            newNode.Text = item.InstallationCode;
-                    newNode.NodeID = item.InstallationId;
+        //            newNode.NodeID = item.InstallationId;
-                    newNode.ToolTip = item.InstallationName;
+        //            newNode.ToolTip = item.InstallationName;
-                    newNode.CommandName = "装置";
+        //            newNode.CommandName = "装置";
-                    newNode.EnableClickEvent = true;
+        //            newNode.EnableClickEvent = true;
-                    node.Nodes.Add(newNode);
+        //            node.Nodes.Add(newNode);
-                }
+        //        }
-            }
+        //    }
-        }
+        //}
         #endregion
 
         #region 点击TreeView
@@ -133,43 +134,43 @@ namespace FineUIPro.Web.HJGL.CheckManage
         /// </summary>
         private void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && this.tvControlItem.SelectedNodeID != "0")
             {
                 string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";//AND InstallationId = @InstallationId";
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
-                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
+                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.NodeID));
                 //listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
+                //DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
                 // 2.获取当前分页数据
                 //var table = this.GetPagedDataTable(Grid1, tb1);
-                Grid1.RecordCount = rows.Count();
+                Grid1.RecordCount = tb.Rows.Count;
                 //tb = GetFilteredTable(Grid1.FilteredData, tb);
-                //var table = this.GetPagedDataTable(Grid1, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
 
-                Grid1.DataSource = rows;
+                Grid1.DataSource = table;
                 Grid1.DataBind();
             }
         }
 
         private void BindPage()
         {
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            //if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
-            {
+            //{
-                var ins = BLL.Project_InstallationService.GetInstallationByInstallationId(this.tvControlItem.SelectedNodeID);
+            //    var ins = BLL.Project_InstallationService.GetInstallationByInstallationId(this.tvControlItem.SelectedNodeID);
-                if (ins != null)
+            //    if (ins != null)
-                {
+            //    {
-                    this.txtWorkAreaCode.Text = ins.InstallationCode;
+            //        this.txtWorkAreaCode.Text = ins.InstallationCode;
-                }
+            //    }
                 this.txtTestingStandard.Text = "NB/T47013-2015";
-            }
+            //}
-            else
+            //else
-            {
+            //{
-                this.txtWorkAreaCode.Text = string.Empty;
+            //    this.txtWorkAreaCode.Text = string.Empty;
-            }
+            //}
         }
         #endregion
 
@@ -440,16 +441,16 @@ namespace FineUIPro.Web.HJGL.CheckManage
             string rootPath = Server.MapPath("~/");
             BLL.Common.FastReportService.ResetData();
 
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && this.tvControlItem.SelectedNode.NodeID!="0")
             {
                 string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
-                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
+                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.NodeID));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
+                //DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
 
                 DataTable dt = new DataTable();
                 dt.TableName = "Data";
@@ -469,10 +470,10 @@ namespace FineUIPro.Web.HJGL.CheckManage
                 dt.Columns.Add("Mt3Num");
                 dt.Columns.Add("Pt3Num");
 
-                //DataView dv = tb.DefaultView;//获取表视图
+                DataView dv = tb.DefaultView;//获取表视图
-                //dv.Sort = "ISO_IsoNo ASC";//按照ID倒序排序
+                dv.Sort = "IsoNo ASC";//按照ID倒序排序
-                //tb = dv.ToTable();//转为表
+                tb = dv.ToTable();//转为表
-                //DataRow[] rows = tb.DefaultView.ToTable().Select();
+                DataRow[] rows = tb.DefaultView.ToTable().Select();
                 foreach (var row in rows)
                 {
                     var newRows = dt.NewRow();
@@ -498,7 +499,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
 
                 //传参
                 Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
-                keyValuePairs.Add("projectName", BLL.Base_ProjectService.GetProjectByProjectId(this.tvControlItem.SelectedNode.ParentNode.NodeID).ProjectName);
+                keyValuePairs.Add("projectName", BLL.Base_ProjectService.GetProjectByProjectId(this.tvControlItem.SelectedNode.NodeID).ProjectName);
                 keyValuePairs.Add("workAreaCode", txtWorkAreaCode.Text.Trim());
                 keyValuePairs.Add("testCategoryNumber", txtTestCategoryNumber.Text.Trim());
                 keyValuePairs.Add("acceptanceCriteria", txtAcceptanceCriteria.Text.Trim());

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx

@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>工业管道安装质量证明书</title>
+    <title>工业管道安装质量证明书（安装）</title>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="220px" Title="工业管道安装质量证明书" ShowBorder="true" Layout="VBox"
+                    EnableCollapse="true" Width="220px" Title="工业管道安装质量证明书（安装）" ShowBorder="true" Layout="VBox"
                     ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
@@ -25,15 +25,15 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装质量证明书" OnNodeCommand="tvControlItem_NodeCommand"
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装质量证明书（安装）" OnNodeCommand="tvControlItem_NodeCommand"
                             runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
                             AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
                         </f:Tree>
                     </Items>
                 </f:Panel>
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装质量证明书"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装质量证明书（安装）"
-                    TitleToolTip="工业管道安装质量证明书" AutoScroll="true">
+                    TitleToolTip="工业管道安装质量证明书（安装）" AutoScroll="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
@@ -43,7 +43,7 @@
                                     OnClick="btnSave_Click">
                                 </f:Button>
                                 <%--<f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>--%>
-                                <f:Button ID="btnPrint" Text="工业管道安装质量证明书打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                <f:Button ID="btnPrint" Text="工业管道安装质量证明书（安装）打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出Word" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
@@ -198,7 +198,7 @@
             Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="900px" Height="600px">
         </f:Window>--%>
-        <f:Window ID="WindowPrint" Title="打印工业管道安装质量证明书" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="WindowPrint" Title="打印工业管道安装质量证明书（安装）" Hidden="true" EnableIFrame="true" EnableMaximize="false"
             Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
             Height="600px">
         </f:Window>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs

@@ -596,6 +596,7 @@ namespace FineUIPro.Web.JGZL
                     //newReport.QualificationCertificateCode = this.txtQualificationCertificateCode.Text.Trim();
                     //newReport.InstitutionalApprovalCertificate = this.txtInstitutionalApprovalCertificate.Text.Trim();
                     newReport.InstallationInspection = this.txtInstallationInspection.Text.Trim();
+                    newReport.FromType = "1";
 
                     if (!string.IsNullOrEmpty(this.CertificateId))
                     {
@@ -653,7 +654,7 @@ namespace FineUIPro.Web.JGZL
                     initTemplatePath = Const.JGZL_IndustrialPipelineInstallationQualityCertificateUrl;
                     uploadfilepath = rootPath + initTemplatePath;
 
-                    newUrl = uploadfilepath.Replace("工业管道安装质量证明书导出模板", "工业管道安装质量证明书");
+                    newUrl = uploadfilepath.Replace("工业管道安装质量证明书导出模板", "工业管道安装质量证明书（安装）");
                     if (File.Exists(newUrl))
                     {
                         File.Delete(newUrl);

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx

@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>工业管道安装汇总表</title>
+    <title>工业管道安装汇总表（安装）</title>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="220px" Title="工业管道安装汇总表" ShowBorder="true" Layout="VBox"
+                    EnableCollapse="true" Width="220px" Title="工业管道安装汇总表（安装）" ShowBorder="true" Layout="VBox"
                     ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
@@ -25,15 +25,15 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装汇总表" OnNodeCommand="tvControlItem_NodeCommand"
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装汇总表（安装）" OnNodeCommand="tvControlItem_NodeCommand"
                             runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
                             AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
                         </f:Tree>
                     </Items>
                 </f:Panel>
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装汇总表"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装汇总表（安装）"
-                    TitleToolTip="工业管道安装汇总表" AutoScroll="true">
+                    TitleToolTip="工业管道安装汇总表（安装）" AutoScroll="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
@@ -42,7 +42,7 @@
                                 </f:ToolbarFill>
                                 <f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>
                                 <f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="SystemSave" runat="server" OnClick="btnSave_Click"></f:Button>
-                                <f:Button ID="btnPrint" Text="工业管道安装汇总表打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                <f:Button ID="btnPrint" Text="工业管道安装汇总表（安装）打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出Word" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
@@ -51,7 +51,7 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工业管道安装汇总表" EnableCollapse="true"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工业管道安装汇总表（安装）" EnableCollapse="true"
                             runat="server" BoxFlex="1" DataKeyNames="SummaryId" EnableColumnLines="true"
                             AllowCellEditing="true" ClicksToEdit="1" DataIDField="SummaryId" AllowSorting="true"
                             SortDirection="ASC" OnSort="Grid1_Sort" OnPreDataBound="Grid1_PreDataBound"
@@ -225,7 +225,7 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        <f:Window ID="WindowPrint" Title="打印工业管道安装汇总表" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="WindowPrint" Title="打印工业管道安装汇总表（安装）" Hidden="true" EnableIFrame="true" EnableMaximize="false"
             Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
             Height="600px">
         </f:Window>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary.aspx.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.JGZL
                 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
 
                 //获取下拉选择项本项目下所有工业管道安装质量证明书信息
-                IndustrialPipelineInstallationQualityCertificateService.InitIndustrialPipelineInstallationQualityCertificateDownList(this.drpCertificateCode, this.tvControlItem.SelectedNodeID, false);
+                IndustrialPipelineInstallationQualityCertificateService.InitIndustrialPipelineInstallationQualityCertificateDownList(this.drpCertificateCode, this.tvControlItem.SelectedNodeID, "1", false);
                 if (!string.IsNullOrEmpty(this.drpCertificateCode.SelectedValue) && this.drpCertificateCode.SelectedValue != BLL.Const._Null)
                 {
                     this.CertificateId = this.drpCertificateCode.SelectedValue;
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.JGZL
                 {
                     foreach (var item in isoInfo)
                     {
-                        var summary = BLL.IndustrialPipelineInstallationSummaryService.GetIndustrialPipelineInstallationSummaryByPipelineCode(item.ISO_IsoNo);
+                        var summary = BLL.IndustrialPipelineInstallationSummaryService.GetIndustrialPipelineInstallationSummaryByPipelineCode(item.ISO_IsoNo, "1");
                         if (summary == null)
                         {
                             Model.JGZL_IndustrialPipelineInstallationSummary newSummary = new JGZL_IndustrialPipelineInstallationSummary();
@@ -162,6 +162,7 @@ namespace FineUIPro.Web.JGZL
                             newSummary.LeakageTestPressure = item.LeakageTest + "MPa";//泄漏试验压力
                             newSummary.CorrosionControlMethod = item.ISO_Paint;//腐蚀控制方式
                             newSummary.VoltageResistantTestMethod = "水压试验";//耐压试验方法
+                            newSummary.FromType = "1";
                             BLL.IndustrialPipelineInstallationSummaryService.AddIndustrialPipelineInstallationSummary(newSummary);
                         }
                     }
@@ -244,8 +245,8 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
 	VoltageResistantTestMethod, VoltageResistantTestMedium, VoltageResistantTestPressure,
 	LeakageTestMedium, LeakageTestPressure, CleaningMethod, CorrosionControlMethod, InsulationMethod, 
 	Remark, CompileMan, CompileDate, Reviewer, RevieweDate, OperatingTemperature, VoltageResistantTestDate,
-	LeakageTestDate from JGZL_IndustrialPipelineInstallationSummary
+	LeakageTestDate,FromType from JGZL_IndustrialPipelineInstallationSummary
-                                WHERE 1=1 ";
+                                WHERE FromType='1' ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
             {
@@ -347,7 +348,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
                 string rootPath = Server.MapPath("~/");
                 BLL.Common.FastReportService.ResetData();
 
-                string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId ";
+                string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId and FromType='1'";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 listStr.Add(new SqlParameter("@ProjectId", projectId));
                 if (!string.IsNullOrEmpty(this.txtIsoNoS.Text))
@@ -508,6 +509,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
                 { "VoltageResistantTestDate", "" },
                 { "LeakageTestDate", "" },
                 { "Remark", "" },
+                { "FromType", "1" },
                 {
                     "Delete3",
                     String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>",
@@ -599,7 +601,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
 
         void saveItem()
         {
-            BLL.IndustrialPipelineInstallationSummaryService.DeleteIndustrialPipelineInstallationSummaryByProjectId(this.tvControlItem.SelectedNodeID);
+            BLL.IndustrialPipelineInstallationSummaryService.DeleteIndustrialPipelineInstallationSummaryByProjectId(this.tvControlItem.SelectedNodeID, "1");
             List<Model.JGZL_IndustrialPipelineInstallationSummary> detailLists = new List<Model.JGZL_IndustrialPipelineInstallationSummary>();
             JArray teamGroupData = Grid1.GetMergedData();
             foreach (JObject teamGroupRow in teamGroupData)
@@ -632,6 +634,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
                     CleaningMethod = values.Value<string>("CleaningMethod"),
                     CorrosionControlMethod = values.Value<string>("CorrosionControlMethod"),
                     InsulationMethod = values.Value<string>("InsulationMethod"),
+                    FromType = "1"
                 };
                 detailLists.Add(newDetail);
             }
@@ -669,7 +672,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
             string projectId = this.tvControlItem.SelectedNodeID;
             if (!string.IsNullOrEmpty(projectId))
             {
-                string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId ";
+                string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId and FromType='1'";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 listStr.Add(new SqlParameter("@ProjectId", projectId));
                 if (!string.IsNullOrEmpty(this.txtIsoNoS.Text))
@@ -684,7 +687,7 @@ CASE WHEN ISNUMERIC(DesignPressure)=1 THEN FORMAT(CAST(DesignPressure AS DECIMAL
                     initTemplatePath = Const.JGZL_IndustrialPipelineInstallationSummaryUrl;
                     uploadfilepath = rootPath + initTemplatePath;
 
-                    newUrl = uploadfilepath.Replace("工业管道安装汇总表导出模板", "工业管道安装汇总表");
+                    newUrl = uploadfilepath.Replace("工业管道安装汇总表导出模板", "工业管道安装汇总表（安装）");
                     if (File.Exists(newUrl))
                     {
                         File.Delete(newUrl);

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx

@@ -4,13 +4,281 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>压力管道安装汇总表2020</title>
+    <title>工业管道安装汇总表（2020版）</title>
 </head>
 <body>
     <form id="form1" runat="server">
-        <div>
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
-        </div>
+        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
+                    EnableCollapse="true" Width="220px" Title="工业管道安装汇总表（2020版）" ShowBorder="true" Layout="VBox"
+                    ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelAlign="Right" AutoPostBack="true" EnableEdit="true"
+                                    OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="50px">
+                                </f:DropDownList>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装汇总表（2020版）" OnNodeCommand="tvControlItem_NodeCommand"
+                            runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
+                            AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
+                        </f:Tree>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装汇总表（2020版）"
+                    TitleToolTip="工业管道安装汇总表（2020版）" AutoScroll="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                            <Items>
+                                <f:TextBox ID="txtIsoNoS" runat="server" Label="管道编号" LabelAlign="Right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" EmptyText="输入查询条件"></f:TextBox>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnAdd" runat="server" Icon="Add" Text="增加" OnClick="btnAdd_Click"></f:Button>
+                                <f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="SystemSave" runat="server" OnClick="btnSave_Click"></f:Button>
+                                <f:Button ID="btnPrint" Text="工业管道安装汇总表（2020版）打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出Word" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工业管道安装汇总表（2020版）" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="SummaryId" EnableColumnLines="true"
+                            AllowCellEditing="true" ClicksToEdit="1" DataIDField="SummaryId" AllowSorting="true"
+                            SortDirection="ASC" OnSort="Grid1_Sort" OnPreDataBound="Grid1_PreDataBound"
+                            AllowPaging="false" IsDatabasePaging="true" PageSize="10000"
+                            EnableTextSelection="True" AutoScroll="true">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                                    <Items>
+                                        <f:DropDownList runat="server" ID="drpCertificateCode" LabelAlign="Right" Label="证明书编号" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpCertificateCode_SelectedIndexChanged" ShowRedStar="true" EnableEdit="true" Width="380px"></f:DropDownList>
+                                        <f:TextBox ID="txtDeliveryUnit" runat="server" Label="交工单元名称" LabelAlign="Right" Readonly="true"></f:TextBox>
+                                        <f:TextBox ID="txtDeliveryUnitCode" runat="server" Label="交工单元编号" LabelAlign="Right" Readonly="true"></f:TextBox>
+                                        <f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                    TextAlign="Center" />
+                                <f:RenderField HeaderText="单线号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px">
+                                    <Editor>
+                                        <f:TextBox ID="txtIsoNo" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="管道级别" ColumnID="PipelineLevel" DataField="PipelineLevel" SortField="PipelineLevel"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
+                                    <Editor>
+                                        <f:TextBox ID="txtPipelineLevel" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <%--<f:GroupField HeaderText="起止点" runat="server" TextAlign="Center" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="起点" ColumnID="PipelineStartPoint" DataField="PipelineStartPoint" SortField="PipelineStartPoint"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                                            <Editor>
+                                                <f:TextBox ID="txtPipelineStartPoint" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="终点" ColumnID="PipelineEndPoint" DataField="PipelineEndPoint" SortField="PipelineEndPoint"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                                            <Editor>
+                                                <f:TextBox ID="txtPipelineEndPoint" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>--%>
+                                <f:RenderField HeaderText="设计压力（MPa）" ColumnID="DesignPressure" DataField="DesignPressure" SortField="DesignPressure"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtDesignPressure" runat="server">
+                                        </f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="设计温度（℃）" ColumnID="DesignTemperature" DataField="DesignTemperature" SortField="DesignTemperature"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtDesignTemperature" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="操作温度(℃)" ColumnID="OperatingTemperature" DataField="OperatingTemperature" SortField="OperatingTemperature"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtOperatingTemperature" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="输送介质" ColumnID="Medium" DataField="Medium" SortField="Medium"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtMedium" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="管道材质牌号及标准" ColumnID="Material" DataField="Material" SortField="Material"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtMaterial" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="管道规格（外径×壁厚mm）" ColumnID="Specifications" DataField="Specifications" SortField="Specifications"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtSpecifications" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="管道长度(m)" ColumnID="Length" DataField="Length" SortField="Length"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtLength" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="铺设方式" ColumnID="LayingMethod" DataField="LayingMethod" SortField="LayingMethod"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtLayingMethod" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="焊口数量" ColumnID="WeldsNum" DataField="WeldsNum" SortField="WeldsNum"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtWeldsNum" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="检测方法/比例(%)" ColumnID="LosslessRatio" DataField="LosslessRatio" SortField="LosslessRatio"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtLosslessRatio" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:GroupField HeaderText="压力试验" runat="server" TextAlign="Center" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="介质" ColumnID="VoltageResistantTestMedium" DataField="VoltageResistantTestMedium" SortField="VoltageResistantTestMedium"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                                            <Editor>
+                                                <f:TextBox ID="txtVoltageResistantTestMedium" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="压力(Mpa)" ColumnID="VoltageResistantTestPressure" DataField="VoltageResistantTestPressure" SortField="VoltageResistantTestPressure"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                                            <Editor>
+                                                <f:TextBox ID="txtVoltageResistantTestPressure" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="日期" ColumnID="VoltageResistantTestDate" DataField="VoltageResistantTestDate" SortField="VoltageResistantTestDate"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy.MM.dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                            <Editor>
+                                                <f:DatePicker ID="txtVoltageResistantTestDate" runat="server" DateFormatString="yyyy.MM.dd"></f:DatePicker>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <f:GroupField HeaderText="泄漏性试验" runat="server" TextAlign="Center" HeaderTextAlign="Center">
+                                    <Columns>
+                                        <f:RenderField HeaderText="介质" ColumnID="LeakageTestMedium" DataField="LeakageTestMedium" SortField="LeakageTestMedium"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                                            <Editor>
+                                                <f:TextBox ID="txtLeakageTestMedium" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="压力(Mpa)" ColumnID="LeakageTestPressure" DataField="LeakageTestPressure" SortField="LeakageTestPressure"
+                                            FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
+                                            <Editor>
+                                                <f:TextBox ID="txtLeakageTestPressure" runat="server"></f:TextBox>
+                                            </Editor>
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="日期" ColumnID="LeakageTestDate" DataField="LeakageTestDate" SortField="LeakageTestDate"
+                                            FieldType="Date" Renderer="Date" RendererArgument="yyyy.MM.dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                            <Editor>
+                                                <f:DatePicker ID="txtLeakageTestDate" runat="server" DateFormatString="yyyy.MM.dd"></f:DatePicker>
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:GroupField>
+                                <%--<f:RenderField HeaderText="耐压试验方法" ColumnID="VoltageResistantTestMethod" DataField="VoltageResistantTestMethod" SortField="VoltageResistantTestMethod"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtVoltageResistantTestMethod" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="耐压试验介质" ColumnID="VoltageResistantTestMedium" DataField="VoltageResistantTestMedium" SortField="VoltageResistantTestMedium"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtVoltageResistantTestMedium" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="耐压试验压力（MPa）" ColumnID="VoltageResistantTestPressure" DataField="VoltageResistantTestPressure" SortField="VoltageResistantTestPressure"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtVoltageResistantTestPressure" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="泄漏试验介质" ColumnID="LeakageTestMedium" DataField="LeakageTestMedium" SortField="LeakageTestMedium"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtLeakageTestMedium" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="泄漏试验压力（MPa）" ColumnID="LeakageTestPressure" DataField="LeakageTestPressure" SortField="LeakageTestPressure"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtLeakageTestPressure" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>--%>
+                                <f:RenderField HeaderText="吹洗方法" ColumnID="CleaningMethod" DataField="CleaningMethod" SortField="CleaningMethod"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtCleaningMethod" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="防腐方式" ColumnID="CorrosionControlMethod" DataField="CorrosionControlMethod" SortField="CorrosionControlMethod"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtCorrosionControlMethod" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField HeaderText="保温（绝热）方式" ColumnID="InsulationMethod" DataField="InsulationMethod" SortField="InsulationMethod"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+                                    <Editor>
+                                        <f:TextBox ID="txtInsulationMethod" runat="server"></f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:LinkButtonField ColumnID="Delete3" Width="60px" EnablePostBack="false" Icon="Delete"
+                                    HeaderTextAlign="Center" HeaderText="删除" />
+                                <f:RenderField HeaderText="主键" ColumnID="SummaryId" DataField="SummaryId" SortField="SummaryId"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="140px" Hidden="true">
+                                </f:RenderField>
+                            </Columns>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="10" Value="10" />
+                                    <f:ListItem Text="15" Value="15" />
+                                    <f:ListItem Text="20" Value="20" />
+                                    <f:ListItem Text="25" Value="25" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="WindowPrint" Title="打印工业管道安装汇总表（2020版）" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+            Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
+            Height="600px">
+        </f:Window>
     </form>
 </body>
 </html>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.cs

@@ -1,17 +1,891 @@
-using System;
+using Aspose.Words;
+using Aspose.Words.Tables;
+using BLL;
+using Model;
+using Newtonsoft.Json.Linq;
+using NPOI.SS.Formula.Functions;
+using Org.BouncyCastle.Asn1.IsisMtt;
+using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
 using System.Linq;
 using System.Web;
+using System.Web.Services;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace FineUIPro.Web.JGZL
 {
-    public partial class IndustrialPipelineInstallationSummary2020 : System.Web.UI.Page
+    public partial class IndustrialPipelineInstallationSummary2020 : PageBase
     {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string SummaryId
+        {
+            get
+            {
+                return (string)ViewState["SummaryId"];
+            }
+            set
+            {
+                ViewState["SummaryId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        private string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 外键—CertificateId
+        /// </summary>
+        public string CertificateId
+        {
+            get
+            {
+                return (string)ViewState["CertificateId"];
+            }
+            set
+            {
+                ViewState["CertificateId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
+            if (!IsPostBack)
+            {
+                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+
+                this.drpProjectId.DataTextField = "ProjectCode";
+                this.drpProjectId.DataValueField = "ProjectId";
+                this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
+                this.drpProjectId.DataBind();
+                Funs.FineUIPleaseSelect(this.drpProjectId);
+
+                this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
+                this.InitTreeMenu();//加载树
+                this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+
+                //获取下拉选择项本项目下所有工业管道安装质量证明书信息
+                IndustrialPipelineInstallationQualityCertificateService.InitIndustrialPipelineInstallationQualityCertificateDownList(this.drpCertificateCode, this.tvControlItem.SelectedNodeID, "2", false);
+                if (!string.IsNullOrEmpty(this.drpCertificateCode.SelectedValue) && this.drpCertificateCode.SelectedValue != BLL.Const._Null)
+                {
+                    this.CertificateId = this.drpCertificateCode.SelectedValue;
+                    var certificate = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateById(this.CertificateId);
+                    if (certificate != null)
+                    {
+                        this.txtDeliveryUnit.Text = certificate.DeliveryUnit;
+                        this.txtDeliveryUnitCode.Text = certificate.DeliveryUnitCode;
+                    }
+                }
+                DataIsoInfo();
+                BindGrid();
+            }
+        }
+        #endregion
+
+        private void DataIsoInfo()
+        {
+            var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.tvControlItem.SelectedNodeID);
+            if (isoInfo.Count > 0)
+            {
+                if (!string.IsNullOrEmpty(this.drpCertificateCode.SelectedValue))
+                {
+                    foreach (var item in isoInfo)
+                    {
+                        var summary = BLL.IndustrialPipelineInstallationSummaryService.GetIndustrialPipelineInstallationSummaryByPipelineCode(item.ISO_IsoNo, "2");
+                        if (summary == null)
+                        {
+                            Model.JGZL_IndustrialPipelineInstallationSummary newSummary = new JGZL_IndustrialPipelineInstallationSummary();
+                            newSummary.SummaryId = SQLHelper.GetNewID(typeof(Model.JGZL_IndustrialPipelineInstallationSummary));
+                            newSummary.ProjectId = this.tvControlItem.SelectedNodeID;
+                            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.HasValue ? item.ISO_DesignPress.Value.ToString("#.00") : "";
+                            newSummary.DesignTemperature = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("#.00") : "";
+                            newSummary.OperatingTemperature = item.OperatingTemperature;
+                            if (!string.IsNullOrEmpty(item.SER_ID))
+                            {
+                                newSummary.Medium = BLL.HJGL_MediumService.GetServiceBySERID(item.SER_ID).SER_Name;
+                            }
+                            if (!string.IsNullOrEmpty(item.STE_ID))
+                            {
+                                newSummary.Material = BLL.HJGL_MaterialService.GetSteelBySteID(item.STE_ID).STE_Code;
+                            }
+                            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.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))
+                            {
+                                newSummary.LosslessRatio = HJGL_DetectionService.GetNDTRateByNDTRID(item.Joty_B_Rate).NDTR_Name;//无损检测比例
+                            }
+                            newSummary.VoltageResistantTestMedium = "水";//耐压试验介质
+                            newSummary.LeakageTestMedium = "空气";//泄漏试验介质
+                            newSummary.CleaningMethod = "压缩空气吹扫";//吹扫、清洗方法
+                            newSummary.VoltageResistantTestPressure = item.ISO_TestPress.HasValue ? item.ISO_TestPress.Value.ToString(("0.##")) + "MPa" : "";//耐压试验压力
+                            newSummary.LeakageTestPressure = item.LeakageTest + "MPa";//泄漏试验压力
+                            newSummary.CorrosionControlMethod = item.ISO_Paint;//腐蚀控制方式
+                            newSummary.VoltageResistantTestMethod = "水压试验";//耐压试验方法
+                            newSummary.FromType = "2";
+                            BLL.IndustrialPipelineInstallationSummaryService.AddIndustrialPipelineInstallationSummary(newSummary);
+                        }
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("请先编辑工业管道安装质量证明书（2020版）！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+        }
+
+        #region 加载树项目
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.tvControlItem.Nodes.Clear();
+            TreeNode rootNode = new TreeNode();
+            rootNode.Text = "项目";
+            rootNode.ToolTip = "项目";
+            rootNode.NodeID = "0";
+            rootNode.Expanded = true;
+            this.tvControlItem.Nodes.Add(rootNode);
+
+            List<Model.Base_Project> projects = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
+            if (this.drpProjectId.SelectedValue != BLL.Const._Null)
+            {
+                projects = projects.Where(e => e.ProjectId == this.drpProjectId.SelectedValue).ToList();
+            }
+            foreach (var item in projects)
+            {
+                TreeNode rootProjectNode = new TreeNode();//定义根节点
+                rootProjectNode.Text = item.ProjectCode;
+                rootProjectNode.NodeID = item.ProjectId;
+                rootProjectNode.EnableClickEvent = true;
+                rootProjectNode.Expanded = true;
+                rootProjectNode.ToolTip = item.ProjectName;
+                rootProjectNode.CommandName = "项目名称";
+                rootNode.Nodes.Add(rootProjectNode);
+            }
+        }
+        #endregion
+
+        #region 点击TreeView
+        /// <summary>
+        /// 点击TreeView
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            if (this.tvControlItem.SelectedNodeID != "0")
+            {
+                DataIsoInfo();
+                this.BindGrid();
+            }
+        }
+        #endregion
+
+        #region 数据绑定
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        private void BindGrid()
+        {
+            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,FromType from JGZL_IndustrialPipelineInstallationSummary
+                                WHERE FromType='2' ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+            {
+                strSql += " AND ProjectId = @ProjectId";
+                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID));
+            }
+            if (!string.IsNullOrEmpty(this.txtIsoNoS.Text))
+            {
+                strSql += " AND PipelineCode like @PipelineCode";
+                listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtIsoNoS.Text + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            // 2.获取当前分页数据
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 分页排序
+        #region 页索引改变事件
+        /// <summary>
+        /// 页索引改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 排序
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页选择下拉改变事件
+        /// <summary>
+        /// 分页选择下拉改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+        #endregion
+
+        #region 查询
+        ///<summary>
+        ///查询
+        ///</summary>
+        ///<param name="sender"></param>
+        ///<param name="e"></param>
+        protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
+            this.InitTreeMenu();
+            DataIsoInfo();
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 打印
+        /// <summary>
+        /// 打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPrint_Click(object sender, EventArgs e)
+        {
+            string projectId = this.tvControlItem.SelectedNodeID;
+
+            if (projectId != null)
+            {
+                string initTemplatePath = "";
+                string rootPath = Server.MapPath("~/");
+                BLL.Common.FastReportService.ResetData();
+
+                string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where FromType='2' and ProjectId = @ProjectId ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@ProjectId", projectId));
+                if (!string.IsNullOrEmpty(this.txtIsoNoS.Text))
+                {
+                    strSql += " And PipelineCode like @pipeLineCode";
+                    listStr.Add(new SqlParameter("@pipeLineCode", "%" + this.txtIsoNoS.Text + "%"));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                if (tb.Rows.Count > 0)
+                {
+                    DataTable dt = new DataTable();
+                    dt.TableName = "Data";
+                    dt.Columns.Add("Num");
+                    dt.Columns.Add("PipelineCode");
+                    dt.Columns.Add("PipelineLevel");
+                    dt.Columns.Add("DesignPressure");
+                    dt.Columns.Add("DesignTemperature");
+                    dt.Columns.Add("OperatingTemperature");
+                    dt.Columns.Add("Medium");
+                    dt.Columns.Add("Material");
+                    dt.Columns.Add("Specifications");
+                    dt.Columns.Add("Length");
+                    dt.Columns.Add("LayingMethod");
+                    dt.Columns.Add("WeldsNum");
+                    dt.Columns.Add("LosslessRatio");
+                    dt.Columns.Add("VoltageResistantTestMedium");
+                    dt.Columns.Add("VoltageResistantTestPressure");
+                    dt.Columns.Add("VoltageResistantTestDate");
+                    dt.Columns.Add("LeakageTestMedium");
+                    dt.Columns.Add("LeakageTestPressure");
+                    dt.Columns.Add("LeakageTestDate");
+                    dt.Columns.Add("CleaningMethod");
+                    dt.Columns.Add("CorrosionControlMethod");
+                    dt.Columns.Add("InsulationMethod");
+                    dt.Columns.Add("PipelineStartPoint");
+                    dt.Columns.Add("PipelineEndPoint");
+                    dt.Columns.Add("Remark");
+
+                    DataRow[] rows = tb.DefaultView.ToTable().Select();
+                    int i = 0;
+                    foreach (var row in rows)
+                    {
+                        var newRow = dt.NewRow();
+                        newRow["Num"] = (i + 1).ToString();
+                        newRow["PipelineCode"] = row["PipelineCode"].ToString();
+                        newRow["PipelineLevel"] = row["PipelineLevel"].ToString();
+                        newRow["DesignPressure"] = row["DesignPressure"].ToString();
+                        newRow["DesignTemperature"] = row["DesignTemperature"].ToString();
+                        newRow["OperatingTemperature"] = row["OperatingTemperature"].ToString();
+                        newRow["Medium"] = row["Medium"].ToString();
+                        newRow["Material"] = row["Material"].ToString();
+                        newRow["Specifications"] = row["Specifications"].ToString();
+                        newRow["Length"] = row["Length"].ToString();
+                        newRow["LayingMethod"] = row["LayingMethod"].ToString();
+                        newRow["WeldsNum"] = row["WeldsNum"].ToString();
+                        newRow["LosslessRatio"] = row["LosslessRatio"].ToString();
+                        newRow["VoltageResistantTestMedium"] = row["VoltageResistantTestMedium"].ToString();
+                        newRow["VoltageResistantTestPressure"] = row["VoltageResistantTestPressure"].ToString();
+                        string VoltageResistantTestDate = string.Format("{0:yyyy.MM.dd}", row["VoltageResistantTestDate"]);
+                        newRow["VoltageResistantTestDate"] = VoltageResistantTestDate;
+                        newRow["LeakageTestMedium"] = row["LeakageTestMedium"].ToString();
+                        newRow["LeakageTestPressure"] = row["LeakageTestPressure"].ToString();
+                        string LeakageTestDate = string.Format("{0:yyyy.MM.dd}", row["LeakageTestDate"]);
+                        newRow["LeakageTestDate"] = LeakageTestDate;
+                        newRow["CleaningMethod"] = row["CleaningMethod"].ToString();
+                        newRow["CorrosionControlMethod"] = row["CorrosionControlMethod"].ToString();
+                        newRow["InsulationMethod"] = row["InsulationMethod"].ToString();
+                        newRow["PipelineStartPoint"] = row["PipelineStartPoint"].ToString();
+                        newRow["PipelineEndPoint"] = row["PipelineEndPoint"].ToString();
+                        newRow["Remark"] = row["Remark"].ToString();
+                        dt.Rows.Add(newRow);
+                        i++;
+                    }
+                    BLL.Common.FastReportService.AddFastreportTable(dt);
+
+                    string certificateCode = string.Empty;
+                    string deliveryUnit = string.Empty;
+                    string deliveryUnitCode = string.Empty;
+                    string certificateId = rows[0]["CertificateId"].ToString();
+                    var certificate = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateById(certificateId);
+                    if (certificate != null)
+                    {
+                        certificateCode = certificate.CertificateCode;
+                        deliveryUnit = certificate.DeliveryUnit;
+                        deliveryUnitCode = certificate.DeliveryUnitCode;
+                    }
+                    Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
+                    keyValuePairs.Add("CertificateCode", certificateCode);
+                    keyValuePairs.Add("DeliveryUnit", deliveryUnit);
+                    keyValuePairs.Add("DeliveryUnitCode", deliveryUnitCode);
+                    BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+                    initTemplatePath = "File\\Fastreport\\JGZL\\压力管道安装汇总表2020.frx";
+                    if (File.Exists(rootPath + initTemplatePath))
+                    {
+                        PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("没有要打印的数据！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 维护
+        /// <summary>
+        /// 增加
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAdd_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+            {
+                JArray teamGroupData = Grid1.GetMergedData();
+                List<JObject> list = new List<JObject>();
+                foreach (JObject teamGroupRow in teamGroupData)
+                {
+                    JObject values = teamGroupRow.Value<JObject>("values");
+                    list.Add(values);
+                }
+
+                JObject defaultObj = new JObject
+            {
+                { "SummaryId", Guid.NewGuid() },
+                { "CertificateId", this.drpCertificateCode.SelectedValue },
+                { "ProjectId", this.tvControlItem.SelectedNodeID },
+                { "PipelineCode", "" },
+                { "PipelineLevel", "" },
+                //{ "PipelineStartPoint", "" },
+                //{ "PipelineEndPoint", "" },
+                { "DesignPressure", "" },
+                { "DesignTemperature", "" },
+                { "Medium", "" },
+                { "Material", "" },
+                { "Specifications", "" },
+                { "Length", "" },
+                { "LayingMethod", "" },
+                { "WeldsNum", "" },
+                { "LosslessRatio", "" },
+                { "VoltageResistantTestMedium", "" },
+                { "VoltageResistantTestPressure", "" },
+                { "LeakageTestMedium", "" },
+                { "LeakageTestPressure", "" },
+                { "CleaningMethod", "" },
+                { "CorrosionControlMethod", "" },
+                { "InsulationMethod", "" },
+                { "OperatingTemperature", "" },
+                { "VoltageResistantTestDate", "" },
+                { "LeakageTestDate", "" },
+                { "Remark", "" },
+                { "FromType", "2" },
+                {
+                    "Delete3",
+                    String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>",
+                        GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete))
+                }
+            };
+                list.Add(defaultObj);
+                Grid1.DataSource = list;
+                Grid1.DataBind();
+                //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("IndustrialPipelineInstallationSummaryEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - ")));
+            }
+            else
+            {
+                Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        protected void Grid1_PreDataBound(object sender, EventArgs e)
+        {
+            // 设置LinkButtonField的点击客户端事件
+            LinkButtonField deleteField = Grid1.FindColumn("Delete3") as LinkButtonField;
+            deleteField.OnClientClick = GetDeleteScriptGrid1();
+        }
+
+        /// <summary>
+        /// 删除提示
+        /// </summary>
+        /// <returns></returns>
+        private string GetDeleteScriptGrid1()
+        {
+            return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question,
+                Grid1.GetDeleteSelectedRowsReference(), String.Empty);
+        }
+        #endregion       
+
+        #region 选择质量证明书编号
+        /// <summary>
+        /// 选择质量证明书编号
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpCertificateCode_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.txtDeliveryUnit.Text = string.Empty;
+            this.txtDeliveryUnitCode.Text = string.Empty;
+            if (!string.IsNullOrWhiteSpace(this.drpCertificateCode.SelectedValue))
+            {
+                //this.CertificateId = this.drpCertificateCode.SelectedValue;
+
+                #region 质量证明书
+                var certificate = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateById(this.drpCertificateCode.SelectedValue);
+                if (certificate != null)
+                {
+                    this.txtDeliveryUnit.Text = certificate.DeliveryUnit;
+                    this.txtDeliveryUnitCode.Text = certificate.DeliveryUnitCode;
+                }
+                #endregion
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId,
+                    Const.JGZL_IndustrialPipelineQualityCertificate2020MenuId, Const.BtnSave))
+            {
+                if (string.IsNullOrEmpty(this.drpCertificateCode.SelectedValue))
+                {
+                    Alert.ShowInTop("请选择质量证明书编号！", MessageBoxIcon.Warning);
+                    return;
+                }
+                saveItem();
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        void saveItem()
+        {
+            BLL.IndustrialPipelineInstallationSummaryService.DeleteIndustrialPipelineInstallationSummaryByProjectId(this.tvControlItem.SelectedNodeID, "2");
+            List<Model.JGZL_IndustrialPipelineInstallationSummary> detailLists = new List<Model.JGZL_IndustrialPipelineInstallationSummary>();
+            JArray teamGroupData = Grid1.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.JGZL_IndustrialPipelineInstallationSummary newDetail = new Model.JGZL_IndustrialPipelineInstallationSummary
+                {
+                    SummaryId = values.Value<string>("SummaryId"),
+                    ProjectId = this.tvControlItem.SelectedNodeID,
+                    CertificateId = this.drpCertificateCode.SelectedValue,
+                    PipelineCode = values.Value<string>("PipelineCode"),
+                    PipelineLevel = values.Value<string>("PipelineLevel"),
+                    //PipelineStartPoint = values.Value<string>("PipelineStartPoint"),
+                    //PipelineEndPoint = values.Value<string>("PipelineEndPoint"),
+                    DesignPressure = values.Value<string>("DesignPressure"),
+                    DesignTemperature = values.Value<string>("DesignTemperature"),
+                    OperatingTemperature = values.Value<string>("OperatingTemperature"),
+                    Medium = values.Value<string>("Medium"),
+                    Material = values.Value<string>("Material"),
+                    Specifications = values.Value<string>("Specifications"),
+                    Length = values.Value<string>("Length"),
+                    LayingMethod = values.Value<string>("LayingMethod"),
+                    WeldsNum = values.Value<string>("WeldsNum"),
+                    LosslessRatio = values.Value<string>("LosslessRatio"),
+                    //VoltageResistantTestMethod = values.Value<string>("VoltageResistantTestMethod"),
+                    VoltageResistantTestMedium = values.Value<string>("VoltageResistantTestMedium"),
+                    VoltageResistantTestPressure = values.Value<string>("VoltageResistantTestPressure"),
+                    VoltageResistantTestDate = Funs.GetNewDateTime(values.Value<string>("VoltageResistantTestDate")),
+                    LeakageTestMedium = values.Value<string>("LeakageTestMedium"),
+                    LeakageTestPressure = values.Value<string>("LeakageTestPressure"),
+                    LeakageTestDate = Funs.GetNewDateTime(values.Value<string>("LeakageTestDate")),
+                    CleaningMethod = values.Value<string>("CleaningMethod"),
+                    CorrosionControlMethod = values.Value<string>("CorrosionControlMethod"),
+                    InsulationMethod = values.Value<string>("InsulationMethod"),
+                    FromType = "2"
+                };
+                detailLists.Add(newDetail);
+            }
+            try
+            {
+                if (detailLists.Count > 0)
+                {
+                    Funs.DB.JGZL_IndustrialPipelineInstallationSummary.InsertAllOnSubmit(detailLists);
+                }
+                Funs.DB.SubmitChanges();
+            }
+            catch (Exception)
+            {
+                return;
+            }
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = string.Empty;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            string filePath = string.Empty;
+
+            //每页显示的固定数据行数
+            int rowsPerPage = 4;
+
+            string projectId = this.tvControlItem.SelectedNodeID;
+            if (!string.IsNullOrEmpty(projectId))
+            {
+                string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId and FromType='2'";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@ProjectId", projectId));
+                if (!string.IsNullOrEmpty(this.txtIsoNoS.Text))
+                {
+                    strSql += " And PipelineCode like @pipeLineCode";
+                    listStr.Add(new SqlParameter("@pipeLineCode", "%" + this.txtIsoNoS.Text + "%"));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                if (tb.Rows.Count > 0)
+                {
+                    initTemplatePath = Const.JGZL_IndustrialPipelineInstallationSummary2020Url;
+                    uploadfilepath = rootPath + initTemplatePath;
+
+                    newUrl = uploadfilepath.Replace("工业管道安装汇总表2020导出模板", "压力管道安装汇总表（2020版）");
+                    if (File.Exists(newUrl))
+                    {
+                        File.Delete(newUrl);
+                    }
+                    File.Copy(uploadfilepath, newUrl);
+                    //更新书签内容
+                    Document doc = new Aspose.Words.Document(newUrl);
+                    DocumentBuilder builder = new DocumentBuilder(doc);
+
+                    Aspose.Words.Tables.Table table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, 0, true);
+
+                    string certificateCode = string.Empty;
+                    string deliveryUnit = string.Empty;
+                    string deliveryUnitCode = string.Empty;
+                    string certificateId = tb.Rows[0]["CertificateId"].ToString();
+                    var certificate = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateById(certificateId);
+                    if (certificate != null)
+                    {
+                        certificateCode = certificate.CertificateCode;
+                        deliveryUnit = certificate.DeliveryUnit;
+                        deliveryUnitCode = certificate.DeliveryUnitCode;
+                    }
+
+                    Bookmark bookmark1 = doc.Range.Bookmarks["certificateCode"];
+                    if (bookmark1 != null)
+                    {
+                        bookmark1.Text = certificateCode;
+                    }
+                    Bookmark bookmark2 = doc.Range.Bookmarks["deliveryUnit"];
+                    if (bookmark2 != null)
+                    {
+                        bookmark2.Text = deliveryUnit;
+                    }
+                    Bookmark bookmark3 = doc.Range.Bookmarks["deliveryUnitCode"];
+                    if (bookmark3 != null)
+                    {
+                        bookmark3.Text = deliveryUnitCode;
+                    }
+
+                    // 设置表头行重复显示
+                    table.Rows[0].RowFormat.HeadingFormat = true;
+                    table.Rows[1].RowFormat.HeadingFormat = true;
+                    table.Rows[2].RowFormat.HeadingFormat = true;
+
+                    // 先记录页尾行，并从表格中移除
+                    //Row footerRow = table.Rows[table.Rows.Count - 1];
+                    //table.Rows.RemoveAt(table.Rows.Count - 1);
+
+                    for (int i = 0; i < tb.Rows.Count; i++)
+                    {
+                        //创建行
+                        Aspose.Words.Tables.Row row = new Aspose.Words.Tables.Row(doc);
+                        row.Cells.Add(CreateCell((i + 1).ToString(), doc, 22.68, "", ""));//序号
+                        row.Cells.Add(CreateCell(tb.Rows[i]["PipelineCode"].ToString(), doc, 65.49, "", ""));//单线号
+                        row.Cells.Add(CreateCell(tb.Rows[i]["PipelineLevel"].ToString(), doc, 37.14, "", ""));//管道级别
+                        row.Cells.Add(CreateCell(tb.Rows[i]["DesignPressure"].ToString(), doc, 27.78, "", ""));//设计压力
+                        row.Cells.Add(CreateCell(tb.Rows[i]["DesignTemperature"].ToString(), doc, 28.07, "", ""));//设计温度
+                        row.Cells.Add(CreateCell(tb.Rows[i]["OperatingTemperature"].ToString(), doc, 28, "", ""));//操作温度
+                        row.Cells.Add(CreateCell(tb.Rows[i]["Medium"].ToString(), doc, 34.86, "", ""));//输送介质
+                        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(tb.Rows[i]["Length"].ToString(), doc, 34.587, "", ""));//管道长度(m)
+                        row.Cells.Add(CreateCell(tb.Rows[i]["LayingMethod"].ToString(), doc, 33.74, "", ""));//铺设方式
+                        row.Cells.Add(CreateCell(tb.Rows[i]["WeldsNum"].ToString(), doc, 27, "", ""));//焊口数量
+                        row.Cells.Add(CreateCell(tb.Rows[i]["LosslessRatio"].ToString(), doc, 45.93, "", ""));//检测方法/比例(%)
+                        row.Cells.Add(CreateCell(tb.Rows[i]["VoltageResistantTestMedium"].ToString(), doc, 37.14, "", ""));//压力试验-介质
+                        row.Cells.Add(CreateCell(tb.Rows[i]["VoltageResistantTestPressure"].ToString(), doc, 30.62, "", ""));//压力试验-压力
+                        row.Cells.Add(CreateCell(string.Format("{0:yyyy.MM.dd}", tb.Rows[i]["VoltageResistantTestDate"]), doc, 48.76, "", ""));//压力试验-日期
+                        row.Cells.Add(CreateCell(tb.Rows[i]["LeakageTestMedium"].ToString(), doc, 25.23, "", ""));//泄漏性试验-介质
+                        row.Cells.Add(CreateCell(tb.Rows[i]["LeakageTestPressure"].ToString(), doc, 28.92, "", ""));//泄漏性试验-压力
+                        row.Cells.Add(CreateCell(string.Format("{0:yyyy.MM.dd}", tb.Rows[i]["LeakageTestDate"]), doc, 48.76, "", ""));//泄漏性试验-日期
+                        row.Cells.Add(CreateCell(tb.Rows[i]["CleaningMethod"].ToString(), doc, 26.08, "", ""));//吹洗方法
+                        row.Cells.Add(CreateCell(tb.Rows[i]["CorrosionControlMethod"].ToString(), doc, 56.7, "", ""));//防腐方式
+                        row.Cells.Add(CreateCell(tb.Rows[i]["InsulationMethod"].ToString(), doc, 22, "", ""));//保温（绝热）方式
+
+                        table.Rows.Insert(i + 3, row);
+                    }
+                    // 计算并插入空白行，填满整页
+                    // 计算总数据行数
+                    int totalDataRows = tb.Rows.Count;
+                    // 计算需要补充的空白行数量
+                    int remainder = totalDataRows % rowsPerPage;
+                    int needBlankRows = remainder == 0 ? 0 : rowsPerPage - remainder;
+
+                    //// 插入空白行（和数据行格式保持一致，仅内容为空）
+                    //for (int i = 0; i < needBlankRows - 1; i++)
+                    //{
+                    //    Aspose.Words.Tables.Row blankRow = new Aspose.Words.Tables.Row(doc);
+                    //    // 空白行的单元格宽度和数据行保持一致
+                    //    blankRow.Cells.Add(CreateCell("", doc, 22.68, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 65.49, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 37.14, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 27.78, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 28.07, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 28.06, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 34.86, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 43.66, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 59.82, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 34.587, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 33.74, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 27.78, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 45.93, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 37.14, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 30.62, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 48.76, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 25.23, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 28.92, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 48.76, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 26.08, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 56.7, "", ""));
+                    //    blankRow.Cells.Add(CreateCell("", doc, 22, "", ""));
+
+                    //    // 插入到表格最后一行
+                    //    table.Rows.Add(blankRow);
+                    //}
+                    //把页尾行重新加回表格最后
+                    //table.Rows.Add(footerRow);
+
+                    //自动设置表格样式
+                    table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+                    table.Alignment = TableAlignment.Center;
+
+                    doc.Save(newUrl);
+
+                    string fileName = Path.GetFileName(newUrl);
+                    FileInfo info = new FileInfo(newUrl);
+                    long fileSize = info.Length;
+                    Response.Clear();
+                    Response.ContentType = "application/x-zip-compressed";
+                    Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                    Response.AddHeader("Content-Length", fileSize.ToString());
+                    Response.TransmitFile(newUrl, 0, fileSize);
+                    Response.Flush();
+                    Response.Close();
+                    File.Delete(newUrl);
+                }
+                else
+                {
+                    Alert.ShowInTop("没有要导出的数据！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        public static Cell CreateCell(String value, Document doc, double cellWidth, string cellMerge = "", string CenterPage = "", string cellUnitLeft = "")
+        {
+            Cell cell = new Cell(doc);
+            Paragraph p = new Paragraph(doc);
+            if (!string.IsNullOrEmpty(cellMerge))
+            {
+                if (cellMerge == "0")
+                {
+                    cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.First;//竖直方向合并的第一个单元格
+                }
+                else
+                {
+                    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;//表格中字体居左
+            }
+            else
+            {
+                p.ParagraphFormat.Alignment = ParagraphAlignment.Center;//表格中字体居中 
+            }
+
+
+            p.AppendChild(new Run(doc, value));
+
+            cell.CellFormat.Width = cellWidth;
+
+            cell.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;
+
+            cell.CellFormat.Borders.LineWidth = 0.75;
+
+            cell.AppendChild(p);
+            return cell;
+        }
+
+        #endregion
     }
 }

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummary2020.aspx.designer.cs

@@ -22,5 +22,410 @@ namespace FineUIPro.Web.JGZL
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// drpProjectId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProjectId;
+
+        /// <summary>
+        /// tvControlItem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree tvControlItem;
+
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtIsoNoS 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIsoNoS;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnAdd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAdd;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnPrint 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnPrint;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// drpCertificateCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCertificateCode;
+
+        /// <summary>
+        /// txtDeliveryUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDeliveryUnit;
+
+        /// <summary>
+        /// txtDeliveryUnitCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDeliveryUnitCode;
+
+        /// <summary>
+        /// ToolbarFill2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill2;
+
+        /// <summary>
+        /// txtIsoNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIsoNo;
+
+        /// <summary>
+        /// txtPipelineLevel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPipelineLevel;
+
+        /// <summary>
+        /// txtDesignPressure 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDesignPressure;
+
+        /// <summary>
+        /// txtDesignTemperature 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDesignTemperature;
+
+        /// <summary>
+        /// txtOperatingTemperature 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtOperatingTemperature;
+
+        /// <summary>
+        /// txtMedium 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMedium;
+
+        /// <summary>
+        /// txtMaterial 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterial;
+
+        /// <summary>
+        /// txtSpecifications 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSpecifications;
+
+        /// <summary>
+        /// txtLength 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtLength;
+
+        /// <summary>
+        /// txtLayingMethod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtLayingMethod;
+
+        /// <summary>
+        /// txtWeldsNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldsNum;
+
+        /// <summary>
+        /// txtLosslessRatio 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtLosslessRatio;
+
+        /// <summary>
+        /// txtVoltageResistantTestMedium 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtVoltageResistantTestMedium;
+
+        /// <summary>
+        /// txtVoltageResistantTestPressure 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtVoltageResistantTestPressure;
+
+        /// <summary>
+        /// txtVoltageResistantTestDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtVoltageResistantTestDate;
+
+        /// <summary>
+        /// txtLeakageTestMedium 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtLeakageTestMedium;
+
+        /// <summary>
+        /// txtLeakageTestPressure 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtLeakageTestPressure;
+
+        /// <summary>
+        /// txtLeakageTestDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtLeakageTestDate;
+
+        /// <summary>
+        /// txtCleaningMethod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCleaningMethod;
+
+        /// <summary>
+        /// txtCorrosionControlMethod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCorrosionControlMethod;
+
+        /// <summary>
+        /// txtInsulationMethod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtInsulationMethod;
+
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// WindowPrint 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowPrint;
     }
 }

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationSummaryEdit.aspx.cs

@@ -71,7 +71,7 @@ namespace FineUIPro.Web.JGZL
                 if (!string.IsNullOrWhiteSpace(this.ProjectId))
                 {
                     //获取下拉选择项本项目下所有工业管道安装质量证明书信息
-                    IndustrialPipelineInstallationQualityCertificateService.InitIndustrialPipelineInstallationQualityCertificateDownList(this.drpCertificateCode, this.ProjectId, false);
+                    IndustrialPipelineInstallationQualityCertificateService.InitIndustrialPipelineInstallationQualityCertificateDownList(this.drpCertificateCode, this.ProjectId,"1", false);
                     this.drpPipelineCode.DataTextField = "ISO_IsoNo";
                     this.drpPipelineCode.DataValueField = "ISO_ID";
                     this.drpPipelineCode.DataSource = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);
@@ -84,7 +84,7 @@ namespace FineUIPro.Web.JGZL
                     if (report != null)
                     {
                         this.ProjectId = report.ProjectId;
-                        IndustrialPipelineInstallationQualityCertificateService.InitIndustrialPipelineInstallationQualityCertificateDownList(this.drpCertificateCode, this.ProjectId, false);
+                        IndustrialPipelineInstallationQualityCertificateService.InitIndustrialPipelineInstallationQualityCertificateDownList(this.drpCertificateCode, this.ProjectId,"1", false);
                         this.drpPipelineCode.DataTextField = "ISO_IsoNo";
                         this.drpPipelineCode.DataValueField = "ISO_ID";
                         this.drpPipelineCode.DataSource = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId);

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx

@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>压力管道安装质量证明书2020</title>
+    <title>工业管道安装质量证明书（2020版）</title>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="220px" Title="压力管道安装质量证明书2020" ShowBorder="true" Layout="VBox"
+                    EnableCollapse="true" Width="220px" Title="工业管道安装质量证明书（2020版）" ShowBorder="true" Layout="VBox"
                     ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
@@ -25,15 +25,15 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Items>
-                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="压力管道安装质量证明书2020" OnNodeCommand="tvControlItem_NodeCommand"
+                        <f:Tree ID="tvControlItem" ShowHeader="false" Title="工业管道安装质量证明书（2020版）" OnNodeCommand="tvControlItem_NodeCommand"
                             runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
                             AutoLeafIdentification="true" EnableSingleExpand="true" EnableTextSelection="true">
                         </f:Tree>
                     </Items>
                 </f:Panel>
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="压力管道安装质量证明书2020"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="工业管道安装质量证明书（2020版）"
-                    TitleToolTip="压力管道安装质量证明书2020" AutoScroll="true">
+                    TitleToolTip="工业管道安装质量证明书（2020版）" AutoScroll="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                             <Items>
@@ -42,7 +42,7 @@
                                 <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ValidateForms="SimpleForm1"
                                     OnClick="btnSave_Click">
                                 </f:Button>
-                                <f:Button ID="btnPrint" Text="打印压力管道安装质量证明书2020" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                <f:Button ID="btnPrint" Text="打印工业管道安装质量证明书（2020版）" Icon="Printer" runat="server" OnClick="btnPrint_Click">
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出Word" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
@@ -124,7 +124,7 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        <f:Window ID="WindowPrint" Title="打印压力管道安装质量证明书2020" Hidden="true" EnableIFrame="true" EnableMaximize="false"
+        <f:Window ID="WindowPrint" Title="打印工业管道安装质量证明书（2020版）" Hidden="true" EnableIFrame="true" EnableMaximize="false"
             Target="Top" EnableResize="true" runat="server" IsModal="true" Width="1024px"
             Height="600px">
         </f:Window>

HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs

@@ -393,7 +393,7 @@ namespace FineUIPro.Web.JGZL
                     initTemplatePath = Const.JGZL_IndustrialPipelineQualityCertificate2020Url;
                     uploadfilepath = rootPath + initTemplatePath;
 
-                    newUrl = uploadfilepath.Replace("压力管道安装质量证明2020导出模板", "压力管道安装质量证明2020");
+                    newUrl = uploadfilepath.Replace("压力管道安装质量证明2020导出模板", "工业管道安装质量证明书（2020版）");
                     if (File.Exists(newUrl))
                     {
                         File.Delete(newUrl);

HJGL_DS/FineUIPro.Web/JGZL/TestQuantityStatistics.aspx

@@ -27,8 +27,7 @@
                 <Items>                   
                     <f:Tree ID="tvControlItem" ShowHeader="false" Height="480px" Title="管道无损检测数量统计表"
                         OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
-                        EnableSingleClickExpand="true" OnNodeExpand="tvControlItem_NodeExpand" AutoLeafIdentification="true"
+                        AutoLeafIdentification="true" EnableTextSelection="true" Expanded="true">
-                        EnableTextSelection="true" Expanded="true">
                     </f:Tree>
                 </Items>
             </f:Panel>

HJGL_DS/FineUIPro.Web/JGZL/TestQuantityStatistics.aspx.cs

@@ -36,6 +36,7 @@ namespace FineUIPro.Web.JGZL
                 this.InitTreeMenu();//加载树
                 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
                 this.BindGrid();
+                this.txtTestingStandard.Text = "NB/T47013-2015";
             }
         }
         #endregion
@@ -48,7 +49,7 @@ namespace FineUIPro.Web.JGZL
         {
             this.tvControlItem.Nodes.Clear();
             TreeNode rootNode = new TreeNode();
-            rootNode.Text = "施工号-装置";
+            rootNode.Text = "施工号";
             rootNode.ToolTip = "项目";
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
@@ -66,15 +67,16 @@ namespace FineUIPro.Web.JGZL
                 rootProjectNode.Text = item.ProjectCode;
                 rootProjectNode.NodeID = item.ProjectId;
                 rootProjectNode.EnableExpandEvent = true;
+                rootProjectNode.EnableClickEvent = true;
                 rootProjectNode.ToolTip = item.ProjectName;
                 rootProjectNode.CommandName = "施工号";
                 rootNode.Nodes.Add(rootProjectNode);
 
-                TreeNode tn = new TreeNode();
+                //TreeNode tn = new TreeNode();
-                tn.NodeID = "temp";
+                //tn.NodeID = "temp";
-                tn.Text = "正在加载...";
+                //tn.Text = "正在加载...";
 
-                rootProjectNode.Nodes.Add(tn);
+                //rootProjectNode.Nodes.Add(tn);
             }
         }
 
@@ -83,38 +85,38 @@ namespace FineUIPro.Web.JGZL
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e)
+        //protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e)
-        {
+        //{
-            if (e.Node.Nodes != null)
+            //if (e.Node.Nodes != null)
-            {
+            //{
-                e.Node.Nodes.Clear();
+            //    e.Node.Nodes.Clear();
-            }
+            //}
-            List<Model.Project_Installation> list = (from x in Funs.DB.Project_Installation where x.ProjectId == e.NodeID select x).ToList();
+            //List<Model.Project_Installation> list = (from x in Funs.DB.Project_Installation where x.ProjectId == e.NodeID select x).ToList();
 
-            this.BindNodes(e.Node, list);
+            //this.BindNodes(e.Node, list);
-        }
+        //}
 
         /// <summary>
         ///  绑定树节点
         /// </summary>
         /// <param name="node"></param>
-        private void BindNodes(TreeNode node, List<Model.Project_Installation> treeLists)
+        //private void BindNodes(TreeNode node, List<Model.Project_Installation> treeLists)
-        {
+        //{
-            if (node.CommandName == "施工号")
+        //    if (node.CommandName == "施工号")
-            {
+        //    {
-                var lists = (from x in treeLists orderby x.InstallationCode descending select x).Distinct();
+        //        var lists = (from x in treeLists orderby x.InstallationCode descending select x).Distinct();
-                foreach (var item in lists)
+        //        foreach (var item in lists)
-                {
+        //        {
-                    TreeNode newNode = new TreeNode();
+        //            TreeNode newNode = new TreeNode();
-                    newNode.Text = item.InstallationCode;
+        //            newNode.Text = item.InstallationCode;
-                    newNode.NodeID = item.InstallationId;
+        //            newNode.NodeID = item.InstallationId;
-                    newNode.ToolTip = item.InstallationName;
+        //            newNode.ToolTip = item.InstallationName;
-                    newNode.CommandName = "装置";
+        //            newNode.CommandName = "装置";
-                    newNode.EnableClickEvent = true;
+        //            newNode.EnableClickEvent = true;
-                    node.Nodes.Add(newNode);
+        //            node.Nodes.Add(newNode);
-                }
+        //        }
-            }
+        //    }
-        }
+        //}
         #endregion
 
         #region 点击TreeView
@@ -125,7 +127,7 @@ namespace FineUIPro.Web.JGZL
         /// <param name="e"></param>
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
-            BindPage();
+            //BindPage();
             BindGrid();
         }
         #endregion
@@ -136,44 +138,44 @@ namespace FineUIPro.Web.JGZL
         /// </summary>
         private void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && this.tvControlItem.SelectedNodeID != "0")
             {
                 string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";//AND InstallationId = @InstallationId";
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
-                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
+                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.NodeID));
                 //listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
+                //DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
                 // 2.获取当前分页数据
                 //var table = this.GetPagedDataTable(Grid1, tb1);
-                Grid1.RecordCount = rows.Count();
+                Grid1.RecordCount = tb.Rows.Count;
                 //tb = GetFilteredTable(Grid1.FilteredData, tb);
-                //var table = this.GetPagedDataTable(Grid1, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
 
-                Grid1.DataSource = rows;
+                Grid1.DataSource = table;
                 Grid1.DataBind();
             }
         }
 
-        private void BindPage()
+        //private void BindPage()
-        {
+        //{
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            //if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
-            {
+            //{
-                var ins = BLL.Project_InstallationService.GetInstallationByInstallationId(this.tvControlItem.SelectedNodeID);
+                //var ins = BLL.Project_InstallationService.GetInstallationByInstallationId(this.tvControlItem.SelectedNodeID);
-                if (ins != null)
+                //if (ins != null)
-                {
+                //{
-                    this.txtWorkAreaCode.Text = ins.InstallationCode;
+                //    this.txtWorkAreaCode.Text = ins.InstallationCode;
-                }
+                //}
-                this.txtTestingStandard.Text = "NB/T47013-2015";
+                //this.txtTestingStandard.Text = "NB/T47013-2015";
-            }
+            //}
-            else
+            //else
-            {
+            //{
-                this.txtWorkAreaCode.Text = string.Empty;
+            //    this.txtWorkAreaCode.Text = string.Empty;
-            }
+            //}
-        }
+        //}
         #endregion
 
         #region 排序
@@ -444,16 +446,16 @@ namespace FineUIPro.Web.JGZL
             string rootPath = Server.MapPath("~/");
             BLL.Common.FastReportService.ResetData();
 
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && this.tvControlItem.SelectedNodeID!="0")
             {
                 string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
-                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
+                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.NodeID));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
+                //DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
 
                 DataTable dt = new DataTable();
                 dt.TableName = "Data";
@@ -473,10 +475,10 @@ namespace FineUIPro.Web.JGZL
                 dt.Columns.Add("Mt3Num");
                 dt.Columns.Add("Pt3Num");
 
-                //DataView dv = tb.DefaultView;//获取表视图
+                DataView dv = tb.DefaultView;//获取表视图
-                //dv.Sort = "ISO_IsoNo ASC";//按照ID倒序排序
+                dv.Sort = "IsoNo ASC";//按照ID倒序排序
-                //tb = dv.ToTable();//转为表
+                tb = dv.ToTable();//转为表
-                //DataRow[] rows = tb.DefaultView.ToTable().Select();
+                DataRow[] rows = tb.DefaultView.ToTable().Select();
                 foreach (var row in rows)
                 {
                     var newRows = dt.NewRow();
@@ -502,7 +504,7 @@ namespace FineUIPro.Web.JGZL
 
                 //传参
                 Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
-                keyValuePairs.Add("projectName", BLL.Base_ProjectService.GetProjectByProjectId(this.tvControlItem.SelectedNode.ParentNode.NodeID).ProjectName);
+                keyValuePairs.Add("projectName", BLL.Base_ProjectService.GetProjectByProjectId(this.tvControlItem.SelectedNode.NodeID).ProjectName);
                 keyValuePairs.Add("workAreaCode", txtWorkAreaCode.Text.Trim());
                 keyValuePairs.Add("testCategoryNumber", txtTestCategoryNumber.Text.Trim());
                 keyValuePairs.Add("acceptanceCriteria", txtAcceptanceCriteria.Text.Trim());

HJGL_DS/Model/Model.cs

@@ -89513,6 +89513,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _LeakageTestDate;
 		
+		private string _FromType;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Sys_User> _Sys_User;
@@ -89585,6 +89587,8 @@ namespace Model
     partial void OnVoltageResistantTestDateChanged();
     partial void OnLeakageTestDateChanging(System.Nullable<System.DateTime> value);
     partial void OnLeakageTestDateChanged();
+    partial void OnFromTypeChanging(string value);
+    partial void OnFromTypeChanged();
     #endregion
 		
 		public JGZL_IndustrialPipelineInstallationSummary()
@@ -90242,6 +90246,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FromType", DbType="Char(1)")]
+		public string FromType
+		{
+			get
+			{
+				return this._FromType;
+			}
+			set
+			{
+				if ((this._FromType != value))
+				{
+					this.OnFromTypeChanging(value);
+					this.SendPropertyChanging();
+					this._FromType = value;
+					this.SendPropertyChanged("FromType");
+					this.OnFromTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_IndustrialPipelineInstallationSummary_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{