0614-进度增加计划和实际开始/完成时间
This commit is contained in:
@@ -9,7 +9,7 @@ using System.Web;
|
||||
using System.Web.UI;
|
||||
using System.Web.UI.WebControls;
|
||||
using BLL;
|
||||
|
||||
|
||||
namespace FineUIPro.Web.JDGL.WBS
|
||||
{
|
||||
public partial class WorkloadInputIn : PageBase
|
||||
@@ -115,7 +115,7 @@ namespace FineUIPro.Web.JDGL.WBS
|
||||
rdId.HeaderTextAlign = TextAlign.Center;
|
||||
Grid1.Columns.Add(rdId);
|
||||
rdId.Hidden = true;
|
||||
ColumnNum = 5 + months.Count * 2 + 1;
|
||||
ColumnNum = 9 + months.Count * 2 + 1;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
@@ -287,31 +287,60 @@ namespace FineUIPro.Web.JDGL.WBS
|
||||
string row = pds.Rows[i][j].ToString();
|
||||
if (!string.IsNullOrEmpty(row))
|
||||
{
|
||||
try
|
||||
if (j != 5 && j != 6 && j != 7 && j != 8)
|
||||
{
|
||||
decimal d = Convert.ToDecimal(row.Trim());
|
||||
try
|
||||
{
|
||||
decimal d = Convert.ToDecimal(row.Trim());
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
if (j == 2)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "合同工作量" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j == 3)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "预算单价" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j == 4)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "实际单价" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j % 2 == 1) //奇数列
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + string.Format("{0:yyyy-MM}", months[j - 9]) + "计划量" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + string.Format("{0:yyyy-MM}", months[j - 9]) + "完成量" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception)
|
||||
else
|
||||
{
|
||||
if (j == 2)
|
||||
try
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "合同工作量" + "," + "[" + row + "]格式错误!" + "|";
|
||||
DateTime d = Convert.ToDateTime(row.Trim());
|
||||
}
|
||||
else if (j == 3)
|
||||
catch (Exception)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "预算单价" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j == 4)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "实际单价" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j % 2 == 1) //奇数列
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + string.Format("{0:yyyy-MM}", months[j - 5]) + "计划量" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + string.Format("{0:yyyy-MM}", months[j - 5]) + "完成量" + "," + "[" + row + "]格式错误!" + "|";
|
||||
if (j == 5)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "计划开始时间" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j == 6)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "计划完成时间" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j == 7)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "实际开始时间" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
else if (j == 8)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "实际完成时间" + "," + "[" + row + "]格式错误!" + "|";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -454,6 +483,10 @@ namespace FineUIPro.Web.JDGL.WBS
|
||||
costControl.TotalNum = Funs.GetNewDecimal(pds.Rows[i][2].ToString().Trim());
|
||||
costControl.PlanPrice = Funs.GetNewDecimal(pds.Rows[i][3].ToString().Trim());
|
||||
costControl.RealPrice = Funs.GetNewDecimal(pds.Rows[i][4].ToString().Trim());
|
||||
costControl.PlanStartDate = Funs.GetNewDateTime(pds.Rows[i][5].ToString().Trim());
|
||||
costControl.PlanEndDate = Funs.GetNewDateTime(pds.Rows[i][6].ToString().Trim());
|
||||
costControl.RealStartDate = Funs.GetNewDateTime(pds.Rows[i][7].ToString().Trim());
|
||||
costControl.RealEndDate = Funs.GetNewDateTime(pds.Rows[i][8].ToString().Trim());
|
||||
BLL.CostControlService.UpdateCostControl(costControl);
|
||||
for (int j = 0; j < months.Count; j++)
|
||||
{
|
||||
@@ -463,8 +496,8 @@ namespace FineUIPro.Web.JDGL.WBS
|
||||
changeThisPlanValue = 0;
|
||||
changeThisRealCost = 0;
|
||||
changeThisPlanCost = 0;
|
||||
string planNum = pds.Rows[i][5 + j * 2].ToString().Trim();
|
||||
string thisNum = pds.Rows[i][6 + j * 2].ToString().Trim();
|
||||
string planNum = pds.Rows[i][9 + j * 2].ToString().Trim();
|
||||
string thisNum = pds.Rows[i][10 + j * 2].ToString().Trim();
|
||||
Model.WBS_CostControlDetail costControlDetail = BLL.CostControlDetailService.GetCostControlDetailByCostControlIdAndMonths(costControl.CostControlId, months[j]);
|
||||
if (costControlDetail != null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user