From d6016a9e3ef26a99f5eb5dfa5cc68644e3091800 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Fri, 10 Oct 2025 09:35:09 +0800
Subject: [PATCH] =?UTF-8?q?20251010=20=E7=84=8A=E6=8E=A5=E6=8E=A5=E5=A4=B4?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=8A=A5=E9=AA=8C=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContinuousPrint/WeldingJointInspection.aspx.cs        | 2 +-
 HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx    | 8 ++++----
 .../File/Fastreport/管道焊接接头报检检查记录.frx          | 4 ++--
 HJGL_DS/FineUIPro.Web/Web.config                          | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
index 06ee3a7..085f261 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.ContinuousPrint
                             left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID
                             LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
                             left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID
-                            LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
+                            LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = batch.JOTY_ID
                             LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", ProjectId));
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx
index c8d6592..d0e8706 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/21/2024 15:06:49" ReportInfo.Modified="09/25/2025 13:54:53" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/21/2024 15:06:49" ReportInfo.Modified="09/25/2025 14:16: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+/QFqdiXkVUXZTXWWkaVr6vXzQ==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFLsbctPP35IDspe10eEn2TQ==">
       <TableDataSource Name="MainData" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="MainData">
         <Column Name="ProjectName" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ProjectCode" DataType="System.String" PropName="image_series"/>
@@ -111,11 +111,11 @@ namespace FastReport
         </TableRow>
         <TableRow Name="Row6" Height="36.61">
           <TableCell Name="Cell31" Border.Lines="All" Text="委托单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell32" Border.Lines="All" Text="[MainData.UnitName]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell32" Border.Lines="All" Text="浙江鼎盛石化工程有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
           <TableCell Name="Cell33" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
           <TableCell Name="Cell35" Border.Lines="All" Text="热处理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell36" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell36" Border.Lines="All" Text="吴江市天宇工程技术服务有限公司" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row7" Height="36.61">
           <TableCell Name="Cell37" Border.Lines="All" Text="委托单编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx
index b39a8c5..ce68404 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="09/02/2025 15:21:41" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="10/10/2025 08:56:59" 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+/QFosjZ/ejXg9zfJILxJtNSOA==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFYWFXLbIr+BdWSARr+sdz5Q==">
       <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"/>
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index e233efb..5c46a5b 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>