From a596fd72733a218b256e6ca7defd6679dba05729 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 12 Sep 2025 11:27:41 +0800 Subject: [PATCH] =?UTF-8?q?20250912=20=E4=BF=AE=E6=94=B9=E7=84=8A=E6=8E=A5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WeldingReport/WeldingStatistical.aspx.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs index d620c4b..715ab95 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WeldingStatistical.aspx.cs @@ -214,14 +214,25 @@ namespace FineUIPro.Web.HJGL.WeldingReport double AvgDayCompletedDin = 0.0f; double finished_current_day_din = 0.0f; + List lists = new List(); + foreach (DataRow row in tb.Rows) { - total_jot += Convert.ToInt32(row["total_jot"]); - total_din += Convert.ToDouble(row["total_din"]); + string areaid = row["WorkAreaId"].ToString(); + + //多个班组同一个区域只合计一个 + if (!lists.Exists(x => x.EndsWith(areaid))) + { + total_jot += Convert.ToInt32(row["total_jot"]); + total_din += Convert.ToDouble(row["total_din"]); + RemainingDain += Convert.ToDouble(row["RemainingDain"]); + + lists.Add(areaid); + } finished_total_din_bq += Convert.ToDouble(row["finished_total_din_bq"]); - RemainingDain += Convert.ToDouble(row["RemainingDain"]); AvgDayCompletedDin += Convert.ToDouble(row["AvgDayCompletedDin"]); finished_current_day_din += Convert.ToDouble(row["finished_current_day_din"]); + } JObject summary = new JObject