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

修改进度模块

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx
+9 -9
View File
@@ -39,18 +39,18 @@
<Columns>
<%--<f:RowNumberField HeaderText="序号"/>--%>
<f:RenderField Width="100px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:BoundField Width="350px" ColumnID="Name" DataField="Name" HeaderTextAlign="Center" EnableLock="true" Locked="true"
HeaderText="工作内容" />
<f:RenderField Width="100px" ColumnID="PreWorkCode" DataField="PreWorkCode" FieldType="String" EnableLock="true" Locked="true"
HeaderText="前置工作内容编号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:TemplateField Width="60px" HeaderText="里程碑点" HeaderTextAlign="Center" ID="IsMileStone" TextAlign="Center" EnableLock="true" Locked="true">
<ItemTemplate>
<asp:CheckBox ID="cbIsMileStone" runat="server" Enabled="false"></asp:CheckBox>
</ItemTemplate>
</f:TemplateField>
<ItemTemplate>
<asp:CheckBox ID="cbIsMileStone" runat="server" Enabled="false"></asp:CheckBox>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="80px" ColumnID="JDWeights" DataField="JDWeights" FieldType="Double" EnableLock="true" Locked="true"
HeaderText="权重(%)" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@@ -91,11 +91,11 @@
function onGridAfterEdit(event, value, params) {
var me = this, columnId = params.columnId, rowId = params.rowId;
var str = F(hdIdClientID).ooIl1;
if (str == undefined) {
var str = F(hdIdClientID).getValue();
if (str == undefined || str == '') {
str = rowId;
}
else {
else if(str.indexOf(rowId) == -1){
str = str + "," + rowId;
}
F(hdIdClientID).setValue(str);
SGGL/FineUIPro.Web/JDGL/Check/CompleteInput.aspx.cs
+37 -7
View File
@@ -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);
}
}
}
SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx
+8 -8
View File
@@ -42,17 +42,17 @@
<f:RenderField Width="100px" ColumnID="月份" DataField="月份"
FieldType="String" HeaderText="月份" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="本月概算工程量" DataField="本月概算工程量"
FieldType="Double" HeaderText="本月概算工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="本月概算费用" DataField="本月概算费用"
FieldType="Double" HeaderText="本月概算费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="累计概算工程量" DataField="累计概算工程量"
FieldType="Double" HeaderText="累计概算工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="累计概算费用" DataField="累计概算费用"
FieldType="Double" HeaderText="累计概算费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="本月实际工程量" DataField="本月实际工程量"
FieldType="Double" HeaderText="本月实际工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="本月实际费用" DataField="本月实际费用"
FieldType="Double" HeaderText="本月实际费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="累计实际工程量" DataField="累计实际工程量"
FieldType="Double" HeaderText="累计实际工程量" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="150px" ColumnID="累计实际费用" DataField="累计实际费用"
FieldType="Double" HeaderText="累计实际费用" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
</Columns>
</f:Grid>
SGGL/FineUIPro.Web/JDGL/Check/EarnedValueCurve.aspx.cs
+22 -22
View File
@@ -214,7 +214,7 @@ namespace FineUIPro.Web.JDGL.Check
if (WorkPackage != null && BLL.WorkPackageService.GetAllWorkPackagesBySuperWorkPackageId(WorkPackage.WorkPackageId).Count == 0)
{
string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months," +
"PlanNum as '本月概算工程量',ThisNum as '本月实际工程量',TotalPlanNum as '累计概算工程量',TotalThisNum as '累计实际工程量' " +
"PlanValue as '本月概算费用',ThisValue as '本月实际费用',TotalPlanValue as '累计概算费用',TotalThisValue as '累计实际费用' " +
"from dbo.View_WBS_WorkPackageDetail as t where WorkPackageId=@Id order by t.Months";
//string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01";
SqlParameter[] parameter = new SqlParameter[]
@@ -228,39 +228,39 @@ namespace FineUIPro.Web.JDGL.Check
decimal lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0;
for (int i = 0; i < dt.Rows.Count; i++)
{
dt.Rows[i]["本月概算工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算工程量"].ToString());
dt.Rows[i]["本月实际工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际工程量"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算工程量"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际工程量"].ToString());
dt.Rows[i]["本月概算费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算费用"].ToString());
dt.Rows[i]["本月实际费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际费用"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算费用"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际费用"].ToString());
if (acwp == lastacwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计概算工程量"] = DBNull.Value;
dt.Rows[i]["累计概算费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
if (bcwp == lastbcwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计实际工程量"] = DBNull.Value;
dt.Rows[i]["累计实际费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
lastacwp = acwp;
lastbcwp = bcwp;
@@ -270,7 +270,7 @@ namespace FineUIPro.Web.JDGL.Check
else
{
string strSql = "select distinct (cast(YEAR(Months) as varchar(4))+'.'+cast(MONTH(Months) as varchar(2))) as 月份,t.Months," +
"PlanNum as '本月概算工程量',ThisNum as '本月实际工程量',TotalPlanNum as '累计概算工程量',TotalThisNum as '累计实际工程量' " +
"PlanValue as '本月概算费用',ThisValue as '本月实际费用',TotalPlanValue as '累计概算费用',TotalThisValue as '累计实际费用' " +
"from dbo.View_WBS_WorkPackageParentDetail as t where ParentId=@Id order by t.Months";
//string date = DateTime.Now.Year + "-" + DateTime.Now.Month + "-01";
SqlParameter[] parameter = new SqlParameter[]
@@ -288,39 +288,39 @@ namespace FineUIPro.Web.JDGL.Check
decimal lastacwp = 0, acwp = 0, lastbcwp = 0, bcwp = 0;
for (int i = 0; i < dt.Rows.Count; i++)
{
dt.Rows[i]["本月概算工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算工程量"].ToString());
dt.Rows[i]["本月实际工程量"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际工程量"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算工程量"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际工程量"].ToString());
dt.Rows[i]["本月概算费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月概算费用"].ToString());
dt.Rows[i]["本月实际费用"] = Funs.GetNewDecimalOrZero(dt.Rows[i]["本月实际费用"].ToString());
acwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计概算费用"].ToString());
bcwp = Funs.GetNewDecimalOrZero(dt.Rows[i]["累计实际费用"].ToString());
if (acwp == lastacwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计概算工程量"] = DBNull.Value;
dt.Rows[i]["累计概算费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
}
else
{
dt.Rows[i]["累计概算工程量"] = acwp;
dt.Rows[i]["累计概算费用"] = acwp;
}
if (bcwp == lastbcwp)
{
if (Funs.GetNewDateTimeOrNow(dt.Rows[i]["Months"].ToString()) > DateTime.Now)
{
dt.Rows[i]["累计实际工程量"] = DBNull.Value;
dt.Rows[i]["累计实际费用"] = DBNull.Value;
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
}
else
{
dt.Rows[i]["累计实际工程量"] = bcwp;
dt.Rows[i]["累计实际费用"] = bcwp;
}
lastacwp = acwp;
lastbcwp = bcwp;
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx
+12
View File
@@ -14,6 +14,10 @@
white-space: normal;
word-break: break-all;
}
.f-grid-row.red {
background-color: red;
}
</style>
</head>
<body>
@@ -29,6 +33,14 @@
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="开始日期" ID="txtStartTime"
LabelAlign="right" >
</f:DatePicker>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="结束日期" ID="txtEndTime"
LabelAlign="right" >
</f:DatePicker>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Icon="SystemSearch" EnablePostBack="true" runat="server" >
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存"
OnClick="btnSave_Click">
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.cs
+16 -2
View File
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.JDGL.Check
private void BindGrid()
{
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty);
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, string.Empty,this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim());
Grid1.DataSource = table;
Grid1.DataBind();
for (int i = 0; i < this.Grid1.Rows.Count; i++)
@@ -54,6 +54,15 @@ namespace FineUIPro.Web.JDGL.Check
cbIsMileStone.Checked = true;
}
}
if (!string.IsNullOrEmpty(this.Grid1.Rows[i].Values[10].ToString()))
{
DateTime planEndDate = Convert.ToDateTime(this.Grid1.Rows[i].Values[10].ToString());
DateTime realEndDate = Funs.GetNewDateTimeOrNow(this.Grid1.Rows[i].Values[12].ToString());
if (planEndDate < realEndDate)
{
Grid1.Rows[i].RowCssClass = "red";
}
}
}
}
@@ -180,7 +189,7 @@ namespace FineUIPro.Web.JDGL.Check
{
try
{
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out");
DataTable table = BLL.WorkPackageService.GetAllTreeDataTable(this.CurrUser.LoginProjectId, "Out",this.txtStartTime.Text.Trim(),this.txtEndTime.Text.Trim());
string projectNmae = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
if (!string.IsNullOrEmpty(projectNmae))
{
@@ -357,5 +366,10 @@ namespace FineUIPro.Web.JDGL.Check
}
}
#endregion
protected void btnQuery_Click(object sender, EventArgs e)
{
BindGrid();
}
}
}
SGGL/FineUIPro.Web/JDGL/Check/PlanSet.aspx.designer.cs
Generated
+27
View File
@@ -66,6 +66,33 @@ namespace FineUIPro.Web.JDGL.Check {
/// </remarks>
protected global::FineUIPro.TextBox hdId;
/// <summary>
/// txtStartTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnSave 控件。
/// </summary>