SVN r363
SVN-Revision: r363
This commit is contained in:
@@ -1059,6 +1059,7 @@ namespace Lskj.ProductiSched
|
||||
{
|
||||
dataMap[key] = new Dictionary<string, decimal>();
|
||||
}
|
||||
|
||||
// **查找 key 关联的时间数据**
|
||||
if (dayPlanMap.ContainsKey(key))
|
||||
{
|
||||
@@ -1068,10 +1069,22 @@ namespace Lskj.ProductiSched
|
||||
{
|
||||
DateTime dayValue = Convert.ToDateTime(dayRow["day"]);
|
||||
string colName = dayValue.ToString("yyyy-MM-dd");
|
||||
|
||||
// 检查日期是否在范围内,并且列存在
|
||||
if (dayValue >= startDate && dayValue <= endDate && dataMain.Columns.Contains(colName))
|
||||
{
|
||||
decimal.TryParse(dayRow["amount"] + "", out decimal amountValue);
|
||||
dataMap[key][colName] = amountValue;
|
||||
|
||||
// 如果日期已存在,则累加金额;否则直接赋值
|
||||
if (dataMap[key].ContainsKey(colName))
|
||||
{
|
||||
dataMap[key][colName] += amountValue; // 累加金额
|
||||
}
|
||||
else
|
||||
{
|
||||
dataMap[key][colName] = amountValue; // 直接赋值
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1208,10 +1221,22 @@ namespace Lskj.ProductiSched
|
||||
{
|
||||
DateTime dayValue = Convert.ToDateTime(dayRow["day"]);
|
||||
string colName = dayValue.ToString("yyyy-MM-dd");
|
||||
|
||||
// 检查日期是否在范围内,并且列存在
|
||||
if (dayValue >= startDate && dayValue <= endDate && focusedRow.Table.Columns.Contains(colName))
|
||||
{
|
||||
decimal.TryParse(dayRow["amount"] + "", out decimal amountValue);
|
||||
dataMap[key][colName] = amountValue;
|
||||
|
||||
// 如果日期已存在,则累加金额;否则直接赋值
|
||||
if (dataMap[key].ContainsKey(colName))
|
||||
{
|
||||
dataMap[key][colName] += amountValue; // 累加金额
|
||||
}
|
||||
else
|
||||
{
|
||||
dataMap[key][colName] = amountValue; // 直接赋值
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user