lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+4 -10
View File
@@ -1100,11 +1100,8 @@ namespace BLL
decimal physicalCompletionQuantity = 0, materialConsumption = 0; decimal physicalCompletionQuantity = 0, materialConsumption = 0;
if (we.Count() > 0) if (we.Count() > 0)
{ {
foreach (var w in we) physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
{ materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
materialConsumption += w.MaterialConsumption ?? 0;
}
row[9] = physicalCompletionQuantity; row[9] = physicalCompletionQuantity;
row[10] = materialConsumption; row[10] = materialConsumption;
} }
@@ -1188,11 +1185,8 @@ namespace BLL
decimal physicalCompletionQuantity = 0, materialConsumption = 0; decimal physicalCompletionQuantity = 0, materialConsumption = 0;
if (we.Count() > 0) if (we.Count() > 0)
{ {
foreach (var w in we) physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
{ materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
materialConsumption += w.MaterialConsumption ?? 0;
}
row[9] = physicalCompletionQuantity; row[9] = physicalCompletionQuantity;
row[10] = materialConsumption; row[10] = materialConsumption;
} }
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs
+1 -1
View File
@@ -177,7 +177,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
return; return;
} }
string ID = Grid1.SelectedRow.DataKeys[0].ToString(); 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) ///已上报时不能删除 if (model != null) ///已上报时不能删除
{ {
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - "))); PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));