1

2025-07-10 17:21:10 +08:00
parent ac37e4b7fa
commit dc43dbeae8
2 changed files with 10 additions and 5 deletions
@@ -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++;
                }