diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx index 108e4e79..6dc22446 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx @@ -91,17 +91,9 @@ - - - - - - - - diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs index 9d34cda5..4a5bbd46 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs @@ -104,8 +104,6 @@ namespace FineUIPro.Web.JDGL.Check string realProjectQuantity = values.Value("RealProjectQuantity"); string planStartDate = values.Value("PlanStartDate"); string planEndDate = values.Value("PlanEndDate"); - string realStartDate = values.Value("RealStartDate"); - string realEndDate = values.Value("RealEndDate"); System.Web.UI.WebControls.CheckBox cbIsMileStone = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[i].FindControl("cbIsMileStone")); workPackage.Weights = Funs.GetNewDecimal(weights); workPackage.Unit = unit; @@ -113,13 +111,11 @@ namespace FineUIPro.Web.JDGL.Check workPackage.RealProjectQuantity = Funs.GetNewDecimal(realProjectQuantity); workPackage.PlanStartDate = Funs.GetNewDateTime(planStartDate); workPackage.PlanEndDate = Funs.GetNewDateTime(planEndDate); - workPackage.RealStartDate = Funs.GetNewDateTime(realStartDate); - workPackage.RealEndDate = Funs.GetNewDateTime(realEndDate); workPackage.IsMileStone = cbIsMileStone.Checked; BLL.WorkPackageService.UpdateWorkPackage(workPackage); - if (workPackage.PlanStartDate != null || workPackage.PlanEndDate != null || workPackage.RealStartDate != null || workPackage.RealEndDate != null) + if (workPackage.PlanStartDate != null || workPackage.PlanEndDate != null) { - UpdateWorkPackages(db, workPackage, workPackage.PlanStartDate, workPackage.PlanEndDate, workPackage.RealStartDate, workPackage.RealEndDate); + UpdateWorkPackages(db, workPackage, workPackage.PlanStartDate, workPackage.PlanEndDate); var unitWork = unitWorks.FirstOrDefault(x => x.UnitWorkId == workPackage.UnitWorkId); if (workPackage.PlanStartDate != null) { @@ -149,34 +145,6 @@ namespace FineUIPro.Web.JDGL.Check } } } - if (workPackage.RealStartDate != null) - { - if (unitWork.RealStartDate == null) - { - unitWork.RealStartDate = workPackage.RealStartDate; - } - else - { - if (unitWork.RealStartDate > workPackage.RealStartDate) - { - unitWork.RealStartDate = workPackage.RealStartDate; - } - } - } - if (workPackage.RealEndDate != null) - { - if (unitWork.RealEndDate == null) - { - unitWork.RealEndDate = workPackage.RealEndDate; - } - else - { - if (unitWork.RealEndDate < workPackage.RealEndDate) - { - unitWork.RealEndDate = workPackage.RealEndDate; - } - } - } } db.SubmitChanges(); } @@ -193,7 +161,7 @@ namespace FineUIPro.Web.JDGL.Check /// /// /// - private void UpdateWorkPackages(Model.SGGLDB db, Model.WBS_WorkPackage workPackage, DateTime? planStartDate, DateTime? planEndDate, DateTime? realStartDate, DateTime? realEndDate) + private void UpdateWorkPackages(Model.SGGLDB db, Model.WBS_WorkPackage workPackage, DateTime? planStartDate, DateTime? planEndDate) { if (workPackage != null) { @@ -228,159 +196,10 @@ namespace FineUIPro.Web.JDGL.Check } } } - if (realStartDate != null) - { - if (parentWorkPackage.RealStartDate == null) - { - parentWorkPackage.RealStartDate = realStartDate; - } - else - { - if (parentWorkPackage.RealStartDate > realStartDate) - { - parentWorkPackage.RealStartDate = realStartDate; - } - } - } - if (realEndDate != null) - { - if (parentWorkPackage.RealEndDate == null) - { - parentWorkPackage.RealEndDate = realEndDate; - } - else - { - if (parentWorkPackage.RealEndDate < realEndDate) - { - parentWorkPackage.RealEndDate = realEndDate; - } - } - } - UpdateWorkPackages(db, parentWorkPackage, planStartDate, planEndDate, realStartDate, realEndDate); + UpdateWorkPackages(db, parentWorkPackage, planStartDate, planEndDate); } } } - - /// - /// 更新周工作包、工作项 - /// - /// - /// - /// - /// - private void UpdateWeekWbsSetDetail(string wbsSetId, DateTime months, DateTime startDate, DateTime endDate, decimal changeThisPlanValue, decimal changeThisRealCost, decimal changeThisPlanCost) - { - //Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(wbsSetId); - //if (wbsSet != null) - //{ - // Model.WBS_CostControlParentDetail parentDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonthsWeek(wbsSetId, months, startDate); - // if (parentDetail != null) - // { - // parentDetail.ThisPlanValue += changeThisPlanValue; - // parentDetail.ThisRealCost += changeThisRealCost; - // parentDetail.ThisPlanCost += changeThisPlanCost; - // BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail); - // } - // else - // { - // parentDetail = new Model.WBS_CostControlParentDetail(); - // parentDetail.CostControlParentDetailId = SQLHelper.GetNewID(); - // parentDetail.ParentId = wbsSetId; - // parentDetail.Months = months; - // parentDetail.StartDate = startDate; - // parentDetail.EndDate = endDate; - // parentDetail.ThisPlanValue = changeThisPlanValue; - // parentDetail.ThisRealCost = changeThisRealCost; - // parentDetail.ThisPlanCost = changeThisPlanCost; - // BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail); - // } - // if (wbsSet.SuperWbsSetId != null) //还存在上级节点，需要继续循环 - // { - // UpdateWeekWbsSetDetail(wbsSet.SuperWbsSetId, months, startDate, endDate, changeThisPlanValue, changeThisRealCost, changeThisPlanCost); - // } - //} - } - #endregion - - #region 更新装置 - /// - /// 更新月装置 - /// - /// - /// - /// - /// - private void UpdateInstallationDetail(Model.SGGLDB db, string installationId, DateTime months, decimal changeThisPlanValue, decimal changeThisRealCost, decimal changeThisPlanCost) - { - //Model.Project_Installation installation = BLL.Project_InstallationService.GetInstallationByInstallationId(installationId); - //if (installation != null) - //{ - // Model.WBS_CostControlParentDetail parentDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(installationId, months); - // if (parentDetail != null) - // { - // parentDetail.ThisPlanValue += changeThisPlanValue; - // parentDetail.ThisRealCost += changeThisRealCost; - // parentDetail.ThisPlanCost += changeThisPlanCost; - // //BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail); - // } - // else - // { - // parentDetail = new Model.WBS_CostControlParentDetail(); - // parentDetail.CostControlParentDetailId = SQLHelper.GetNewID(); - // parentDetail.ParentId = installationId; - // parentDetail.Months = months; - // parentDetail.ThisPlanValue = changeThisPlanValue; - // parentDetail.ThisRealCost = changeThisRealCost; - // parentDetail.ThisPlanCost = changeThisPlanCost; - // //BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail); - // db.WBS_CostControlParentDetail.InsertOnSubmit(parentDetail); - // } - // if (installation.SuperInstallationId != null) //还存在上级节点，需要继续循环 - // { - // UpdateInstallationDetail(db, installation.SuperInstallationId, months, changeThisPlanValue, changeThisRealCost, changeThisPlanCost); - // } - //} - } - - /// - /// 更新周装置 - /// - /// - /// - /// - /// - private void UpdateWeekInstallationDetail(string installationId, DateTime months, DateTime startDate, DateTime endDate, decimal changeThisPlanValue, decimal changeThisRealCost, decimal changeThisPlanCost) - { - //Model.Project_Installation installation = BLL.Project_InstallationService.GetInstallationByInstallationId(installationId); - //if (installation != null) - //{ - // Model.WBS_CostControlParentDetail parentDetail = BLL.CostControlParentDetailService.GetCostControlParentDetailByParentIdAndMonths(installationId, months); - // if (parentDetail != null) - // { - // parentDetail.ThisPlanValue += changeThisPlanValue; - // parentDetail.ThisRealCost += changeThisRealCost; - // parentDetail.ThisPlanCost += changeThisPlanCost; - // BLL.CostControlParentDetailService.UpdateCostControlParentDetail(parentDetail); - // } - // else - // { - // parentDetail = new Model.WBS_CostControlParentDetail(); - // parentDetail.CostControlParentDetailId = SQLHelper.GetNewID(); - // parentDetail.ParentId = installationId; - // parentDetail.Months = months; - // parentDetail.StartDate = startDate; - // parentDetail.EndDate = endDate; - // parentDetail.ThisPlanValue = changeThisPlanValue; - // parentDetail.ThisRealCost = changeThisRealCost; - // parentDetail.ThisPlanCost = changeThisPlanCost; - // BLL.CostControlParentDetailService.AddCostControlParentDetail(parentDetail); - // } - // if (installation.SuperInstallationId != null) //还存在上级节点，需要继续循环 - // { - // UpdateWeekInstallationDetail(installation.SuperInstallationId, months, startDate, endDate, changeThisPlanValue, changeThisRealCost, changeThisPlanCost); - // } - //} - } #endregion #endregion } diff --git a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs index 32e0bca6..7cab4891 100644 --- a/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs @@ -146,23 +146,5 @@ namespace FineUIPro.Web.JDGL.Check { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtPlanEndDate; - - /// - /// txtRealStartDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtRealStartDate; - - /// - /// txtRealEndDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtRealEndDate; } } diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index fedce2a9..63dbade9 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -1,9 +1,5 @@  - + - - - - \ No newline at end of file