diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs index 27aa40b4..adb45470 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs @@ -368,11 +368,15 @@ namespace FineUIPro.Web.Transfer modelOnly.Test_Package_START = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.FINAL_Status = pds.Rows[i][6].ToString().Trim(); + + Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs index 210b4df8..aeeea6c2 100644 --- a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs @@ -368,11 +368,17 @@ namespace FineUIPro.Web.Transfer modelOnly.Test_Package_START = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.FINAL_Status = pds.Rows[i][6].ToString().Trim(); + //if (modelOnly.FINAL_Status.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs index 537d4feb..c43a1635 100644 --- a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs @@ -367,11 +367,17 @@ namespace FineUIPro.Web.Transfer modelOnly.Test_Package_START = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.FINAL_Status = pds.Rows[i][6].ToString().Trim(); + //if (modelOnly.FINAL_Status.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs index 9f190958..2546c201 100644 --- a/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs @@ -368,11 +368,18 @@ namespace FineUIPro.Web.Transfer modelOnly.Test_Package_START = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.FINAL_Status = pds.Rows[i][6].ToString().Trim(); + //if (modelOnly.FINAL_Status.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs index 04a129a9..d9d6b047 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs @@ -369,11 +369,17 @@ namespace FineUIPro.Web.Transfer modelOnly.Test_Package_START = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.FINAL_Status = pds.Rows[i][6].ToString().Trim(); + //if (modelOnly.FINAL_Status.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs index e6b99b72..d963d8b1 100644 --- a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs @@ -365,11 +365,17 @@ namespace FineUIPro.Web.Transfer modelOnly.TestPackageSTART = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.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.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim(); Funs.DB.SubmitChanges(); diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs index eac8c964..2f93eb19 100644 --- a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs @@ -368,11 +368,17 @@ namespace FineUIPro.Web.Transfer modelOnly.Test_Package_START = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.FINAL_Status = pds.Rows[i][6].ToString().Trim(); + //if (modelOnly.FINAL_Status.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs index 46d84158..13892880 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs @@ -362,12 +362,18 @@ namespace FineUIPro.Web.Transfer modelOnly.TestPackageSTART = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim(); + + //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs index 2746a5c5..e7b32c94 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs @@ -363,11 +363,17 @@ namespace FineUIPro.Web.Transfer modelOnly.TestPackageSTART = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim(); + //if (modelOnly.MechanicalFINALStatus.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs index a67ffc19..d6aa2dea 100644 --- a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs @@ -368,11 +368,17 @@ namespace FineUIPro.Web.Transfer modelOnly.Test_Package_START = t1; if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString())) 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.FINAL_Status = pds.Rows[i][6].ToString().Trim(); + //if (modelOnly.FINAL_Status.ToLower() == "finished") + //{ + // modelOnly.CompleteTime = DateTime.Now; + //} Funs.DB.SubmitChanges(); } }