From 2f9d98c2da8c632430d2320ca9b6a2ef4cf7bac7 Mon Sep 17 00:00:00 2001
From: geh <1923421292@qq.com>
Date: Fri, 22 Aug 2025 10:38:41 +0800
Subject: [PATCH] 1

---
 .../ZHGL/CQMSData/WeldingData.aspx.cs         | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/SGGL/FineUIPro.Web/ZHGL/CQMSData/WeldingData.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/CQMSData/WeldingData.aspx.cs
index b0d0267d..8b86d520 100644
--- a/SGGL/FineUIPro.Web/ZHGL/CQMSData/WeldingData.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/CQMSData/WeldingData.aspx.cs
@@ -91,10 +91,27 @@ namespace FineUIPro.Web.ZHGL.CQMSData
                 
                 #region PQR/WPS报验
 
-                
-                // var detailsGrid9 = (from x in db.Report_Construction_Plan
-                    // where x.ReportId == ReportId && x.ReType == "5"
-                    // select x).ToList();
+                var query = (from x in db.Report_Construction_Plan
+                    join y in db.Report_WeekAndMonthReport_New on x.ReportId equals y.Id into yJoin
+                    from y in yJoin.DefaultIfEmpty()
+                    where y.ProjectId == project.ProjectId && x.ReType == "5"
+                    select new
+                    {
+                        x.Quantity1,
+                        x.Quantity2,
+                        x.Quantity3,
+                        x.QuaRate,
+                        y.CreateDate
+                    }).ToList();
+
+                var sum1 = query.Sum(x => x.Quantity1 ?? 0);
+                var sum2 = query.Sum(x => x.Quantity2 ?? 0);
+                var sum3 = query.Sum(x => x.Quantity3 ?? 0);
+                value10 = sum1 + sum2 + sum3;
+                var sum4 = query.Where(x => x.CreateDate >= firstDayOfMonth).Sum(x => x.Quantity1 ?? 0);
+                var sum5 = query.Where(x => x.CreateDate >= firstDayOfMonth).Sum(x => x.Quantity2 ?? 0);
+                var sum6 = query.Where(x => x.CreateDate >= firstDayOfMonth).Sum(x => x.Quantity3 ?? 0);
+                value9 = sum4 + sum5 + sum6;
 
                 #endregion