lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改进度计划设置

This commit is contained in:
高飞 2023-07-27 16:51:57 +08:00
parent 3c1ac7f7fa
commit d239e70aa8
4 changed files with 5 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
View File

@ -91,17 +91,9 @@
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RealStartDate" DataField="RealStartDate" FieldType="Date"
Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实际开始时间" HeaderTextAlign="Center">
<Editor>
<f:DatePicker ID="txtRealStartDate" Required="true" runat="server">
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RealEndDate" DataField="RealEndDate" FieldType="Date"
Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实际完成时间" HeaderTextAlign="Center">
<Editor>
<f:DatePicker ID="txtRealEndDate" Required="true" runat="server">
</f:DatePicker>
</Editor>
</f:RenderField>
</Columns>
<Listeners>

189
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
View File

@ -104,8 +104,6 @@ namespace FineUIPro.Web.JDGL.Check
string realProjectQuantity = values.Value<string>("RealProjectQuantity");
string planStartDate = values.Value<string>("PlanStartDate");
string planEndDate = values.Value<string>("PlanEndDate");
string realStartDate = values.Value<string>("RealStartDate");
string realEndDate = values.Value<string>("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
/// <param name="months"></param>
/// <param name="planValue"></param>
/// <param name="parentId"></param>
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);
}
}
}
/// <summary>
/// 更新周工作包、工作项
/// </summary>
/// <param name="years"></param>
/// <param name="months"></param>
/// <param name="planValue"></param>
/// <param name="parentId"></param>
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 更新装置
/// <summary>
/// 更新月装置
/// </summary>
/// <param name="years"></param>
/// <param name="months"></param>
/// <param name="planValue"></param>
/// <param name="parentId"></param>
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);
// }
//}
}
/// <summary>
/// 更新周装置
/// </summary>
/// <param name="years"></param>
/// <param name="months"></param>
/// <param name="planValue"></param>
/// <param name="parentId"></param>
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
}

18
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs generated
View File

@ -146,23 +146,5 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanEndDate;
/// <summary>
/// txtRealStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtRealStartDate;
/// <summary>
/// txtRealEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtRealEndDate;
}
}

6
SGGL/FineUIPro.Web/common/Menu_JDGL.xml
View File

@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Tree>
<TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
<TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划设置" NavigateUrl="JDGL/Check/PlanSet.aspx">
</TreeNode>
<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
</Tree>