This commit is contained in:
parent
ac37e4b7fa
commit
dc43dbeae8
|
@ -306,11 +306,16 @@ namespace FineUIPro.Web.CQMS.QuantityManagement
|
||||||
decimal monthComplete = 0;
|
decimal monthComplete = 0;
|
||||||
foreach (var d in days)
|
foreach (var d in days)
|
||||||
{
|
{
|
||||||
var dayInput = dayInputs.FirstOrDefault(x => x.BaseId == baseId && x.Date == d && x.WorkTeam == workTeamId);
|
var dayInputs = dayInputs.Where(x => x.BaseId == baseId && x.Date == d && x.WorkTeam == workTeamId);
|
||||||
if (dayInput != null)
|
if (dayInputs.Count() > 0)
|
||||||
{
|
{
|
||||||
this.Grid1.Rows[i].Values[14 + j] = dayInput.DayAmount.Value.ToString("0.##");
|
decimal c = 0;
|
||||||
monthComplete += dayInput.DayAmount.Value;
|
foreach (var item in collection)
|
||||||
|
{
|
||||||
|
c += dayInput.DayAmount ?? 0;
|
||||||
|
}
|
||||||
|
this.Grid1.Rows[i].Values[14 + j] = c.ToString("0.##");
|
||||||
|
monthComplete += c;
|
||||||
}
|
}
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -19738,7 +19738,7 @@
|
||||||
</FlavorProperties>
|
</FlavorProperties>
|
||||||
</VisualStudio>
|
</VisualStudio>
|
||||||
</ProjectExtensions>
|
</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.
|
<!-- 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.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
<Target Name="BeforeBuild">
|
<Target Name="BeforeBuild">
|
||||||
|
|
Loading…
Reference in New Issue