This commit is contained in:
2024-07-24 14:53:46 +08:00
parent b700f91cb6
commit 1e4464ca5e
8 changed files with 528 additions and 179 deletions
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 14);
AddDatasetToSQL(ds.Tables[0], 24);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -168,18 +168,99 @@ namespace FineUIPro.Web.Transfer
{
for (int i = 1; i < ir; i++)
{
string row4 = pds.Rows[i][9].ToString();
if (!string.IsNullOrEmpty(row4))
string allRowData = string.Empty;
for (int j = 0; j < 24; j++)
{
allRowData += pds.Rows[i][j].ToString();
}
if (string.IsNullOrWhiteSpace(allRowData))
continue;
string row3 = pds.Rows[i][3].ToString();
if (row3 != "" && row3 != "A" && row3 != "B" && row3 != "C" && row3 != "D")
{
result += (i + 2).ToString() + "," + " Cat. " + "," + "[" + row3 + "]错误!不是ABCD" + "|";
}
string row5 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row5))
{
try
{
DateTime date = Convert.ToDateTime(row4.Trim());
DateTime date = Convert.ToDateTime(row5.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "PUNCH ITEM FINISH DATE" + "," + "[" + row4 + "]错误!不是日期格式!" + "|";
result += (i + 2).ToString() + "," + " Date Raised " + "," + "[" + row5 + "]错误!不是日期格式!" + "|";
}
}
string row10 = pds.Rows[i][10].ToString();
if (!string.IsNullOrEmpty(row10))
{
try
{
DateTime date = Convert.ToDateTime(row10.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Required Date " + "," + "[" + row10 + "]错误!不是日期格式!" + "|";
}
}
string row15 = pds.Rows[i][15].ToString();
if (!string.IsNullOrEmpty(row15))
{
try
{
DateTime date = Convert.ToDateTime(row15.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Actual Date " + "," + "[" + row15 + "]错误!不是日期格式!" + "|";
}
}
string row17 = pds.Rows[i][17].ToString();
if (!string.IsNullOrEmpty(row17))
{
try
{
DateTime date = Convert.ToDateTime(row17.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Cleared(PIC Date " + "," + "[" + row17 + "]错误!不是日期格式!" + "|";
}
}
string row19 = pds.Rows[i][19].ToString();
if (!string.IsNullOrEmpty(row19))
{
try
{
DateTime date = Convert.ToDateTime(row19.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Confirmed(WUH) Date " + "," + "[" + row19 + "]错误!不是日期格式!" + "|";
}
}
string row21 = pds.Rows[i][21].ToString();
if (!string.IsNullOrEmpty(row21))
{
try
{
DateTime date = Convert.ToDateTime(row21.Trim());
}
catch (Exception)
{
result += (i + 2).ToString() + "," + " Verified(BASF) Date " + "," + "[" + row21 + "]错误!不是日期格式!" + "|";
}
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -286,7 +367,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 14);
AddDatasetToSQL2(ds.Tables[0], 24);
}
catch (Exception ex)
{
@@ -312,6 +393,7 @@ namespace FineUIPro.Web.Transfer
}
string result = string.Empty;
ir = pds.Rows.Count;
long? maxNumNO = -1;
if (pds != null && ir > 0)
{
List<Model.Transfer_PunchlistFrom> list = new List<Model.Transfer_PunchlistFrom>();
@@ -320,57 +402,66 @@ namespace FineUIPro.Web.Transfer
if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim()))
{
//查询第一列,没查到的情况下作导入处理
var modelOnly = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(x => x.Punch_No == pds.Rows[i][1].ToString().Trim()
&& x.ProjectId == CurrUser.LoginProjectId);
if (modelOnly == null)
{
Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Item_No = pds.Rows[i][0].ToString().Trim();
model.Punch_No = pds.Rows[i][1].ToString().Trim();
model.SystemName = pds.Rows[i][2].ToString().Trim();
model.Subsystem = pds.Rows[i][3].ToString().Trim();
model.Test_Package = pds.Rows[i][4].ToString().Trim();
model.Discipline = pds.Rows[i][5].ToString().Trim();
model.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
model.Identified = pds.Rows[i][7].ToString().Trim();
model.Category = pds.Rows[i][8].ToString().Trim();
DateTime t1;
if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
model.PUNCH_ITEM_FINISH_DATE = t1;
model.Action_By = pds.Rows[i][10].ToString().Trim();
model.Required_By = pds.Rows[i][11].ToString().Trim();
model.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
model.Comments = pds.Rows[i][13].ToString().Trim();
list.Add(model);
if (maxNumNO == -1) {
maxNumNO = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == CurrUser.LoginProjectId).Max(p => p.Num_NO);
if (maxNumNO == null)
maxNumNO = 1001;
}
Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Num_NO = maxNumNO;
model.System_No = pds.Rows[i][0].ToString().Trim();
model.Sub_Sys_No = pds.Rows[i][1].ToString().Trim();
model.DESCRIPTION = pds.Rows[i][2].ToString().Trim();
model.Cat = pds.Rows[i][3].ToString().Trim();
model.Raised_By = pds.Rows[i][4].ToString().Trim();
DateTime t5;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t5) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.Date_Raised = t5;
model.Disc = pds.Rows[i][6].ToString().Trim();
if (pds.Rows[i][7].ToString().Trim().Contains("Y"))
model.IsEng = true;
else
{
//修改
modelOnly.Item_No = pds.Rows[i][0].ToString().Trim();
modelOnly.Punch_No = pds.Rows[i][1].ToString().Trim();
modelOnly.SystemName = pds.Rows[i][2].ToString().Trim();
modelOnly.Subsystem = pds.Rows[i][3].ToString().Trim();
modelOnly.Test_Package = pds.Rows[i][4].ToString().Trim();
modelOnly.Discipline = pds.Rows[i][5].ToString().Trim();
modelOnly.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
modelOnly.Identified = pds.Rows[i][7].ToString().Trim();
modelOnly.Category = pds.Rows[i][8].ToString().Trim();
DateTime t1;
if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
modelOnly.PUNCH_ITEM_FINISH_DATE = t1;
modelOnly.Action_By = pds.Rows[i][10].ToString().Trim();
modelOnly.Required_By = pds.Rows[i][11].ToString().Trim();
modelOnly.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
modelOnly.Comments = pds.Rows[i][13].ToString().Trim();
Funs.DB.SubmitChanges();
}
model.IsEng = false;
if (pds.Rows[i][8].ToString().Trim().Contains("Y"))
model.IsMatI = true;
else
model.IsMatI = false;
model.Punch_Type = pds.Rows[i][9].ToString().Trim();
DateTime t10;
if (DateTime.TryParse(pds.Rows[i][10].ToString(), out t10) && !string.IsNullOrEmpty(pds.Rows[i][10].ToString()))
model.Required_Date = t10;
model.Action_By = pds.Rows[i][11].ToString().Trim();
model.PIC = pds.Rows[i][12].ToString().Trim();
model.PIC_WUH = pds.Rows[i][13].ToString().Trim();
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.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()))
model.Cleared_Date = t17;
model.Confirmed_By = pds.Rows[i][18].ToString().Trim();
DateTime t19;
if (DateTime.TryParse(pds.Rows[i][19].ToString(), out t19) && !string.IsNullOrEmpty(pds.Rows[i][19].ToString()))
model.Confirmed_Date = t19;
model.Verified_By = pds.Rows[i][20].ToString().Trim();
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();
list.Add(model);
maxNumNO++;
}
}
if (list.Count > 0)