From 281fbb3b25f1c259976ecff97a9df8a43d9ed92b Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Tue, 24 Dec 2024 17:14:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= 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) { From 47ec23c97701ff55db3675b7e58d4069cf6100e4 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 25 Dec 2024 09:24:30 +0800 Subject: [PATCH 2/6] =?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 --- SGGL/BLL/ProjectData/ProjectService.cs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index d0a95b6f..3edb8d1f 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -141,6 +141,7 @@ Progress = project.Progress, ProjType = project.ProjType, ProjPhase = project.ProjPhase, + MasterSysId = project.MasterSysId, }; db.Base_Project.InsertOnSubmit(newProject); db.SubmitChanges(); @@ -191,6 +192,7 @@ newProject.Progress = project.Progress; newProject.ProjType = project.ProjType; newProject.ProjPhase = project.ProjPhase; + newProject.MasterSysId = project.MasterSysId; db.SubmitChanges(); HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject); } @@ -261,14 +263,15 @@ select x).ToList(); return list; } - else { + else + { var list = (from x in Funs.DB.Base_Project where pids.Contains(x.ProjectId) orderby x.ProjectCode descending select x).ToList(); return list; } - + } @@ -327,7 +330,7 @@ /// 获取userId参与项目下拉框 /// /// - public static List GetProjectByUserIdStateDropDownList(string userId, string state,string urlType="") + public static List GetProjectByUserIdStateDropDownList(string userId, string state, string urlType = "") { if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId) { @@ -345,7 +348,7 @@ if (!string.IsNullOrEmpty(urlType)) { //五环的能看所有项目，否则只能看项目用户中有自己或者所属单位是自己单位的 - if (getRoleP != null && getUser.UnitId== Const.UnitId_CWCEC) + if (getRoleP != null && getUser.UnitId == Const.UnitId_CWCEC) { return (from x in Funs.DB.Base_Project where x.ProjectState == state @@ -356,12 +359,13 @@ { return (from x in Funs.DB.Base_Project join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId - where ( (y.UserId == userId && y.IsPost == true)|| x.UnitId== getUser.UnitId) && x.ProjectState == state + where ((y.UserId == userId && y.IsPost == true) || x.UnitId == getUser.UnitId) && x.ProjectState == state orderby x.ProjectCode descending select x).Distinct().ToList(); } } - else { + else + { if (getRoleP != null) { return (from x in Funs.DB.Base_Project @@ -482,7 +486,7 @@ /// /// /// - public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease,string urlType="") + public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease, string urlType = "") { dropName.DataValueField = "ProjectId"; dropName.DataTextField = "ProjectName"; @@ -706,7 +710,8 @@ #region 加载公司级别项目 public static List GetUnEndProjectByUserIdDropDownList(string projectState, - string projectName = null, string projectCode = null) { + string projectName = null, string projectCode = null) + { IQueryable projects = (from x in Funs.DB.Base_Project where x.ProjectState == projectState orderby x.ProjectCode descending From 5c045bd9110415534bf6eed106ab4db8b7490f20 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 25 Dec 2024 10:07:39 +0800 Subject: [PATCH 3/6] =?UTF-8?q?20241225=20=E8=B4=A8=E9=87=8F=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=E6=9C=88=E6=8A=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/BLL.csproj | 2 +- SGGL/BLL/app.config | 2 +- .../CQMS/ManageReportNew/MonthReportEdit.aspx | 18 +- .../ManageReportNew/MonthReportEdit.aspx.cs | 24 ++- .../CQMS/ManageReportNew/WeekReportEdit.aspx | 18 +- .../ManageReportNew/WeekReportEdit.aspx.cs | 28 ++- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 7 +- SGGL/FineUIPro.Web/Web.config | 166 +++++++++--------- SGGL/FineUIPro.Web/packages.config | 2 +- SGGL/Model/Model.csproj | 2 +- SGGL/SgManager.AI/SgManager.AI.csproj | 2 +- SGGL/WebAPI/WebAPI.csproj | 2 +- 12 files changed, 155 insertions(+), 118 deletions(-) diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 7a73dcf4..f696263a 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -10,7 +10,7 @@ Properties BLL BLL - v4.6.2 + v4.6.1 512 diff --git a/SGGL/BLL/app.config b/SGGL/BLL/app.config index 11911cae..39f6fcea 100644 --- a/SGGL/BLL/app.config +++ b/SGGL/BLL/app.config @@ -61,4 +61,4 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx index e44e6139..ae969cac 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx @@ -163,7 +163,7 @@ - + @@ -248,7 +248,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -265,7 +265,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -282,7 +282,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -675,7 +675,7 @@ - + @@ -861,7 +861,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -1856,7 +1856,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -1873,7 +1873,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -1891,7 +1891,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index d451cdfa..b380ad97 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -437,6 +437,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 本月质量目标管理情况 Grid1方法 protected void btnAddGrid1_Click(object sender, EventArgs e) { + SaveMethod(); + Grid1.Hidden = false; JArray teamGroupData = Grid1.GetMergedData(); @@ -1072,6 +1074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 7.2 PQR/WPS报验情况 Grid9方法 protected void btnAddGrid9_Click(object sender, EventArgs e) { + SaveMethod(); Grid9.Hidden = false; JArray teamGroupData = Grid9.GetMergedData(); @@ -2521,6 +2524,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnRowMaterialProblem_Click(object sender, EventArgs e) { + SaveMethod(); gvRowMaterialProblem.Hidden = false; JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); @@ -2575,6 +2579,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddConstructionProblems_Click(object sender, EventArgs e) { + SaveMethod(); gvConstructionProblems.Hidden = false; JArray teamGroupData = gvConstructionProblems.GetMergedData(); @@ -2643,6 +2648,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddNextControl_Click(object sender, EventArgs e) { + SaveMethod(); gvNextQualityControl.Hidden = false; JArray teamGroupData = gvNextQualityControl.GetMergedData(); @@ -2677,6 +2683,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 23.施工照片 protected void filePhoto_FileSelected(object sender, EventArgs e) { + SaveMethod(); if (filePhoto.HasFile) { string fileName = filePhoto.ShortFileName; @@ -2818,6 +2825,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ShowNotify("周期不能为空！", MessageBoxIcon.Warning); return; } + SaveMethod(); + + ShowNotify("编辑成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + private void SaveMethod() + { Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New(); report.Id = ReportId; report.ProjectId = this.CurrUser.LoginProjectId; @@ -2923,7 +2938,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew saveConstructionProblems(); //保存19.下月质量控制重点 saveNextQualityControl(); - //保存23.施工照片 saveImages(); @@ -2939,9 +2953,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { WeekAndMonthReportNewService.Update(report); } - - ShowNotify("编辑成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } #region 保存本月质量目标管理情况 @@ -4006,5 +4017,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #endregion #endregion + + protected void Text_TextChanged(object sender, EventArgs e) + { + SaveMethod(); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx index 2aa7e32d..47dd984f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx @@ -162,7 +162,7 @@ - + @@ -247,7 +247,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -264,7 +264,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -281,7 +281,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -674,7 +674,7 @@ - + @@ -860,7 +860,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -1855,7 +1855,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -1872,7 +1872,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> @@ -1890,7 +1890,7 @@ + AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged"> diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs index d97a9800..37905120 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs @@ -378,6 +378,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 本月质量目标管理情况 Grid1方法 protected void btnAddGrid1_Click(object sender, EventArgs e) { + SaveMethod(); Grid1.Hidden = false; JArray teamGroupData = Grid1.GetMergedData(); @@ -1003,6 +1004,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 7.2 PQR/WPS报验情况 Grid9方法 protected void btnAddGrid9_Click(object sender, EventArgs e) { + SaveMethod(); Grid9.Hidden = false; JArray teamGroupData = Grid9.GetMergedData(); @@ -2457,6 +2459,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnRowMaterialProblem_Click(object sender, EventArgs e) { + SaveMethod(); gvRowMaterialProblem.Hidden = false; JArray teamGroupData = gvRowMaterialProblem.GetMergedData(); @@ -2511,6 +2514,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddConstructionProblems_Click(object sender, EventArgs e) { + SaveMethod(); gvConstructionProblems.Hidden = false; JArray teamGroupData = gvConstructionProblems.GetMergedData(); @@ -2579,6 +2583,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected void btnAddNextControl_Click(object sender, EventArgs e) { + SaveMethod(); gvNextQualityControl.Hidden = false; JArray teamGroupData = gvNextQualityControl.GetMergedData(); @@ -2613,6 +2618,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #region 23.施工照片 protected void filePhoto_FileSelected(object sender, EventArgs e) { + SaveMethod(); if (filePhoto.HasFile) { string fileName = filePhoto.ShortFileName; @@ -2754,6 +2760,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew ShowNotify("周期不能为空！", MessageBoxIcon.Warning); return; } + SaveMethod(); + ShowNotify("编辑成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + #region 保存方法 + /// + /// 保存方法 + /// + private void SaveMethod() + { Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New(); report.Id = ReportId; report.ProjectId = this.CurrUser.LoginProjectId; @@ -2875,10 +2892,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { WeekAndMonthReportNewService.Update(report); } - - ShowNotify("编辑成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } + #endregion #region 保存本月质量目标管理情况 void saveTarget() @@ -3939,8 +3954,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew db.Report_TextBoxContent.InsertAllOnSubmit(ImageLists); db.SubmitChanges(); } + #endregion #endregion + + protected void Text_TextChanged(object sender, EventArgs e) + { + SaveMethod(); + } + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 11c97548..bf756aae 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -12,7 +12,7 @@ Properties FineUIPro.Web FineUIPro.Web - v4.6.2 + v4.6.1 true @@ -104,8 +104,7 @@ ..\FineUIPro\Reference BLL\Microsoft.QualityTools.Testing.Fakes.dll - False - bin\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\NPOI.2.5.5\lib\net45\NPOI.dll @@ -19321,7 +19320,7 @@ - + -
+
- + - - - - - - - + + + + + + + - - - - + + + + - + - + - - - + + + - + - + - + - - + + - + - + - - - + + + - - + + - - + + - - + + - + - - + + - - + + - - - + + + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - - - - + + + + - + - + - - + + - - + + @@ -178,26 +178,26 @@ - - - - - - + + - - + + - - + + - - + + + + + + - + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/packages.config b/SGGL/FineUIPro.Web/packages.config index 912667ad..0feab1ae 100644 --- a/SGGL/FineUIPro.Web/packages.config +++ b/SGGL/FineUIPro.Web/packages.config @@ -3,7 +3,7 @@ - + diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj index 0fdf0a15..f3b771d4 100644 --- a/SGGL/Model/Model.csproj +++ b/SGGL/Model/Model.csproj @@ -10,7 +10,7 @@ Properties Model Model - v4.6.2 + v4.6.1 512 diff --git a/SGGL/SgManager.AI/SgManager.AI.csproj b/SGGL/SgManager.AI/SgManager.AI.csproj index 1e1bc32e..8d107452 100644 --- a/SGGL/SgManager.AI/SgManager.AI.csproj +++ b/SGGL/SgManager.AI/SgManager.AI.csproj @@ -9,7 +9,7 @@ Properties SgManager.AI SgManager.AI - v4.6.2 + v4.6.1 512 diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index 84dec93a..59d8fc2f 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -14,7 +14,7 @@ Properties WebAPI WebAPI - v4.6.2 + v4.6.1 false true From 43b6a13073eb287ef48bb5d3d2d2868700a01ca2 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 25 Dec 2024 10:40:30 +0800 Subject: [PATCH 4/6] =?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 --- SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs index 3c953f80..8e73c688 100644 --- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs @@ -590,7 +590,7 @@ namespace FineUIPro.Web.SysManage Model.Sys_Set newSysSet9 = new Model.Sys_Set(); if (!string.IsNullOrEmpty(this.txtSerVerUrl.Text.Trim())) { - newSysSet9.SetValue = this.txtSerVerUrl.Text.Trim(); + newSysSet9.SetValue = this.txtSerVerUrl.Text.Trim(); } newSysSet9.SetName = "集团接口地址"; Funs.DB.Sys_Set.InsertOnSubmit(newSysSet9); From 4247d9df55be65cf86d64bad765fe5bfde47b715 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 25 Dec 2024 15:14:54 +0800 Subject: [PATCH 5/6] 20241225 --- ...024-09-20-bwj.sql => SGGLDB_WH_V2024-12-25-bwj.sql} | 1 - SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 3 ++- SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 13 +++++++------ SGGL/FineUIPro.Web/common/Menu_JDGL.xml | 2 -- SGGL/FineUIPro.Web/common/Menu_PGJSX.xml | 3 +-- SGGL/FineUIPro.Web/common/Menu_TestRun.xml | 14 ++++++-------- SGGL/FineUIPro.Web/common/Menu_Transfer.xml | 13 ------------- SGGL/FineUIPro.Web/common/Menu_ZHGL.xml | 8 +++----- 8 files changed, 19 insertions(+), 38 deletions(-) rename DataBase/版本日志/{SGGLDB_WH_V2024-09-20-bwj.sql => SGGLDB_WH_V2024-12-25-bwj.sql} (99%) diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-09-20-bwj.sql b/DataBase/版本日志/SGGLDB_WH_V2024-12-25-bwj.sql similarity index 99% rename from DataBase/版本日志/SGGLDB_WH_V2024-09-20-bwj.sql rename to DataBase/版本日志/SGGLDB_WH_V2024-12-25-bwj.sql index f3f3742e..47611461 100644 --- a/DataBase/版本日志/SGGLDB_WH_V2024-09-20-bwj.sql +++ b/DataBase/版本日志/SGGLDB_WH_V2024-12-25-bwj.sql @@ -1,4 +1,3 @@ - insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) values('0E1CCE60-6F9D-419D-B763-E9E0AF5621E6','λֲ̻֡ü','',10,'3B322232-38A1-4291-9832-CD4A01C2A975','Menu_CQMS',0,0,1) go diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index c90f11c5..cefc9ef0 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -8,9 +8,10 @@ - + + diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml index db103972..7470816f 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml @@ -25,7 +25,6 @@ - @@ -90,10 +89,13 @@ - + + - - + + + + @@ -119,8 +121,7 @@ - - + diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml index f12d5412..b34c5503 100644 --- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml @@ -22,6 +22,4 @@ - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml index 2b9b3fb8..d3beefd2 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml @@ -1,9 +1,8 @@  - + - diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index 4056ca52..f8b9fc63 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - - + + + + @@ -69,11 +69,9 @@ - - @@ -121,8 +119,8 @@ - - + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 283e3429..3abd6e40 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -3,17 +3,4 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 53012cf7..d4c4638d 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -27,8 +27,8 @@ - - + + @@ -54,7 +54,7 @@ - + @@ -85,6 +85,4 @@ - - \ No newline at end of file From fd870d1fdabf3a736565252e4ec9f4356f45eb3f Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 26 Dec 2024 09:17:26 +0800 Subject: [PATCH 6/6] =?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 --- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index c2dcc265..c9ab4ef5 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true