提交代码
This commit is contained in:
@@ -150,7 +150,7 @@ namespace FineUIPro.Web.JDGL.Check
|
||||
oleDBConn.Close();
|
||||
oleDBConn.Dispose();
|
||||
|
||||
AddDatasetToSQL(ds.Tables[0], 5);
|
||||
AddDatasetToSQL(ds.Tables[0], 6);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -242,6 +242,19 @@ namespace FineUIPro.Web.JDGL.Check
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "实际完成" + "," + "此项为必填项!" + "|";
|
||||
}
|
||||
|
||||
string col5 = pds.Rows[i][5].ToString().Trim();
|
||||
if (!string.IsNullOrEmpty(col5))
|
||||
{
|
||||
try
|
||||
{
|
||||
decimal dec = Convert.ToDecimal(col5);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
result += "第" + (i + 2).ToString() + "行," + "下月计划" + "," + "[" + col5 + "]错误!" + "|";
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(result))
|
||||
{
|
||||
@@ -334,7 +347,7 @@ namespace FineUIPro.Web.JDGL.Check
|
||||
oleDBConn.Close();
|
||||
oleDBConn.Dispose();
|
||||
|
||||
AddDatasetToSQL2(ds.Tables[0], 5);
|
||||
AddDatasetToSQL2(ds.Tables[0], 6);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -371,6 +384,7 @@ namespace FineUIPro.Web.JDGL.Check
|
||||
string col2 = pds.Rows[i][2].ToString().Trim();
|
||||
string col3 = pds.Rows[i][3].ToString().Trim();
|
||||
string col4 = pds.Rows[i][4].ToString().Trim();
|
||||
string col5 = pds.Rows[i][5].ToString().Trim();
|
||||
if (!string.IsNullOrEmpty(col0))//类型
|
||||
{
|
||||
quantityCompletion.Name = col0;
|
||||
@@ -387,10 +401,14 @@ namespace FineUIPro.Web.JDGL.Check
|
||||
{
|
||||
quantityCompletion.PlanNum = Funs.GetNewDecimalOrZero(col3);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(col4))//计划完成
|
||||
if (!string.IsNullOrEmpty(col4))//实际完成
|
||||
{
|
||||
quantityCompletion.RealNum = Funs.GetNewDecimalOrZero(col4);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(col5))//下月计划
|
||||
{
|
||||
quantityCompletion.NextNum = Funs.GetNewDecimalOrZero(col5);
|
||||
}
|
||||
quantityCompletion.QuantityCompletionId = SQLHelper.GetNewID(typeof(Model.JDGL_QuantityCompletion));
|
||||
quantityCompletions.Add(quantityCompletion);
|
||||
}
|
||||
@@ -461,6 +479,7 @@ namespace FineUIPro.Web.JDGL.Check
|
||||
newQuantityCompletion.QuantityListId = quantityListId;
|
||||
newQuantityCompletion.PlanNum = quantityCompletions[i].PlanNum;
|
||||
newQuantityCompletion.RealNum = quantityCompletions[i].RealNum;
|
||||
newQuantityCompletion.NextNum = quantityCompletions[i].NextNum;
|
||||
newQuantityCompletion.CompileMan = this.CurrUser.UserId;
|
||||
newQuantityCompletion.CompileDate = DateTime.Now;
|
||||
newQuantityCompletion.StartDate = startDate;
|
||||
@@ -471,6 +490,7 @@ namespace FineUIPro.Web.JDGL.Check
|
||||
{
|
||||
oldQuantityCompletion.PlanNum= quantityCompletions[i].PlanNum;
|
||||
oldQuantityCompletion.RealNum= quantityCompletions[i].RealNum;
|
||||
oldQuantityCompletion.NextNum = quantityCompletions[i].NextNum;
|
||||
BLL.QuantityCompletionService.UpdateQuantityCompletion(oldQuantityCompletion);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user