cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r334

Browse Source 
SVN-Revision: r334
This commit is contained in:
tdx
2025-03-16 08:31:04 +00:00
parent 8f69607930
commit c730a74bc8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+6 -3
View File
@@ -5054,7 +5054,8 @@ namespace Lskj.PubBill
sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'";
DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime); MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime);
//gcMain.GridControl.DataSource = dataMain; gcMain.GridControl.DataSource = null;
gcMain.GridControl.DataSource = dataTable;
this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged; this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged;
} }
} }
@@ -5151,7 +5152,8 @@ namespace Lskj.PubBill
string colName = dayValue.ToString("yyyy-MM-dd"); string colName = dayValue.ToString("yyyy-MM-dd");
if (dayValue >= startDate && dayValue <= endDate && dataMain.Columns.Contains(colName)) if (dayValue >= startDate && dayValue <= endDate && dataMain.Columns.Contains(colName))
{ {
dataMap[key][colName] = Convert.ToDecimal(dayRow[amountField]); decimal.TryParse(dayRow[amountField] + "", out decimal amountValue);
dataMap[key][colName] = amountValue;
} }
} }
} }
@@ -5223,7 +5225,8 @@ namespace Lskj.PubBill
string colName = dayValue.ToString("yyyy-MM-dd"); string colName = dayValue.ToString("yyyy-MM-dd");
if (dayValue >= startDate && dayValue <= endDate && focusedRow.Table.Columns.Contains(colName)) if (dayValue >= startDate && dayValue <= endDate && focusedRow.Table.Columns.Contains(colName))
{ {
dataMap[key][colName] = Convert.ToDecimal(dayRow[amountField]); decimal.TryParse(dayRow[amountField] + "", out decimal amountValue);
dataMap[key][colName] = amountValue;
} }
} }
} }