From c730a74bc86ea005d4bcab07f84b336810a7951e Mon Sep 17 00:00:00 2001 From: tdx Date: Sun, 16 Mar 2025 08:31:04 +0000 Subject: [PATCH] SVN r334 SVN-Revision: r334 --- 插件库/Lskj.PubBill/BillModule.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs index 7936307..4a9c888 100644 --- a/插件库/Lskj.PubBill/BillModule.cs +++ b/插件库/Lskj.PubBill/BillModule.cs @@ -5054,7 +5054,8 @@ namespace Lskj.PubBill sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime); - //gcMain.GridControl.DataSource = dataMain; + gcMain.GridControl.DataSource = null; + gcMain.GridControl.DataSource = dataTable; this.gcMain.GridView.DataSourceChanged += OnGcMainDataSourceChanged; } } @@ -5151,7 +5152,8 @@ namespace Lskj.PubBill string colName = dayValue.ToString("yyyy-MM-dd"); 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"); 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; } } }