lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1212

Browse Source
This commit is contained in:
李云虎
2024-07-29 17:25:07 +08:00
parent 1eb9661726
commit 569205fa76
14 changed files with 1149 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs
+16 -8
View File
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.Transfer
oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
oleDBConnString += "Data Source=";
oleDBConnString += fileName;
oleDBConnString += ";Extended Properties=Excel 8.0;";
oleDBConnString += ";Extended Properties='Excel 8.0;IMEX=1; 8.0;HDR=1;'";
OleDbConnection oleDBConn = null;
OleDbDataAdapter oleAdMaster = null;
DataTable m_tableName = new DataTable();
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 24);
AddDatasetToSQL(ds.Tables[0], 23);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -169,7 +169,7 @@ namespace FineUIPro.Web.Transfer
for (int i = 1; i < ir; i++)
{
string allRowData = string.Empty;
for (int j = 0; j < 24; j++)
for (int j = 0; j < 23; j++)
{
allRowData += pds.Rows[i][j].ToString();
}
@@ -343,7 +343,7 @@ namespace FineUIPro.Web.Transfer
oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
oleDBConnString += "Data Source=";
oleDBConnString += fileName;
oleDBConnString += ";Extended Properties=Excel 8.0;";
oleDBConnString += ";Extended Properties='Excel 8.0;IMEX=1; 8.0;HDR=1;'";
OleDbConnection oleDBConn = null;
OleDbDataAdapter oleAdMaster = null;
DataTable m_tableName = new DataTable();
@@ -367,7 +367,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 24);
AddDatasetToSQL2(ds.Tables[0], 23);
}
catch (Exception ex)
{
@@ -445,7 +445,7 @@ namespace FineUIPro.Web.Transfer
model.Correction_Action = pds.Rows[i][14].ToString().Trim();
DateTime t15;
if (DateTime.TryParse(pds.Rows[i][15].ToString(), out t15) && !string.IsNullOrEmpty(pds.Rows[i][15].ToString()))
model.PUNCH_ITEM_FINISH_DATE = t15;
model.Actual_Date = t15;
model.Cleared_By = pds.Rows[i][16].ToString().Trim();
DateTime t17;
if (DateTime.TryParse(pds.Rows[i][17].ToString(), out t17) && !string.IsNullOrEmpty(pds.Rows[i][17].ToString()))
@@ -458,8 +458,16 @@ namespace FineUIPro.Web.Transfer
DateTime t21;
if (DateTime.TryParse(pds.Rows[i][21].ToString(), out t21) && !string.IsNullOrEmpty(pds.Rows[i][21].ToString()))
model.Verified_Date = t21;
model.Status = pds.Rows[i][22].ToString().Trim();
model.Remark = pds.Rows[i][23].ToString().Trim();
model.Remark = pds.Rows[i][22].ToString().Trim();
if (model.Cleared_Date == null && model.Confirmed_Date == null && model.Verified_Date == null)
model.Status = "Not Start";
else if (model.Cleared_Date != null && model.Confirmed_Date != null && model.Verified_Date != null)
model.Status = "Completed";
else
model.Status = "In Progress";
list.Add(model);
maxNumNO++;
}