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/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;