From fabf86ce86d9d53855d9273d4208551297f3eccc Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 24 Dec 2024 19:25:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Chart/PunchlistFromChartNew.aspx.cs | 50 +++++++++---------- .../Transfer/CivilStructureEdit.aspx | 2 + .../Transfer/CivilStructureEdit.aspx.cs | 2 + .../Transfer/ElectricalEdit.aspx | 4 ++ .../Transfer/ElectricalEdit.aspx.cs | 1 + .../Transfer/FirefightingEdit.aspx | 3 ++ .../Transfer/FirefightingEdit.aspx.cs | 2 + .../Transfer/InstrumentationEdit.aspx | 3 ++ .../Transfer/InstrumentationEdit.aspx.cs | 1 + SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx | 3 ++ .../FineUIPro.Web/Transfer/PipingEdit.aspx.cs | 1 + SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx | 3 ++ .../Transfer/PlumbingEdit.aspx.cs | 2 + .../Transfer/RotatingEquipmentEdit.aspx | 4 ++ .../Transfer/RotatingEquipmentEdit.aspx.cs | 2 + .../Transfer/StaticEquipmentEdit.aspx | 3 ++ .../Transfer/StaticEquipmentEdit.aspx.cs | 1 + SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx | 4 ++ .../Transfer/TelecomEdit.aspx.cs | 7 +-- 19 files changed, 70 insertions(+), 28 deletions(-) diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs index 8f67f4ca..3ee821de 100644 --- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs @@ -346,31 +346,31 @@ namespace FineUIPro.Web.Transfer.Chart from #AllPunchlistFromSortTemp1 Group by Disc; "); strSql.AppendLine(@" update a set allCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc), - allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Required_Date is not null or b.Required_Date!='')), + allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and b.Status = 'Completed'), allWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), allBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Verified_Date is not null or b.Verified_Date!='')), a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')), - a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and b.Status = 'Completed'), a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) , - a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and b.Status = 'Completed'), a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) , - a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and b.Status = 'Completed'), a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) , - a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and b.Status = 'Completed'), a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!='')) @@ -489,31 +489,31 @@ namespace FineUIPro.Web.Transfer.Chart from #AllPunchlistFromSortTemp2 Group by Action_By; "); strSql.AppendLine(@" update a set allCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By), - allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Required_Date is not null or b.Required_Date!='')), + allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and b.Status = 'Completed'), allWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), allBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Verified_Date is not null or b.Verified_Date!='')), a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')), - a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and b.Status = 'Completed'), a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) , - a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and b.Status = 'Completed'), a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) , - a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and b.Status = 'Completed'), a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) , - a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and b.Status = 'Completed'), a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!='')) @@ -680,31 +680,31 @@ namespace FineUIPro.Web.Transfer.Chart from #AllPunchlistFromProgressTemp Group by Sub_Sys_No; "); strSql.AppendLine(@" update a set allCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No), - allfinshedCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Required_Date is not null or b.Required_Date!='')), + allfinshedCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and b.Status = 'Completed'), allWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), allBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Verified_Date is not null or b.Verified_Date!='')), a.Cat_A_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')), - a.Cat_A_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_A_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and b.Status = 'Completed'), a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) , - a.Cat_B_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_B_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and b.Status = 'Completed'), a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) , - a.Cat_C_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_C_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and b.Status = 'Completed'), a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!='')) ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) , - a.Cat_D_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')), + a.Cat_D_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and b.Status = 'Completed'), a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!='')) @@ -772,17 +772,17 @@ namespace FineUIPro.Web.Transfer.Chart allBASF += Convert.ToInt32(row["allBASF"]); } - //var Cat_A_CountPercent = 100 * ((float)Cat_A_Countf / (float)cat_A_Count); - //var Cat_B_CountPercent = 100 * ((float)Cat_B_Countf / (float)cat_B_Count); - //var Cat_C_CountPercent = 100 * ((float)Cat_C_Countf / (float)cat_C_Count); - //var Cat_D_CountPercent = 100 * ((float)Cat_D_Countf / (float)cat_D_Count); - //var allCountPercent = 100 * ((float)allfinshedCount / (float)allCount); + var Cat_A_CountPercent = Cat_A_Countf > 0 && cat_A_Count > 0 ? 100 * ((float)Cat_A_Countf / (float)cat_A_Count) : 0; + var Cat_B_CountPercent = Cat_B_Countf > 0 && cat_B_Count > 0 ? 100 * ((float)Cat_B_Countf / (float)cat_B_Count) : 0; + var Cat_C_CountPercent = Cat_C_Countf > 0 && cat_C_Count > 0 ? 100 * ((float)Cat_C_Countf / (float)cat_C_Count) : 0; + var Cat_D_CountPercent = Cat_D_Countf > 0 && cat_D_Count > 0 ? 100 * ((float)Cat_D_Countf / (float)cat_D_Count) : 0; + var allCountPercent = allfinshedCount > 0 && allCount > 0 ? 100 * ((float)allfinshedCount / (float)allCount) : 0; - var Cat_A_CountPercent = Cat_A_Countf > 0 && cat_A_Count > 0 ? 100 * ((decimal)(Cat_A_Countf / cat_A_Count)) : 0; - var Cat_B_CountPercent = Cat_B_Countf > 0 && cat_B_Count > 0 ? 100 * ((decimal)(Cat_B_Countf / cat_B_Count)) : 0; - var Cat_C_CountPercent = Cat_C_Countf > 0 && cat_C_Count > 0 ? 100 * ((decimal)(Cat_C_Countf / cat_C_Count)) : 0; - var Cat_D_CountPercent = Cat_D_Countf > 0 && cat_D_Count > 0 ? 100 * ((decimal)(Cat_D_Countf / cat_D_Count)) : 0; - var allCountPercent = allfinshedCount > 0 && allCount > 0 ? 100 * ((decimal)(allfinshedCount / allCount)) : 0; + //var Cat_A_CountPercent = Cat_A_Countf > 0 && cat_A_Count > 0 ? 100 * ((decimal)(Cat_A_Countf / cat_A_Count)) : 0; + //var Cat_B_CountPercent = Cat_B_Countf > 0 && cat_B_Count > 0 ? 100 * ((decimal)(Cat_B_Countf / cat_B_Count)) : 0; + //var Cat_C_CountPercent = Cat_C_Countf > 0 && cat_C_Count > 0 ? 100 * ((decimal)(Cat_C_Countf / cat_C_Count)) : 0; + //var Cat_D_CountPercent = Cat_D_Countf > 0 && cat_D_Count > 0 ? 100 * ((decimal)(Cat_D_Countf / cat_D_Count)) : 0; + //var allCountPercent = allfinshedCount > 0 && allCount > 0 ? 100 * ((decimal)(allfinshedCount / allCount)) : 0; JObject summary = new JObject(); summary.Add("SubSysNo", "合计"); diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx index 4f5c2316..836c1282 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx @@ -56,6 +56,7 @@ + @@ -63,6 +64,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs index 6c2142d9..5567e948 100644 --- a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs @@ -112,6 +112,8 @@ namespace FineUIPro.Web.Transfer //listObj.Add(model.Electrical); //listObj.Add(model.FireFighting); //listObj.Add(model.HVAC); + + model.FINAL_Status = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2) { diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx index 19c6efa4..b7d78873 100644 --- a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx @@ -56,6 +56,7 @@ + @@ -63,6 +64,7 @@ + @@ -70,6 +72,7 @@ + @@ -77,6 +80,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs index 86662b60..c0d55cb5 100644 --- a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs @@ -99,6 +99,7 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.CableLaying); listObj.Add(model.LoopTest); + model.FINAL_Status = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) { diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx index 2c06f8dc..38f88068 100644 --- a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx @@ -51,6 +51,7 @@ + @@ -58,6 +59,7 @@ + @@ -65,6 +67,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs index 89fb8978..5b0b4837 100644 --- a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs @@ -84,6 +84,8 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.Installation); listObj.Add(model.Debugging); listObj.Add(model.Acceptancecheck); + + model.FINAL_Status = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx index a7265c32..54ffba44 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx @@ -63,6 +63,7 @@ --%> + @@ -84,6 +85,7 @@ --%> + @@ -91,6 +93,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs index 9e1eb6ea..0c2908a8 100644 --- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs @@ -105,6 +105,7 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.Looptest); //listObj.Add(model.Calibration); + model.FINAL_Status = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx index c36c27d2..f831c237 100644 --- a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx @@ -176,6 +176,7 @@ + @@ -183,6 +184,7 @@ + @@ -190,6 +192,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs index f1e9f3ad..c1eaa9ec 100644 --- a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs @@ -140,6 +140,7 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.RinseAndBlowClean); listObj.Add(model.Reduction); + model.FINALStatus = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx index 02f98b2c..1599b126 100644 --- a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx @@ -51,6 +51,7 @@ + @@ -58,6 +59,7 @@ + @@ -65,6 +67,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs index 8a503e28..9062a304 100644 --- a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs @@ -84,6 +84,8 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.Ndt); listObj.Add(model.Flushing); listObj.Add(model.RunningTest); + + model.FINAL_Status = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx index 89be1eda..8dd019e8 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx @@ -56,6 +56,7 @@ + @@ -63,6 +64,7 @@ + @@ -70,6 +72,7 @@ + @@ -77,6 +80,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs index d0f73a2b..d14aff58 100644 --- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs @@ -96,6 +96,8 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.Motorsoloruntest); listObj.Add(model.Standalonetest); listObj.Add(model.Lubricatefilling); + + model.MechanicalFINALStatus = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) { diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx index 55a8b5fa..e0516f61 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx @@ -56,6 +56,7 @@ + @@ -63,6 +64,7 @@ + @@ -70,6 +72,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs index 4c9ed7ec..3bf9c95a 100644 --- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs @@ -95,6 +95,7 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.InternalsPacking); listObj.Add(model.BOXupRecord); + model.MechanicalFINALStatus = "Not Start"; //全是NA或Completed 状态是Completed if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) { diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx index 48174a64..328f74f6 100644 --- a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx +++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx @@ -56,6 +56,7 @@ + @@ -63,6 +64,7 @@ + @@ -70,6 +72,7 @@ + @@ -77,6 +80,7 @@ + diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs index c5ffac8f..b211854b 100644 --- a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs @@ -87,7 +87,7 @@ namespace FineUIPro.Web.Transfer Communication = ddlCommunication.SelectedValue, CableLaying = ddlCableLaying.SelectedValue, FunctionTest = ddlFunctionTest.SelectedValue, - Descriptions= txtDescriptions.Text, + Descriptions = txtDescriptions.Text, }; #region 判断状态 @@ -96,8 +96,10 @@ namespace FineUIPro.Web.Transfer listObj.Add(model.Communication); listObj.Add(model.CableLaying); listObj.Add(model.FunctionTest); + + model.FINAL_Status = "Not Start"; //全是NA或Completed 状态是Completed - if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count ==4) + if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) { model.FINAL_Status = "Completed"; } @@ -106,7 +108,6 @@ namespace FineUIPro.Web.Transfer { model.FINAL_Status = "Not Start"; } - //如果其中有一项是In progress 或Not Start 是 In progress else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) {