修改进度模块

This commit is contained in:
2023-08-30 14:52:34 +08:00
parent 1a38e3c935
commit 991eb07f0b
22 changed files with 862 additions and 95 deletions
@@ -132,7 +132,7 @@ namespace FineUIPro.Web.JDGL.Check
{
errorInfos = string.Empty;
string Id = Request.Params["Id"];
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty);
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty, null, null);
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)
@@ -178,9 +178,9 @@ namespace FineUIPro.Web.JDGL.Check
private void Save()
{
decimal changePlanNum = 0, changeThisNum = 0, //当月总变化完成成本、完成预算
oldPlanNum = 0, oldThisNum = 0,
PlanNum = 0, ThisNum = 0;
decimal changePlanNum = 0, changePlanValue = 0, changeThisNum = 0, //当月总变化完成成本、完成预算
oldPlanNum = 0, oldThisNum = 0, oldPlanValue = 0,
PlanNum = 0, ThisNum = 0, PlanValue = 0, PlanCost = 0, PlanProjectQuantity = 0;
Model.SGGLDB db = Funs.DB;
var oldViewInfos = from x in db.WBS_WorkPackage
where x.ProjectId == this.CurrUser.LoginProjectId
@@ -201,13 +201,17 @@ namespace FineUIPro.Web.JDGL.Check
if (WorkPackage != null)
{
string WorkPackageId = WorkPackage.WorkPackageId;
PlanCost = WorkPackage.PlanCost ?? 0;
PlanProjectQuantity = WorkPackage.PlanProjectQuantity ?? 0;
BLL.WorkPackageService.UpdateWorkPackage(WorkPackage);
for (int j = 0; j < months.Count; j++)
{
oldPlanNum = 0;
oldThisNum = 0;
oldPlanValue = 0;
changePlanNum = 0;
changeThisNum = 0;
changePlanValue = 0;
string planNum = values.Value<string>(string.Format("{0:yyyy-MM}", months[j]) + "Plan");
string thisNum = values.Value<string>(string.Format("{0:yyyy-MM}", months[j]) + "This");
Model.WBS_WorkPackageDetail WorkPackageDetail = BLL.WorkPackageDetailService.GetWorkPackageDetailByWorkPackageIdAndMonths(WorkPackageId, months[j]);
@@ -215,10 +219,20 @@ namespace FineUIPro.Web.JDGL.Check
{
oldPlanNum = WorkPackageDetail.PlanNum ?? 0;
oldThisNum = WorkPackageDetail.ThisNum ?? 0;
oldPlanValue = WorkPackageDetail.PlanValue ?? 0;
WorkPackageDetail.PlanNum = Funs.GetNewDecimalOrZero(planNum);
WorkPackageDetail.ThisNum = Funs.GetNewDecimalOrZero(thisNum);
if (PlanProjectQuantity > 0 && WorkPackageDetail.PlanNum > 0)
{
WorkPackageDetail.PlanValue = decimal.Round(PlanCost * Funs.GetNewDecimalOrZero(planNum) / PlanProjectQuantity, 2);
}
else
{
WorkPackageDetail.PlanValue = 0;
}
PlanNum = WorkPackageDetail.PlanNum ?? 0;
ThisNum = WorkPackageDetail.ThisNum ?? 0;
PlanValue = WorkPackageDetail.PlanValue ?? 0;
}
else
{
@@ -228,21 +242,32 @@ namespace FineUIPro.Web.JDGL.Check
WorkPackageDetail.Months = months[j];
WorkPackageDetail.PlanNum = Funs.GetNewDecimalOrZero(planNum);
WorkPackageDetail.ThisNum = Funs.GetNewDecimalOrZero(thisNum);
if (PlanProjectQuantity > 0 && WorkPackageDetail.PlanNum > 0)
{
WorkPackageDetail.PlanValue = decimal.Round(PlanCost * Funs.GetNewDecimalOrZero(planNum) / PlanProjectQuantity, 2);
}
else
{
WorkPackageDetail.PlanValue = 0;
}
PlanNum = WorkPackageDetail.PlanNum ?? 0;
ThisNum = WorkPackageDetail.ThisNum ?? 0;
PlanValue = WorkPackageDetail.PlanValue ?? 0;
db.WBS_WorkPackageDetail.InsertOnSubmit(WorkPackageDetail);
}
//累加变化值,计算总的变化值
changePlanNum += PlanNum - oldPlanNum;
changeThisNum += ThisNum - oldThisNum;
changePlanValue += PlanValue - oldPlanValue;
////更新分部分项
UpdateWorkPackageParent(db, WorkPackage.SuperWorkPackageId, months[j], changePlanNum, changeThisNum);
UpdateWorkPackageParent(db, WorkPackage.SuperWorkPackageId, months[j], changePlanNum, changeThisNum, changePlanValue);
////更新单位工程
Model.WBS_WorkPackageParentDetail unitWorkDetail = BLL.WorkPackageParentDetailService.GetWorkPackageParentDetailByParentIdAndMonths(WorkPackage.UnitWorkId, months[j]);
if (unitWorkDetail != null)
{
unitWorkDetail.PlanNum += changePlanNum;
unitWorkDetail.ThisNum += changeThisNum;
unitWorkDetail.PlanValue += changePlanValue;
//BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(unitWorkDetail);
}
else
@@ -253,6 +278,7 @@ namespace FineUIPro.Web.JDGL.Check
unitWorkDetail.Months = months[j];
unitWorkDetail.PlanNum = changePlanNum;
unitWorkDetail.ThisNum = changeThisNum;
unitWorkDetail.PlanValue = changePlanValue;
//BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(unitWorkDetail);
db.WBS_WorkPackageParentDetail.InsertOnSubmit(unitWorkDetail);
}
@@ -265,6 +291,7 @@ namespace FineUIPro.Web.JDGL.Check
{
projectType.PlanNum += changePlanNum;
projectType.ThisNum += changeThisNum;
projectType.PlanValue += changePlanValue;
//BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(cnProfessionDetail);
}
else
@@ -276,6 +303,7 @@ namespace FineUIPro.Web.JDGL.Check
projectType.Months = months[j];
projectType.PlanNum = changePlanNum;
projectType.ThisNum = changeThisNum;
projectType.PlanValue = changePlanValue;
//BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(cnProfessionDetail);
db.WBS_WorkPackageParentDetail.InsertOnSubmit(projectType);
}
@@ -296,7 +324,7 @@ namespace FineUIPro.Web.JDGL.Check
/// <param name="months"></param>
/// <param name="PlanNum"></param>
/// <param name="parentId"></param>
private void UpdateWorkPackageParent(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal changePlanNum, decimal changeThisNum)
private void UpdateWorkPackageParent(Model.SGGLDB db, string SuperWorkPackageId, DateTime months, decimal changePlanNum, decimal changeThisNum, decimal changePlanValue)
{
Model.WBS_WorkPackage workPackage = db.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == SuperWorkPackageId);
if (workPackage != null)
@@ -306,6 +334,7 @@ namespace FineUIPro.Web.JDGL.Check
{
parentDetail.PlanNum += changePlanNum;
parentDetail.ThisNum += changeThisNum;
parentDetail.PlanValue += changePlanValue;
//BLL.WorkPackageParentDetailService.UpdateWorkPackageParentDetail(parentDetail);
}
else
@@ -316,12 +345,13 @@ namespace FineUIPro.Web.JDGL.Check
parentDetail.Months = months;
parentDetail.PlanNum = changePlanNum;
parentDetail.ThisNum = changeThisNum;
parentDetail.PlanValue = changePlanValue;
//BLL.WorkPackageParentDetailService.AddWorkPackageParentDetail(parentDetail);
db.WBS_WorkPackageParentDetail.InsertOnSubmit(parentDetail);
}
if (workPackage.SuperWorkPackageId != null) //还存在上级节点,需要继续循环
{
UpdateWorkPackageParent(db, workPackage.SuperWorkPackageId, months, changePlanNum, changeThisNum);
UpdateWorkPackageParent(db, workPackage.SuperWorkPackageId, months, changePlanNum, changeThisNum, changePlanValue);
}
}
}