合并最新

This commit is contained in:
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -136,6 +136,42 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.BreakdownId = this.BreakdownId;
}
BLL.BreakdownService.AddBreakdown(newBreakdown);
//增加项目单位工程记录
var projects = BLL.ProjectService.GetProjectWorkList();
foreach (var project in projects)
{
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == project.ProjectId orderby x.UnitWorkCode select x;
foreach (var unitWork in unitWorks)
{
var divisionProject = BLL.DivisionProjectService.GetDivisionProjectByUnitWorkIdAndOldDivisionId(unitWork.UnitWorkId, divisionId);
if (divisionProject != null)
{
Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
bp.ProjectId = project.ProjectId;
bp.BreakdownCode = newBreakdown.BreakdownCode;
bp.BreakdownName = newBreakdown.BreakdownName;
bp.DivisionProjectId = divisionProject.DivisionProjectId;
bp.Basis = newBreakdown.Basis;
bp.CheckPoints = newBreakdown.CheckPoints;
bp.RecordAndCode = newBreakdown.RecordAndCode;
bp.Class = newBreakdown.Class;
bp.SortIndex = newBreakdown.SortIndex;
bp.Remark = newBreakdown.Remark;
bp.ModelURL = newBreakdown.ModelURL;
bp.UnitWorkId = unitWork.UnitWorkId;
bp.IsAcceptance = newBreakdown.IsAcceptance;
bp.IsYellow = newBreakdown.IsYellow;
bp.WuHuan = newBreakdown.WuHuan;
bp.JianLi = newBreakdown.JianLi;
bp.FenBao = newBreakdown.FenBao;
bp.YeZhu = newBreakdown.YeZhu;
bp.SourceBreakdownId = newBreakdown.BreakdownId;
BLL.BreakdownProjectService.AddBreakdownProject(bp);
}
}
}
BLL.LogService.AddSys_Log(this.CurrUser, newBreakdown.BreakdownCode, newBreakdown.BreakdownId, BLL.Const.ControlPointMenuId, "添加分项工程信息!");
}
if (Request.Params["type"] == "modify")
@@ -102,6 +102,51 @@ namespace FineUIPro.Web.CQMS.WBS
newDivision.SuperDivisionId = selectedCode;
}
BLL.DivisionService.AddDivision(newDivision);
//增加项目单位工程记录
var projects = BLL.ProjectService.GetProjectWorkList();
foreach (var project in projects)
{
var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == project.ProjectId orderby x.UnitWorkCode select x;
foreach (var unitWork in unitWorks)
{
Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
newDivisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivisionProject.DivisionName = this.txtDivisionName.Text.Trim();
newDivisionProject.UnitWorkId = unitWork.UnitWorkId;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
{
newDivisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
}
catch (Exception)
{
ShowNotify("排序只能为整数!", MessageBoxIcon.Warning);
return;
}
}
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
newDivisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
}
newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
if (cNProfessional != null) //专业节点增加分部
{
newDivisionProject.CNProfessionalId = selectedCode;
}
if (divisionProject != null) //分部节点增加子分部
{
var dp = BLL.DivisionProjectService.GetDivisionProjectByUnitWorkIdAndOldDivisionId(unitWork.UnitWorkId, selectedCode);
if (dp != null)
{
newDivisionProject.SuperDivisionId = dp.DivisionProjectId;
}
}
newDivisionProject.ProjectId = project.ProjectId;
newDivisionProject.OldDivisionId = newDivision.DivisionId;
BLL.DivisionProjectService.AddDivisionProject(newDivisionProject);
}
}
BLL.LogService.AddSys_Log(this.CurrUser, newDivision.DivisionCode, newKeyID, BLL.Const.ProjectControlPointMenuId, "添加分部或子分部工程信息!");
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(newKeyID) + ActiveWindow.GetHidePostBackReference());
}