修改进度计划编制
This commit is contained in:
@@ -328,12 +328,12 @@ namespace BLL
|
|||||||
if (item.WBSType == "WorkPackage")
|
if (item.WBSType == "WorkPackage")
|
||||||
{
|
{
|
||||||
var childWorkPackages = from x in workPackages where x.SuperWorkPackageId == item.Id && x.IsApprove == true select x;
|
var childWorkPackages = from x in workPackages where x.SuperWorkPackageId == item.Id && x.IsApprove == true select x;
|
||||||
if (childWorkPackages.Count() == 0)
|
var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.Id);
|
||||||
|
if (workPackage != null)
|
||||||
{
|
{
|
||||||
row[5] = item.Id;
|
if (childWorkPackages.Count() == 0)
|
||||||
var workPackage = workPackages.FirstOrDefault(x => x.WorkPackageId == item.Id);
|
|
||||||
if (workPackage != null)
|
|
||||||
{
|
{
|
||||||
|
row[5] = item.Id;
|
||||||
if (workPackage.JDWeights != null)
|
if (workPackage.JDWeights != null)
|
||||||
{
|
{
|
||||||
row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2);
|
row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2);
|
||||||
@@ -386,6 +386,33 @@ namespace BLL
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (workPackage.JDWeights != null)
|
||||||
|
{
|
||||||
|
row[6] = decimal.Round(Convert.ToDecimal(workPackage.JDWeights), 2);
|
||||||
|
}
|
||||||
|
if (workPackage.PlanStartDate != null)
|
||||||
|
{
|
||||||
|
row[10] = workPackage.PlanStartDate;
|
||||||
|
}
|
||||||
|
if (workPackage.PlanEndDate != null)
|
||||||
|
{
|
||||||
|
row[11] = workPackage.PlanEndDate;
|
||||||
|
}
|
||||||
|
if (workPackage.RealStartDate != null)
|
||||||
|
{
|
||||||
|
row[12] = workPackage.RealStartDate;
|
||||||
|
}
|
||||||
|
if (workPackage.RealEndDate != null)
|
||||||
|
{
|
||||||
|
row[13] = workPackage.RealEndDate;
|
||||||
|
}
|
||||||
|
if (workPackage.PlanCost != null)
|
||||||
|
{
|
||||||
|
row[15] = decimal.Round(Convert.ToDecimal(workPackage.PlanCost), 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (item.WBSType == "UnitWork")
|
else if (item.WBSType == "UnitWork")
|
||||||
|
|||||||
Reference in New Issue
Block a user