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

修改移交导入，修改的情况下，实际完成时间的修改

This commit is contained in:
潘鸿锋 2024-02-04 15:14:30 +08:00
parent 282586aed1
commit 40be92ba97
10 changed files with 79 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
View File

@ -368,11 +368,15 @@ namespace FineUIPro.Web.Transfer
modelOnly.Test_Package_START = t1; modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2; modelOnly.Test_Package_FINISH = t2;
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINAL_Status.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim()== "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

10
SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
View File

@ -368,11 +368,17 @@ namespace FineUIPro.Web.Transfer
modelOnly.Test_Package_START = t1; modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2; modelOnly.Test_Package_FINISH = t2;
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINAL_Status.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

10
SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
View File

@ -367,11 +367,17 @@ namespace FineUIPro.Web.Transfer
modelOnly.Test_Package_START = t1; modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2; modelOnly.Test_Package_FINISH = t2;
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINAL_Status.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

11
SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs
View File

@ -368,11 +368,18 @@ namespace FineUIPro.Web.Transfer
modelOnly.Test_Package_START = t1; modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2; modelOnly.Test_Package_FINISH = t2;
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINAL_Status.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

10
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
View File

@ -369,11 +369,17 @@ namespace FineUIPro.Web.Transfer
modelOnly.Test_Package_START = t1; modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2; modelOnly.Test_Package_FINISH = t2;
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINAL_Status.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }

10
SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
View File

@ -365,11 +365,17 @@ namespace FineUIPro.Web.Transfer
modelOnly.TestPackageSTART = t1; modelOnly.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.TestPackageFINISH = t2; modelOnly.TestPackageFINISH = t2;
modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINALStatus.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINALStatus.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim(); modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim(); modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();

10
SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
View File

@ -368,11 +368,17 @@ namespace FineUIPro.Web.Transfer
modelOnly.Test_Package_START = t1; modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2; modelOnly.Test_Package_FINISH = t2;
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINAL_Status.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

10
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
View File

@ -362,12 +362,18 @@ namespace FineUIPro.Web.Transfer
modelOnly.TestPackageSTART = t1; modelOnly.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.TestPackageFINISH = t2; modelOnly.TestPackageFINISH = t2;
modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
if (modelOnly.MechanicalFINALStatus.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }

10
SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
View File

@ -363,11 +363,17 @@ namespace FineUIPro.Web.Transfer
modelOnly.TestPackageSTART = t1; modelOnly.TestPackageSTART = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.TestPackageFINISH = t2; modelOnly.TestPackageFINISH = t2;
modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
if (modelOnly.MechanicalFINALStatus.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.MechanicalFINALStatus.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }

10
SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
View File

@ -368,11 +368,17 @@ namespace FineUIPro.Web.Transfer
modelOnly.Test_Package_START = t1; modelOnly.Test_Package_START = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
modelOnly.Test_Package_FINISH = t2; modelOnly.Test_Package_FINISH = t2;
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
if (modelOnly.FINAL_Status.ToLower() == "finished") //更改前不是finished，更改后是finished的，才修改实际完成时间
if (modelOnly.FINAL_Status.ToLower() != "finished" && pds.Rows[i][6].ToString().Trim() == "finished")
{ {
modelOnly.CompleteTime = DateTime.Now; modelOnly.CompleteTime = DateTime.Now;
} }
modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
//if (modelOnly.FINAL_Status.ToLower() == "finished")
//{
// modelOnly.CompleteTime = DateTime.Now;
//}
Funs.DB.SubmitChanges(); Funs.DB.SubmitChanges();
} }
} }