提交代码

This commit is contained in:
2023-10-25 14:23:55 +08:00
parent ce1e237663
commit 250e09a355
2 changed files with 5 additions and 11 deletions
@@ -1100,11 +1100,8 @@ namespace BLL
decimal physicalCompletionQuantity = 0, materialConsumption = 0;
if (we.Count() > 0)
{
foreach (var w in we)
{
physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
materialConsumption += w.MaterialConsumption ?? 0;
}
physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
row[9] = physicalCompletionQuantity;
row[10] = materialConsumption;
}
@@ -1188,11 +1185,8 @@ namespace BLL
decimal physicalCompletionQuantity = 0, materialConsumption = 0;
if (we.Count() > 0)
{
foreach (var w in we)
{
physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
materialConsumption += w.MaterialConsumption ?? 0;
}
physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
row[9] = physicalCompletionQuantity;
row[10] = materialConsumption;
}
@@ -177,7 +177,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
return;
}
string ID = Grid1.SelectedRow.DataKeys[0].ToString();
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString());
var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID);
if (model != null) ///已上报时不能删除
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));