From dc43dbeae8850fbe958718daa10d2c152349499d Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 10 Jul 2025 17:21:10 +0800
Subject: [PATCH] 1
---
.../QuantityManagement/DayInputStatistics.aspx.cs | 13 +++++++++----
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs
index 171a6e8..f621084 100644
--- a/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/QuantityManagement/DayInputStatistics.aspx.cs
@@ -306,11 +306,16 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
decimal monthComplete = 0;
foreach (var d in days)
{
- var dayInput = dayInputs.FirstOrDefault(x => x.BaseId == baseId && x.Date == d && x.WorkTeam == workTeamId);
- if (dayInput != null)
+ var dayInputs = dayInputs.Where(x => x.BaseId == baseId && x.Date == d && x.WorkTeam == workTeamId);
+ if (dayInputs.Count() > 0)
{
- this.Grid1.Rows[i].Values[14 + j] = dayInput.DayAmount.Value.ToString("0.##");
- monthComplete += dayInput.DayAmount.Value;
+ decimal c = 0;
+ foreach (var item in collection)
+ {
+ c += dayInput.DayAmount ?? 0;
+ }
+ this.Grid1.Rows[i].Values[14 + j] = c.ToString("0.##");
+ monthComplete += c;
}
j++;
}
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 46eb2dd..6f03813 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19738,7 +19738,7 @@
-
+