From 1f7e8e551dc7760d36c0edd965df97852eeb915c Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 28 Apr 2026 09:58:51 +0800
Subject: [PATCH] =?UTF-8?q?20260428=20=E9=A1=B9=E7=9B=AE=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E9=87=8F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/HJGLDB_DS_2026-04-28_bwj.sql           | 9 ++-------
 .../HJGL/WeldingReport/IsoCmprehensive.aspx.cs           | 9 ++++++++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/DataBase/版本日志/HJGLDB_DS_2026-04-28_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-04-28_bwj.sql
index 2e701b9..86a0ba5 100644
--- a/DataBase/版本日志/HJGLDB_DS_2026-04-28_bwj.sql
+++ b/DataBase/版本日志/HJGLDB_DS_2026-04-28_bwj.sql
@@ -97,18 +97,13 @@ FROM
    (SELECT ISO_ID,COUNT(jot.JOT_ID) AS total_fjot
       FROM dbo.HJGL_PW_JointInfo jot
            LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
-      WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) 
-		    AND jot.DReportID is not NULL 
-		    AND jot.WLO_Code='F'
+      WHERE jot.WLO_Code='F'
       GROUP BY ISO_ID) v6 ON v6.ISO_ID=v.ISO_ID 
 --Ô¤Öƺ¸¿Ú	  	  
   LEFT JOIN  
    (SELECT ISO_ID,COUNT(jot.JOT_ID) AS total_sjot
       FROM dbo.HJGL_PW_JointInfo jot
-           LEFT join HJGL_BO_WeldReportMain AS weldreport on weldreport.DReportID=jot.DReportID
-      WHERE (weldreport.JOT_WeldDate>=@StartDate or @StartDate is null) and (weldreport.JOT_WeldDate<=@EndDate or @EndDate is null) 
-		    AND jot.DReportID is not NULL 
-		    AND jot.WLO_Code='S'
+      WHERE jot.WLO_Code='S'
       GROUP BY ISO_ID) v7 ON v7.ISO_ID=v.ISO_ID       
       
    LEFT JOIN dbo.HJGL_PW_IsoInfo iso ON iso.ISO_ID = v.ISO_ID  
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
index 6cdeb1a..8de4377 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs
@@ -76,6 +76,9 @@
                 int check_total_jot = 0;
                 int total_repairjot = 0;
 
+                int total_sjot = 0;
+                int total_fjot = 0;
+
                 foreach (DataRow row in tb.Rows)
                 {
                     total_din += Convert.ToDouble(row["total_din"]);
@@ -95,6 +98,8 @@
                     trust_total_jot += Convert.ToInt32(row["trust_total_jot"]);
                     check_total_jot += Convert.ToInt32(row["check_total_jot"]);
                     total_repairjot += Convert.ToInt32(row["total_repairjot"]);
+                    total_sjot += Convert.ToInt32(row["total_sjot"]);
+                    total_fjot += Convert.ToInt32(row["total_fjot"]);
                 }
                 todo_total_din = total_din - finished_total_din;
 
@@ -126,6 +131,8 @@
                 summary.Add("trust_total_jot", trust_total_jot.ToString());
                 summary.Add("check_total_jot", check_total_jot.ToString());
                 summary.Add("total_repairjot", total_repairjot.ToString());
+                summary.Add("total_sjot", total_sjot.ToString());
+                summary.Add("total_fjot", total_fjot.ToString());
 
                 Grid1.SummaryData = summary;
             }
@@ -196,7 +203,7 @@
             //}
 
             this.Grid1.RecordCount = tb.Rows.Count;
-            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();