SVN r1104
SVN-Revision: r1104
This commit is contained in:
@@ -38,6 +38,7 @@ using NPOI;
|
||||
using System.Diagnostics;
|
||||
using DevExpress.XtraGrid.Views.BandedGrid;
|
||||
using DevExpress.Utils;
|
||||
using System.Data.Common;
|
||||
|
||||
namespace Lskj.Control
|
||||
{
|
||||
@@ -390,8 +391,13 @@ namespace Lskj.Control
|
||||
try
|
||||
{
|
||||
string sql = "select * from " + _tableName + " where 1<>1";
|
||||
SqlDataAdapter dat = BaseImpl.GetAdapterResult(sql);
|
||||
SqlCommandBuilder scb = new SqlCommandBuilder(dat);
|
||||
//SqlDataAdapter dat = BaseImpl.GetAdapterResult(sql);
|
||||
//SqlCommandBuilder scb = new SqlCommandBuilder(dat);
|
||||
|
||||
DbDataAdapter dat = BaseImpl.GetAdapterResult(sql);
|
||||
DbCommandBuilder scb = SqlHelper.dbFactory.CreateCommandBuilder();
|
||||
scb.DataAdapter = dat;
|
||||
|
||||
DataTable datatb = new DataTable();
|
||||
DataTable failedData = new DataTable();
|
||||
dat.Fill(datatb);
|
||||
@@ -920,7 +926,7 @@ namespace Lskj.Control
|
||||
//bool isMultipleHeader = false;
|
||||
//if (this._gridEx is BandedGridControlEx) isMultipleHeader = true;
|
||||
//this.gcMain.GridView.Tag = isMultipleHeader;
|
||||
gcData = this.gcMain.GridView.ToExcelDataTable(fileName, colFields, true);
|
||||
gcData = this.gcMain.GridView.ToExcelDataTable(fileName, colFields, true,false,this.SysModel.AutoImportCalMode);
|
||||
|
||||
|
||||
//设置默认值
|
||||
@@ -1048,7 +1054,8 @@ namespace Lskj.Control
|
||||
List<string> ColumnNameList = GridExtend.ColumnNameList;
|
||||
|
||||
string sql = "select * from " + _tableName + " where 1<>1";
|
||||
SqlDataAdapter dat = BaseImpl.GetAdapterResult(sql);
|
||||
//SqlDataAdapter dat = BaseImpl.GetAdapterResult(sql);
|
||||
DbDataAdapter dat = BaseImpl.GetAdapterResult(sql);
|
||||
DataTable datatb = new DataTable();
|
||||
dat.Fill(datatb);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user