This commit is contained in:
高飞 2025-07-10 17:21:10 +08:00
parent ac37e4b7fa
commit dc43dbeae8
2 changed files with 10 additions and 5 deletions

View File

@ -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++;
}

View File

@ -19738,7 +19738,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">