diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs index aa3fe84b..bd8431ca 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs @@ -112,7 +112,7 @@ namespace FineUIPro.Web.Transfer.Chart DataRow rowTime = dtTime.NewRow(); Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem(); rowTime["Discipline"] = item.Discipline; - var types = forms.Where(x => x.Discipline == item.Discipline); + var types = forms.Where(x => x.Discipline == item.Discipline || x.Discipline==item.DisciplineCode); rowTime["总数量"] = types.Count(); rowTime["A数量"] = types.Where(x => x.Category == "A").Count(); rowTime["B数量"] = types.Where(x => x.Category == "B").Count(); @@ -133,7 +133,7 @@ namespace FineUIPro.Web.Transfer.Chart DataRow rowTime = dtTime.NewRow(); Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem(); rowTime["Discipline"] = item.Discipline; - var types = forms.Where(x => x.Discipline == item.Discipline); + var types = forms.Where(x => x.Discipline == item.Discipline || x.Discipline == item.DisciplineCode); rowTime["总数量"] = types.Count(); dtTime.Rows.Add(rowTime); }