From a74a574ca4d4a2eb729c48739751b1e4aa69100b Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 18 Jul 2024 14:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                         |  1 +
 HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj         |  2 +-
 .../HotProessManage/HotProessManageEdit.aspx.cs    | 14 ++++++++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1515a28..275b24f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,4 @@ HJGL_ZH/BLL/bin/Release/NPOI.OpenXmlFormats.dll
 /HJGL_ZH/packages
 /HJGL_ZH/WebAPI/bin
 /HJGL_ZH/WebAPI/obj
+/ReleasePackerALL2017.bat
diff --git a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
index 379e832..b3e2a64 100644
--- a/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_ZH/FineUIPro.Web/FineUIPro.Web.csproj
@@ -101,7 +101,7 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="ThoughtWorks.QRCode">
-      <HintPath>bin\ThoughtWorks.QRCode\X86\1.0.2774.19990\ThoughtWorks.QRCode.dll</HintPath>
+      <HintPath>..\..\..\New\HJGL_ZH\FineUIPro.Web\bin\ThoughtWorks.QRCode.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs
index 440143c..93d0e7c 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs
@@ -127,9 +127,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                                   HotProessItem.RequestTime,HotProessItem.ActualTime,HotProessItem.RecordChartNo,
                                   HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,
 (SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode  FROM dbo.HJGL_CH_HardTestReport 
- WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item 
- left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
-   WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))  
+ WHERE HardTestReportId =t.HardTestReportId)  
  AS HardnessReportNo,
                                   HotProessItem.HotProessItemId,HotProessItem.SortIndex,HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
                             FROM dbo.HJGL_HotProessItem AS HotProessItem
@@ -144,6 +142,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                                                            left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID
                                                            where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v
                                                            on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId
+                            left join (SELECT distinct re.HardTestReportId,item.JOT_ID,item.HotProessTrustId FROM dbo.HJGL_CH_HardTestReportItem item 
+ left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
+   WHERE (re.FileType='R' or re.FileType is null)) t on t.JOT_ID=HotProessItem.JOT_ID and t.HotProessTrustId=HotProessItem.HotProessTrustId
                             WHERE JointInfo.ProjectId= @ProjectId ";
                 listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID));
                 if (this.drpIsoNo.SelectedValue != BLL.Const._Null)
@@ -188,9 +189,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                                  HotProessItem.ActualTime,HotProessItem.RecordChartNo,
                                  HotProessItem.HotProessDate,HotProessItem.HotProessTrustId,HotProessItem.HotProessItemId,HotProessItem.SortIndex,
                                  (SELECT (case when HotHardCode is null then HardTestReportCode else HotHardCode end) as HardTestReportCode  FROM dbo.HJGL_CH_HardTestReport 
- WHERE HardTestReportId =(SELECT TOP 1 re.HardTestReportId FROM dbo.HJGL_CH_HardTestReportItem item 
- left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
-   WHERE item.JOT_ID=HotProessItem.JOT_ID AND item.HotProessTrustId=HotProessItem.HotProessTrustId and (re.FileType='R' or re.FileType is null)))  
+ WHERE HardTestReportId =t.HardTestReportId)  
  AS HardnessReportNo,
                                  HotProessItem.ProessTypes,JointInfo.JOT_JointDesc,isnull(HotProessItem.Remark,'') as Remark
                            FROM dbo.HJGL_HotProessItem AS HotProessItem
@@ -205,6 +204,9 @@ namespace FineUIPro.Web.HJGL.HotProessManage
                                                            left join dbo.HJGL_HotProessItem h on h.JOT_ID=TrustItem.JOT_ID
                                                            where h.JOT_ID = TrustItem.JOT_ID and h.HotProessTrustId=TrustItem.HotProessTrustId and h.ProessTypes=TrustItem.ProessTypes) v
                                                            on v.JOT_ID=HotProessItem.JOT_ID and v.HotProessItemId=HotProessItem.HotProessItemId 
+                                left join (SELECT distinct re.HardTestReportId,item.JOT_ID,item.HotProessTrustId FROM dbo.HJGL_CH_HardTestReportItem item 
+ left join dbo.HJGL_CH_HardTestReport re on item.HardTestReportId=re.HardTestReportId
+   WHERE (re.FileType='R' or re.FileType is null)) t on t.JOT_ID=HotProessItem.JOT_ID and t.HotProessTrustId=HotProessItem.HotProessTrustId
                            WHERE CHARINDEX(JointInfo.ProjectId,@ProjectId)>0 ";
                 listStr.Add(new SqlParameter("@ProjectId", projectIds));
                 if (this.drpIsoNo.SelectedValue != BLL.Const._Null)