diff --git a/HJGL_ZH/BLL/Common/NPOIHelper.cs b/HJGL_ZH/BLL/Common/NPOIHelper.cs index 455fc95..a0c38f0 100644 --- a/HJGL_ZH/BLL/Common/NPOIHelper.cs +++ b/HJGL_ZH/BLL/Common/NPOIHelper.cs @@ -78,6 +78,97 @@ namespace BLL.Common return dt; } + + + public static DataTable ExcelToDataTable1(string filePath) + { + var dt = new DataTable(); + using (var file = new FileStream(filePath, FileMode.Open, FileAccess.Read)) + { + var hssfworkbook = new HSSFWorkbook(file); + var sheet = hssfworkbook.GetSheetAt(0); + var rows = sheet.GetRowEnumerator(); + rows.MoveNext(); + var row = (HSSFRow)rows.Current; + for (var j = 0; j < row.LastCellNum; j++) + { + var cell = row.GetCell(j); + if (cell != null) + { + dt.Columns.Add(cell.StringCellValue); + } + else + { + dt.Columns.Add("collum" + j); + } + + } + while (rows.MoveNext()) + { + row = (HSSFRow)rows.Current; + var dr = dt.NewRow(); + for (var i = 0; i < row.LastCellNum; i++) + { + var cell = row.GetCell(i); + if (cell == null) + { + dr[i] = null; + } + else + { + try + { + switch (cell.CellType) + { + case CellType.Blank: + //dr[i] = "[null]"; + break; + case CellType.Boolean: + dr[i] = cell.BooleanCellValue; + break; + case CellType.Numeric: + dr[i] = cell.ToString(); + break; + case CellType.String: + dr[i] = cell.StringCellValue; + break; + case CellType.Error: + dr[i] = cell.ErrorCellValue; + break; + case CellType.Formula: + try + { + dr[i] = cell.NumericCellValue; + } + catch + { + try + { + dr[i] = cell.StringCellValue; + } + catch + { + dr[i] = null; + } + } + break; + default: + dr[i] = "=" + cell.CellFormula; + break; + } + } + catch (Exception ex) + { + } + } + } + dt.Rows.Add(dr); + } + } + return dt; + } + + /// /// Excel转换成DataSet（.xlsx/.xls） /// diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/DataIn.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/DataIn.aspx.cs index 8a354f0..b539d61 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/DataIn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/DataIn.aspx.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Data; - using System.Data.OleDb; using System.Data.SqlClient; using System.IO; using System.Linq; @@ -11,6 +10,7 @@ using System.Web.UI; using System.Web.UI.WebControls; using BLL; + using BLL.Common; public partial class DataIn : PageBase { @@ -300,31 +300,34 @@ string fileUrl = initFullPath + BLL.Funs.GetNewFileName() + IsXls; this.FileExcel.PostedFile.SaveAs(fileUrl); - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileUrl; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.SelectCommand.CommandTimeout = 3600; - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); - this.AddDatasetToSQL(ds.Tables[0]); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileUrl; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.SelectCommand.CommandTimeout = 3600; + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); + //this.AddDatasetToSQL(ds.Tables[0]); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileUrl); + this.AddDatasetToSQL(dt); if (!string.IsNullOrEmpty(fileUrl) && System.IO.File.Exists(fileUrl)) { System.IO.File.Delete(fileUrl);//删除上传的XLS文件 diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs index 57de2f9..b9406ab 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.OleDb; using System.Data.SqlClient; using System.IO; using System.Linq; @@ -9,6 +8,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using BLL; +using BLL.Common; namespace FineUIPro.Web.HJGL.DataIn { public partial class JointIn : PageBase @@ -100,31 +100,34 @@ namespace FineUIPro.Web.HJGL.DataIn string fileUrl = initFullPath + BLL.Funs.GetNewFileName() + IsXls; this.FileExcel.PostedFile.SaveAs(fileUrl); - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileUrl; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.SelectCommand.CommandTimeout = 3600; - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); - this.AddDatasetToSQL(ds.Tables[0]); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileUrl; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.SelectCommand.CommandTimeout = 3600; + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); + //this.AddDatasetToSQL(ds.Tables[0]); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileUrl); + this.AddDatasetToSQL(dt); if (!string.IsNullOrEmpty(fileUrl) && System.IO.File.Exists(fileUrl)) { System.IO.File.Delete(fileUrl);//删除上传的XLS文件 diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs index 8704634..1b426c2 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGL/DataIn/PipeLineIn.aspx.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.OleDb; using System.Data.SqlClient; using System.IO; using System.Linq; @@ -9,6 +8,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using BLL; +using BLL.Common; namespace FineUIPro.Web.HJGL.DataIn { public partial class PipeLineIn : PageBase @@ -99,31 +99,34 @@ namespace FineUIPro.Web.HJGL.DataIn string fileUrl = initFullPath + BLL.Funs.GetNewFileName() + IsXls; this.FileExcel.PostedFile.SaveAs(fileUrl); - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileUrl; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.SelectCommand.CommandTimeout = 3600; - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); - this.AddDatasetToSQL(ds.Tables[0]); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileUrl; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.SelectCommand.CommandTimeout = 3600; + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); + //this.AddDatasetToSQL(ds.Tables[0]); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileUrl); + this.AddDatasetToSQL(dt); if (!string.IsNullOrEmpty(fileUrl) && System.IO.File.Exists(fileUrl)) { System.IO.File.Delete(fileUrl);//删除上传的XLS文件 diff --git a/HJGL_ZH/FineUIPro.Web/HJGLServer/WeldingManage/WeldingProcedureIn.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGLServer/WeldingManage/WeldingProcedureIn.aspx.cs index f6d233d..241b51b 100644 --- a/HJGL_ZH/FineUIPro.Web/HJGLServer/WeldingManage/WeldingProcedureIn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/HJGLServer/WeldingManage/WeldingProcedureIn.aspx.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using BLL; using System.IO; -using System.Data.OleDb; using System.Data; +using BLL.Common; namespace FineUIPro.Web.HJGLServer.WeldingManage { @@ -103,35 +103,39 @@ namespace FineUIPro.Web.HJGLServer.WeldingManage { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 25); + //AddDatasetToSQL(ds.Tables[0], 25); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + AddDatasetToSQL(dt, 25); } catch (Exception ex) { @@ -350,35 +354,39 @@ namespace FineUIPro.Web.HJGLServer.WeldingManage { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 25); + //AddDatasetToSQL2(ds.Tables[0], 25); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + AddDatasetToSQL2(dt, 25); } catch (Exception ex) { diff --git a/HJGL_ZH/FineUIPro.Web/WeldMat/BaseInfo/WeldInfoIn.aspx.cs b/HJGL_ZH/FineUIPro.Web/WeldMat/BaseInfo/WeldInfoIn.aspx.cs index f03e13c..53ecbd5 100644 --- a/HJGL_ZH/FineUIPro.Web/WeldMat/BaseInfo/WeldInfoIn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/WeldMat/BaseInfo/WeldInfoIn.aspx.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using BLL; using System.IO; -using System.Data.OleDb; using System.Data; +using BLL.Common; namespace FineUIPro.Web.WeldMat.BaseInfo { @@ -103,35 +103,39 @@ namespace FineUIPro.Web.WeldMat.BaseInfo { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 7); + //AddDatasetToSQL(ds.Tables[0], 7); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + AddDatasetToSQL(dt, 7); } catch (Exception ex) { @@ -280,35 +284,39 @@ namespace FineUIPro.Web.WeldMat.BaseInfo { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 7); + //AddDatasetToSQL2(ds.Tables[0], 7); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + AddDatasetToSQL2(dt, 7); } catch (Exception ex) { diff --git a/HJGL_ZH/FineUIPro.Web/Welder/WeldRecordIn.aspx.cs b/HJGL_ZH/FineUIPro.Web/Welder/WeldRecordIn.aspx.cs index 327525d..935115f 100644 --- a/HJGL_ZH/FineUIPro.Web/Welder/WeldRecordIn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/Welder/WeldRecordIn.aspx.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; using System.Data; -using System.Data.OleDb; using System.IO; using System.Linq; using System.Web; using System.Data.SqlClient; using System.Web.UI.WebControls; using BLL; +using BLL.Common; namespace FineUIPro.Web.Welder { public partial class WeldRecordIn : PageBase @@ -320,31 +320,34 @@ namespace FineUIPro.Web.Welder string fileUrl = initFullPath + BLL.Funs.GetNewFileName() + IsXls; this.FileExcel.PostedFile.SaveAs(fileUrl); - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileUrl; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.SelectCommand.CommandTimeout = 3600; - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); - this.AddDatasetToSQL(ds.Tables[0]); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileUrl; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.SelectCommand.CommandTimeout = 3600; + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); + //this.AddDatasetToSQL(ds.Tables[0]); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileUrl); + this.AddDatasetToSQL(dt); if (!string.IsNullOrEmpty(fileUrl) && System.IO.File.Exists(fileUrl)) { System.IO.File.Delete(fileUrl);//删除上传的XLS文件 diff --git a/HJGL_ZH/FineUIPro.Web/common/WelderManage/WelderIn.aspx.cs b/HJGL_ZH/FineUIPro.Web/common/WelderManage/WelderIn.aspx.cs index c5d7996..c4cd3b2 100644 --- a/HJGL_ZH/FineUIPro.Web/common/WelderManage/WelderIn.aspx.cs +++ b/HJGL_ZH/FineUIPro.Web/common/WelderManage/WelderIn.aspx.cs @@ -1,10 +1,11 @@ -using System; +using BLL; +using BLL.Common; +using System; using System.Collections.Generic; -using System.Linq; -using BLL; -using System.IO; -using System.Data.OleDb; using System.Data; +using System.Data.OleDb; +using System.IO; +using System.Linq; namespace FineUIPro.Web.common.WelderManage { @@ -103,35 +104,39 @@ namespace FineUIPro.Web.common.WelderManage { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 11); + //AddDatasetToSQL(ds.Tables[0], 11); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + AddDatasetToSQL(dt, 11); } catch (Exception ex) { @@ -275,35 +280,39 @@ namespace FineUIPro.Web.common.WelderManage { try { - string oleDBConnString = String.Empty; - oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - oleDBConnString += "Data Source="; - oleDBConnString += fileName; - oleDBConnString += ";Extended Properties=Excel 8.0;"; - OleDbConnection oleDBConn = null; - OleDbDataAdapter oleAdMaster = null; - DataTable m_tableName = new DataTable(); - DataSet ds = new DataSet(); + //string oleDBConnString = String.Empty; + //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; + //oleDBConnString += "Data Source="; + //oleDBConnString += fileName; + //oleDBConnString += ";Extended Properties=Excel 8.0;"; + //OleDbConnection oleDBConn = null; + //OleDbDataAdapter oleAdMaster = null; + //DataTable m_tableName = new DataTable(); + //DataSet ds = new DataSet(); - oleDBConn = new OleDbConnection(oleDBConnString); - oleDBConn.Open(); - m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); + //oleDBConn = new OleDbConnection(oleDBConnString); + //oleDBConn.Open(); + //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - if (m_tableName != null && m_tableName.Rows.Count > 0) - { + //if (m_tableName != null && m_tableName.Rows.Count > 0) + //{ - m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); + // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - } - string sqlMaster; - sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - oleAdMaster.Fill(ds, "m_tableName"); - oleAdMaster.Dispose(); - oleDBConn.Close(); - oleDBConn.Dispose(); + //} + //string sqlMaster; + //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; + //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); + //oleAdMaster.Fill(ds, "m_tableName"); + //oleAdMaster.Dispose(); + //oleDBConn.Close(); + //oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 11); + //AddDatasetToSQL2(ds.Tables[0], 11); + + DataTable dt = NPOIHelper.ExcelToDataTable1(fileName); + + AddDatasetToSQL2(dt, 11); } catch (Exception ex) {