From 18060bfd7155e97690825ecf63148ae60170c339 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Fri, 9 May 2025 17:43:11 +0800
Subject: [PATCH] =?UTF-8?q?20250509=20=E4=BF=AE=E6=94=B9=E7=84=8A=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=A4=B4=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WeldingJointInspection.aspx.cs            |  8 ++++++++
 .../管道对接焊接接头报检检查记录.frx          |  4 ++--
 .../Fastreport/管道焊接接头报检检查记录.frx   | 17 +++++++++--------
 .../WeldInspectionCheckRecordItem.aspx.cs     | 19 +++++++++++++------
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
index 215f6bf..a09a319 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
@@ -243,6 +243,14 @@ namespace FineUIPro.Web.ContinuousPrint
                         keyValuePairs.Add("ProjectName", hidProjectName.Value);
                         keyValuePairs.Add("InspectionCount", tb.Rows.Count.ToString());
                         keyValuePairs.Add("NDTRName", "100%");
+                        if (hidJOTY_Group.Value=="1")
+                        {
+                            keyValuePairs.Add("NDTType", "RT");
+                        }
+                        else
+                        {
+                            keyValuePairs.Add("NDTType", "PT");
+                        }
                         BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
                         initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx";
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx
index 174dddd..6a0ef4e 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/22/2024 15:19:04" ReportInfo.Modified="01/25/2025 14:54:38" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/22/2024 15:19:04" ReportInfo.Modified="05/09/2025 16:32: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="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJmbt/jcfBCOeWnhhH2EFB8w==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJjJwuY6vI3N7IrkA/ctinjQ==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="WED_Code" DataType="System.String" PropName="image_series"/>
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx
index 28c3174..840c70b 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="05/06/2025 10:47:45" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="05/09/2025 17:37:32" 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="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJ2zHgeY/nnHkHM76QBUX8YA==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJYkylh3TFKXnBuJv63PwUGw==">
       <TableDataSource Name="Attach_Image" Alias="Data" DataType="System.Int32" Enabled="true" TableName="Attach_Image">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ISO_IsoNo" DataType="System.String" PropName="image_series"/>
@@ -62,8 +62,9 @@ namespace FastReport
     <Parameter Name="ProjectName" DataType="System.String"/>
     <Parameter Name="InspectionCount" DataType="System.String"/>
     <Parameter Name="NDTRName" DataType="System.String"/>
+    <Parameter Name="NDTType" DataType="System.String"/>
   </Dictionary>
-  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,970.7,226.8,94.5,47.25,708.75,66.15,37.8,56.7,75.6,85.05,828.95,904.55,132.3,321.3,425.25,623.7,772.25,179.55,491.4,548.1,63.5,387.45,971.32,481.89">
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" LeftMargin="20" TopMargin="25" RightMargin="20" BottomMargin="21" FirstPageSource="4" OtherPagesSource="4" Guides="0,970.7,226.8,94.5,47.25,708.75,66.15,37.8,56.7,75.6,85.05,828.95,904.55,132.3,321.3,425.25,623.7,772.25,179.55,491.4,548.1,63.5,971.32,481.89">
     <PageHeaderBand Name="PageHeader1" Width="971.46" Height="179.55" Guides="0,179.55,94.5,18.9,47.25,66.15,28.35,122.85,151.2">
       <TableObject Name="Table1" Width="970.7" Height="179.55">
         <TableColumn Name="Column1" Width="37.8"/>
@@ -135,19 +136,19 @@ namespace FastReport
         <TableRow Name="Row3" Height="28.35">
           <TableCell Name="Cell11" Border.Lines="All" Text="报检/检查记录编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
           <TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell13" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell13" Border.Lines="All" Text="/" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
           <TableCell Name="Cell14" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell50" Border.Lines="All" Text="无损检测方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
           <TableCell Name="Cell51" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell52" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell52" Border.Lines="All" Text="[NDTType]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
           <TableCell Name="Cell53" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell54" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell55" Border.Lines="All" Text="报检数量" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell56" Border.Lines="All" Text="[InspectionCount]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell56" Border.Lines="All" Text="[InspectionCount]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell57" Border.Lines="All" Text="检测比例" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
           <TableCell Name="Cell58" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell59" Border.Lines="All" Text="[NDTRName]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell59" Border.Lines="All" Text="[NDTRName]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row4" Height="28.35">
           <TableCell Name="Cell16" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
@@ -164,7 +165,7 @@ namespace FastReport
           <TableCell Name="Cell68" Border.Lines="All" Text="实际预热温度&#13;&#10;℃" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
           <TableCell Name="Cell69" Border.Lines="All" Text="焊缝外观检查" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
           <TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell71" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell71" Border.Lines="All" Text="合格" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row5" Height="28.35">
           <TableCell Name="Cell21" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs
index 9c89c3d..2824200 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs
@@ -208,7 +208,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
-            Grid1.DataBind();            
+            Grid1.DataBind();
         }
         #endregion
 
@@ -364,7 +364,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                     row["index"] = 0;
                 }
             }
-             tb.Columns.Add("indexS", typeof(System.String));
+            tb.Columns.Add("indexS", typeof(System.String));
             foreach (DataRow row in tb.Rows)
             {
                 try
@@ -387,7 +387,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
                 var newRows = dt.NewRow();
                 //if (i + 1 < rows.Count())
                 //{
-                    newRows["Number"] = i + 1;
+                newRows["Number"] = i + 1;
                 //}
                 newRows["WED_Code"] = row["WED_Code"].ToString();
                 newRows["ISO_IsoNo"] = row["ISO_IsoNo"].ToString();
@@ -417,7 +417,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
             }
-
         }
 
 
@@ -482,7 +481,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", ProjectId));
-            listStr.Add(new SqlParameter("@ISO_ID",this.ISO_ID));
+            listStr.Add(new SqlParameter("@ISO_ID", this.ISO_ID));
             listStr.Add(new SqlParameter("@VICheckDate", vICheckDate.Replace("/", "-")));
             listStr.Add(new SqlParameter("@NDTR_ID", this.NDTR_ID));
             listStr.Add(new SqlParameter("@JOTY_Group", JOTY_Group));
@@ -567,8 +566,16 @@ namespace FineUIPro.Web.HJGL.WeldingReport
             //传参
             Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
             keyValuePairs.Add("ProjectName", projectName);
-            keyValuePairs.Add("InspectionCount", tb.Rows.Count.ToString()+"个");
+            keyValuePairs.Add("InspectionCount", tb.Rows.Count.ToString() + "个");
             keyValuePairs.Add("NDTRName", ndtrName);
+            if (JOTY_Group == "1")
+            {
+                keyValuePairs.Add("NDTType", "RT");
+            }
+            else
+            {
+                keyValuePairs.Add("NDTType", "PT");
+            }
             BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
             initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx";