From 40eab764a164e9eaee78caef8e9a3f63aaa8fc7b Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 24 Feb 2026 10:00:17 +0800
Subject: [PATCH] =?UTF-8?q?20260224=20=E4=BA=A4=E5=B7=A5=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...2026-02-23_bwj.sql => HJGLDB_DS_2026-02-24_bwj.sql} |  0
 HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs | 14 ++++++++++----
 ...eTestOfPipelineSystemConfirmationRecord.aspx.cs |  2 +-
 .../PressureTestOfPipelineSystemRecord.aspx.cs     | 12 +++++++++---
 4 files changed, 20 insertions(+), 8 deletions(-)
 rename DataBase/版本日志/{HJGLDB_DS_2026-02-23_bwj.sql => HJGLDB_DS_2026-02-24_bwj.sql} (100%)

diff --git a/DataBase/版本日志/HJGLDB_DS_2026-02-23_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-02-24_bwj.sql
similarity index 100%
rename from DataBase/版本日志/HJGLDB_DS_2026-02-23_bwj.sql
rename to DataBase/版本日志/HJGLDB_DS_2026-02-24_bwj.sql
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
index 0b594e8..32ce459 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/BlowingCleaning.aspx.cs
@@ -362,7 +362,7 @@ namespace FineUIPro.Web.JGZL
                     BLL.Common.FastReportService.AddFastreportTable(dt);
 
                     var itemList = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId);
-                    if (this.drpIsoNoS.SelectedValue!=BLL.Const._Null&&!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
+                    if (this.drpIsoNoS.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue))
                     {
                         itemList = itemList.Where(x => x.ISO_Id.Contains(this.drpIsoNoS.SelectedValue)).ToList();
                     }
@@ -391,11 +391,17 @@ namespace FineUIPro.Web.JGZL
                     Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                     //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
                     BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+                    initTemplatePath = "File\\Fastreport\\JGZL\\管道吹扫、清洗检验记录.frx";
+                    if (File.Exists(rootPath + initTemplatePath))
+                    {
+                        PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+                    }
                 }
-                initTemplatePath = "File\\Fastreport\\JGZL\\管道吹扫、清洗检验记录.frx";
-                if (File.Exists(rootPath + initTemplatePath))
+                else
                 {
-                    PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+                    Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning);
+                    return;
                 }
             }
             else
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs
index a5b7def..87f7419 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemConfirmationRecord.aspx.cs
@@ -371,7 +371,7 @@ namespace FineUIPro.Web.JGZL
                 BLL.Common.FastReportService.ResetData();
 
                 var report = (from x in Funs.DB.JGZL_PressureTestOfPipelineSystemConfirmationRecord where x.ProjectId == projectId select x);
-                if (report != null)
+                if (report.Count() > 0)
                 {
                     Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
                     keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
index 9c663fb..3663a31 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs
@@ -380,11 +380,17 @@ namespace FineUIPro.Web.JGZL
                     keyValuePairs.Add("TestConclusion", report.TestConclusion);
                     keyValuePairs.Add("Remark", report.Remark);
                     BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+                    initTemplatePath = "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx";
+                    if (File.Exists(rootPath + initTemplatePath))
+                    {
+                        PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+                    }
                 }
-                initTemplatePath = "File\\Fastreport\\JGZL\\管道系统压力试验记录.frx";
-                if (File.Exists(rootPath + initTemplatePath))
+                else
                 {
-                    PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+                    Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning);
+                    return;
                 }
             }
             else