diff --git a/SGGL/FineUIPro.Web/ProjectData/InstallationSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/InstallationSave.aspx.cs index 18516a43..611d80eb 100644 --- a/SGGL/FineUIPro.Web/ProjectData/InstallationSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/InstallationSave.aspx.cs @@ -122,7 +122,7 @@ namespace FineUIPro.Web.ProjectData startDate = installation.StartDate; endDate = installation.EndDate; //拷贝专业 - var cnProfessionInits = from x in Funs.DB.WBS_CnProfessionInit where x.CnProfessionId != 20 select x; + var cnProfessionInits = from x in Funs.DB.WBS_CnProfessionInit where x.CnProfessionId < 19 select x; foreach (var cnProfessionInit in cnProfessionInits) { Model.WBS_CnProfession cnProfession = new Model.WBS_CnProfession(); @@ -136,7 +136,7 @@ namespace FineUIPro.Web.ProjectData BLL.CnProfessionService.AddCnProfession(cnProfession); } //拷贝单位工程及子单位工程 - var unitProjectInits = from x in Funs.DB.Wbs_UnitProjectInit where x.CnProfessionId != 20 orderby x.SuperUnitProject select x; + var unitProjectInits = from x in Funs.DB.Wbs_UnitProjectInit where x.CnProfessionId < 19 orderby x.SuperUnitProject select x; foreach (var unitProjectInit in unitProjectInits) { Model.Wbs_UnitProject unitProject = new Model.Wbs_UnitProject(); @@ -168,7 +168,7 @@ namespace FineUIPro.Web.ProjectData BLL.UnitProjectService.AddUnitProject(unitProject); } //拷贝分部/子分部/分项/子分项 - wbsSetInits = (from x in Funs.DB.WBS_WbsSetInit where x.CnProfessionId != 20 orderby x.SuperWbsSetCode select x).ToList(); + wbsSetInits = (from x in Funs.DB.WBS_WbsSetInit where x.CnProfessionId < 19 orderby x.SuperWbsSetCode select x).ToList(); foreach (var wbsSetInit in wbsSetInits) { Model.Wbs_WbsSet wbsSet = new Model.Wbs_WbsSet(); @@ -219,18 +219,21 @@ namespace FineUIPro.Web.ProjectData where x.WbsSetCode == wbsSetMatchCostControlInit.WbsSetCode && x.InstallationId == installationId select x.WbsSetId).FirstOrDefault(); wbsSetMatchCostControl.CostControlCode = wbsSetMatchCostControlInit.CostControlInitCode; - BLL.WbsSetMatchCostControlService.AddWbsSetMatchCostControl(wbsSetMatchCostControl); - //拷贝费用清单项 - var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x; - foreach (var costControlInit in costControlInits) + if (wbsSetMatchCostControl.WbsSetId != null) { - Model.WBS_CostControl costControl = new Model.WBS_CostControl(); - costControl.ProjectId = projectId; - costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId; - costControl.CostControlCode = costControlInit.CostControlInitCode; - costControl.CostControlName = costControlInit.CostControlInitName; - costControl.Unit = costControlInit.Unit; - BLL.CostControlService.AddCostControl(costControl); + BLL.WbsSetMatchCostControlService.AddWbsSetMatchCostControl(wbsSetMatchCostControl); + //拷贝费用清单项 + var costControlInits = from x in totalCostControlInits where x.CostControlInitCode == wbsSetMatchCostControlInit.CostControlInitCode orderby x.CostControlInitCode select x; + foreach (var costControlInit in costControlInits) + { + Model.WBS_CostControl costControl = new Model.WBS_CostControl(); + costControl.ProjectId = projectId; + costControl.WbsSetId = wbsSetMatchCostControl.WbsSetId; + costControl.CostControlCode = costControlInit.CostControlInitCode; + costControl.CostControlName = costControlInit.CostControlInitName; + costControl.Unit = costControlInit.Unit; + BLL.CostControlService.AddCostControl(costControl); + } } } }