SVN r462
SVN-Revision: r462
This commit is contained in:
@@ -2035,6 +2035,7 @@ namespace Lskj.ProductiSched
|
|||||||
row["PrecomputedMaxDate"] = validDateColumns.Count > 0 ? validDateColumns.Max().ToString("yyyy-MM-dd") : "";
|
row["PrecomputedMaxDate"] = validDateColumns.Count > 0 ? validDateColumns.Max().ToString("yyyy-MM-dd") : "";
|
||||||
}
|
}
|
||||||
dataMain.ColumnChanged += OnDataMainColumnChanged;
|
dataMain.ColumnChanged += OnDataMainColumnChanged;
|
||||||
|
dataMain.AcceptChanges();
|
||||||
return dataMain;
|
return dataMain;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2470,4 +2471,34 @@ namespace Lskj.ProductiSched
|
|||||||
|
|
||||||
// 对每个动态日期列,从 dtPlan 中查找 billdocument_id 在 keyValues 内,
|
// 对每个动态日期列,从 dtPlan 中查找 billdocument_id 在 keyValues 内,
|
||||||
// 且 ShowDay 等于当前列名的记录,将 amount 累加后再乘以系数
|
// 且 ShowDay 等于当前列名的记录,将 amount 累加后再乘以系数
|
||||||
foreach (stri
|
foreach (string dateCol in dateColumns)
|
||||||
|
{
|
||||||
|
decimal sumAmount = planRows
|
||||||
|
.Where(pr => keyValues.Contains(pr.BillId) && pr.ShowDay == dateCol)
|
||||||
|
.Sum(pr => pr.Amount);
|
||||||
|
// 乘以系数得到实际值
|
||||||
|
newRow[dateCol] = sumAmount * coefficient;
|
||||||
|
}
|
||||||
|
dtC.Rows.Add(newRow);
|
||||||
|
}
|
||||||
|
return dtC;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return default;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 纠正输入异常
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="sender"></param>
|
||||||
|
/// <param name="e"></param>
|
||||||
|
private void OnInvalidValueException(object sender, InvalidValueExceptionEventArgs e)
|
||||||
|
{
|
||||||
|
if (e.Value.Equals(""))
|
||||||
|
{
|
||||||
|
e.ExceptionMode = ExceptionMode.Ignore;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user