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/2] =?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 @@
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlFoundation" runat="server" Label="Construction" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -63,6 +64,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlMainstructure" runat="server" Label="CQVD" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -63,6 +64,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlCommunicationtest" runat="server" Label="Communication test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -70,6 +72,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -77,6 +80,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlLoopTest" runat="server" Label="Loop Test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -58,6 +59,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlDebugging" runat="server" Label="Debugging" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -65,6 +67,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlAcceptancecheck" runat="server" Label="Acceptance check" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                                 </f:DropDownList>--%>
 
                                 <f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -84,6 +85,7 @@
                                 </f:DropDownList>--%>
 
                                 <f:DropDownList ID="ddlPipingBlowing" runat="server" Label="Piping Blowing" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -91,6 +93,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlLooptest" runat="server" Label="Loop test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                         <f:GroupPanel Layout="Anchor" Title="试压包状态" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlPressureTestCompleted" runat="server" Label="试压完成" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -183,6 +184,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlRinseAndBlowClean" runat="server" Label="冲洗吹扫" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -190,6 +192,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlReduction" runat="server" Label="复位" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlNdt" runat="server" Label="NDT" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -58,6 +59,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlFlushing" runat="server" Label="Flushing" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -65,6 +67,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlRunningTest" runat="server" Label="Running Test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                         <f:GroupPanel Layout="Anchor" Title="" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlAlignment" runat="server" Label="Alignment" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -63,6 +64,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlLubricatefilling" runat="server" Label="Lubricate filling" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -70,6 +72,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlMotorsoloruntest" runat="server" Label="Motor solorun test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -77,6 +80,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlStandalonetest" runat="server" Label="Standalone test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlInternalinspection" runat="server" Label="Construction" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -63,6 +64,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlInternalsPacking" runat="server" Label="Internals/Packing installation" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -70,6 +72,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlBOXupRecord" runat="server" Label="BOX-up Record" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 @@
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
                                 <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -63,6 +64,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlCommunication" runat="server" Label="Communication test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -70,6 +72,7 @@
                                 </f:DropDownList>
 
                                 <f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -77,6 +80,7 @@
                                 </f:DropDownList>
 
                                  <f:DropDownList ID="ddlFunctionTest" runat="server" Label="Function Test" LabelWidth="180px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
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 5c045bd9110415534bf6eed106ab4db8b7490f20 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Wed, 25 Dec 2024 10:07:39 +0800
Subject: [PATCH 2/2] =?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 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BLL</RootNamespace>
     <AssemblyName>BLL</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
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 @@
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
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 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
                         <Items>
-                            <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
+                            <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid1_Click">
                             </f:Button>
                         </Items>
                     </f:Toolbar>
@@ -248,7 +248,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容"
-                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                             </f:TextArea>
                                         </Items>
                                     </f:FormRow>
@@ -265,7 +265,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容"
-                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                             </f:TextArea>
                                         </Items>
                                     </f:FormRow>
@@ -282,7 +282,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容"
-                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                             </f:TextArea>
                                         </Items>
                                     </f:FormRow>
@@ -675,7 +675,7 @@
                         <Toolbars>
                             <f:Toolbar ID="Toolbar3" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
                                 <Items>
-                                    <f:Button ID="Button4" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid9_Click">
+                                    <f:Button ID="Button4" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid9_Click">
                                     </f:Button>
                                 </Items>
                             </f:Toolbar>
@@ -861,7 +861,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
@@ -1856,7 +1856,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
@@ -1873,7 +1873,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
@@ -1891,7 +1891,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
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
         /// <param name="e"></param>
         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
         /// <param name="e"></param>
         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
         /// <param name="e"></param>
         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 @@
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
                         <Items>
-                            <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
+                            <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid1_Click">
                             </f:Button>
                         </Items>
                     </f:Toolbar>
@@ -247,7 +247,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容"
-                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                             </f:TextArea>
                                         </Items>
                                     </f:FormRow>
@@ -264,7 +264,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容"
-                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                             </f:TextArea>
                                         </Items>
                                     </f:FormRow>
@@ -281,7 +281,7 @@
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容"
-                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                             </f:TextArea>
                                         </Items>
                                     </f:FormRow>
@@ -674,7 +674,7 @@
                         <Toolbars>
                             <f:Toolbar ID="Toolbar3" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
                                 <Items>
-                                    <f:Button ID="Button4" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid9_Click">
+                                    <f:Button ID="Button4" Icon="Add" runat="server" ToolTip="新增" Text="新增" OnClick="btnAddGrid9_Click">
                                     </f:Button>
                                 </Items>
                             </f:Toolbar>
@@ -860,7 +860,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本周报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
@@ -1855,7 +1855,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
@@ -1872,7 +1872,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
@@ -1890,7 +1890,7 @@
                             <f:FormRow>
                                 <Items>
                                     <f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容"
-                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
                                     </f:TextArea>
                                 </Items>
                             </f:FormRow>
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
         /// <param name="e"></param>
         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
         /// <param name="e"></param>
         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
         /// <param name="e"></param>
         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 保存方法
+        /// <summary>
+        /// 保存方法
+        /// </summary>
+        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 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FineUIPro.Web</RootNamespace>
     <AssemblyName>FineUIPro.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <SccProjectName>
     </SccProjectName>
@@ -104,8 +104,7 @@
       <HintPath>..\FineUIPro\Reference BLL\Microsoft.QualityTools.Testing.Fakes.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
@@ -19321,7 +19320,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 904c5d67..835d46fc 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细消息，请访问
 
@@ -6,50 +6,50 @@
   -->
 <configuration>
   <configSections>
-    <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
+    <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false" />
   </configSections>
-  <FineUIPro DebugMode="true" Theme="Cupertino"/>
+  <FineUIPro DebugMode="true" Theme="Cupertino" />
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-	  <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
-	  <!--系统名称-->
-    <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
-    <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
-    <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
-    <add key="SGGLUrl" value="http://localhost:8579/"/>
-    <add key="SystemVersion" value="SGGLPackFile_V2021-02-01-001"/>
+    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
+    <!--系统名称-->
+    <add key="SystemName" value="智慧施工管理信息系统V1.0" />
+    <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;" />
+    <add key="aspnet:MaxHttpCollectionKeys" value="50000" />
+    <add key="SGGLUrl" value="http://localhost:8579/" />
+    <add key="SystemVersion" value="SGGLPackFile_V2021-02-01-001" />
     <!--启用与集团实名制 True启用 False 不启用-->
-    <add key="EnableRealName" value="False"/>
-    <add key="RealNameApiUrl" value="https://lwsm.cncecoa.com/share-labour1"/>
-    <add key="ControlApiUrl" value="http://webwh02.cwcec.com:9123/api/services/app"/>
-    <add key="Intervaltime" value="20"/>
+    <add key="EnableRealName" value="False" />
+    <add key="RealNameApiUrl" value="https://lwsm.cncecoa.com/share-labour1" />
+    <add key="ControlApiUrl" value="http://webwh02.cwcec.com:9123/api/services/app" />
+    <add key="Intervaltime" value="20" />
     <!--<add key="RealNameClientId" value="1338326379741057025"/>
     <add key="RealNameUserName" value="zgwhgcyxgs@CNCEC"/>
     <add key="RealNamePassWord" value="0nkbqy9n0"/>-->
     <!--附件上传物理路径-->
-    <add key="localRoot" value="D:\CWCEC\SGGL_CWCEC\SGGL\FineUIPro.Web\"/>
+    <add key="localRoot" value="D:\CWCEC\SGGL_CWCEC\SGGL\FineUIPro.Web\" />
     <!--视频服务器-->
-    <add key="Video_URL" value="http://camera.cwcec.com:10000/"/>
+    <add key="Video_URL" value="http://camera.cwcec.com:10000/" />
     <!--BAIDU AI配置-->
-    <add key="APP_ID" value="23518716"/>
-    <add key="API_KEY" value="9UGmBxS0TOIDGM5adGrOcBnr"/>
-    <add key="SECRET_KEY" value="6yq7q5PTTGfocWDmSN7hjxuiixsfURe1"/>
+    <add key="APP_ID" value="23518716" />
+    <add key="API_KEY" value="9UGmBxS0TOIDGM5adGrOcBnr" />
+    <add key="SECRET_KEY" value="6yq7q5PTTGfocWDmSN7hjxuiixsfURe1" />
     <!--人脸检测参数-->
     <!--人脸活体检测参数1最好，0最差 建议0.995 -->
-    <add key="BD_face_liveness" value="0.3"/>
+    <add key="BD_face_liveness" value="0.3" />
     <!--人脸高宽建议100-200-->
     <!--<add key="BD_width" value="200" />-->
     <!--<add key="BD_height" value="200" />-->
     <!--人脸角度-->
-    <add key="BD_roll" value="40"/>
+    <add key="BD_roll" value="40" />
     <!--人脸遮档度0最好，1最不好-->
-    <add key="BD_occlusion" value="1"/>
+    <add key="BD_occlusion" value="1" />
     <!--人脸模糊度0最好，1最不好-->
-    <add key="BD_blur" value="0.1"/>
-    <add key="CEMS_IMG_URL" value="http://localhost/SGGL/"/>
+    <add key="BD_blur" value="0.1" />
+    <add key="CEMS_IMG_URL" value="http://localhost/SGGL/" />
     <!--跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版-->
-    <add key="miniprogram_state" value="developer"/>
+    <add key="miniprogram_state" value="developer" />
   </appSettings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@@ -61,116 +61,116 @@
   -->
   <system.web>
     <!--  会话状态设置 默认情况下，ASP.NET 使用 Cookie 来标识哪些请求属于特定的会话。如果 Cookie 不可用，则可以通过将会话标识符添加到 URL 来跟踪会话。若要禁用 Cookie，请设置 sessionState cookieless="true" -->
-    <sessionState mode="InProc" cookieless="UseCookies" timeout="1200"/>
+    <sessionState mode="InProc" cookieless="UseCookies" timeout="1200" />
     <pages controlRenderingCompatibilityVersion="4.0" clientIDMode="AutoID">
       <controls>
-        <add assembly="FineUIPro" namespace="FineUIPro" tagPrefix="f"/>
-        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+        <add assembly="FineUIPro" namespace="FineUIPro" tagPrefix="f" />
+        <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
       </controls>
     </pages>
     <httpModules>
-      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
-      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
+      <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     </httpModules>
     <httpHandlers>
-      <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
-      <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
+      <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false" />
+      <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" />
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
-    <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
+    <compilation debug="true" targetFramework="4.6.1" />
+    <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000" />
     <authentication mode="Forms">
-      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
+      <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/" />
     </authentication>
     <membership>
       <providers>
-        <clear/>
-        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/"/>
+        <clear />
+        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="ApplicationServices" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="/" />
       </providers>
     </membership>
     <profile>
       <providers>
-        <clear/>
-        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/"/>
+        <clear />
+        <add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider" connectionStringName="ApplicationServices" applicationName="/" />
       </providers>
     </profile>
     <roleManager enabled="false">
       <providers>
-        <clear/>
-        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/"/>
-        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/"/>
+        <clear />
+        <add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" connectionStringName="ApplicationServices" applicationName="/" />
+        <add name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider" applicationName="/" />
       </providers>
     </roleManager>
-    <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx"/>
+    <customErrors mode="RemoteOnly" defaultRedirect="LogOff.aspx" />
   </system.web>
-  <location path="res.axd"/>
+  <location path="res.axd" />
   <system.webServer>
     <staticContent>
-      <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File"/>
-      <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File"/>
+      <mimeMap fileExtension=".dat" mimeType="application/ChinaExcel Report File" />
+      <mimeMap fileExtension=".tab" mimeType="application/ChinaExcel Report File" />
     </staticContent>
-    <validation validateIntegratedModeConfiguration="false"/>
+    <validation validateIntegratedModeConfiguration="false" />
     <modules runAllManagedModulesForAllRequests="true">
-      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro"/>
-      <remove name="ScriptModule"/>
-      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+      <add name="FineUIProScriptModule" type="FineUIPro.ScriptModule, FineUIPro" />
+      <remove name="ScriptModule" />
+      <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
     </modules>
     <handlers>
-      <remove name="ChartImageHandler"/>
-      <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro"/>
-      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+      <remove name="ChartImageHandler" />
+      <add name="FineUIProResourceHandler" verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" />
+      <add name="ChartImageHandler" preCondition="integratedMode" verb="GET,HEAD,POST" path="ChartImg.axd" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     </handlers>
     <defaultDocument>
       <files>
-        <add value="Login.aspx"/>
+        <add value="Login.aspx" />
       </files>
     </defaultDocument>
     <security>
       <requestFiltering>
-        <requestLimits maxAllowedContentLength="500000000"/>
+        <requestLimits maxAllowedContentLength="500000000" />
       </requestFiltering>
     </security>
   </system.webServer>
   <!-- SERVER -->
   <system.serviceModel>
     <client>
-      <endpoint address="http://localhost/CNCECHSSE/HSSEService.svc" binding="wsHttpBinding" bindingConfiguration="HSSEServiceEndpoint" contract="CNCECHSSEService.HSSEService" name="HSSEServiceEndpoint"/>
-      <endpoint address="https://mat.cwcec.com/LocWebServices/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="MCSService.WebService1Soap" name="WebService1Soap"/>
+      <endpoint address="http://localhost/CNCECHSSE/HSSEService.svc" binding="wsHttpBinding" bindingConfiguration="HSSEServiceEndpoint" contract="CNCECHSSEService.HSSEService" name="HSSEServiceEndpoint" />
+      <endpoint address="https://mat.cwcec.com/LocWebServices/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="MCSService.WebService1Soap" name="WebService1Soap" />
     </client>
-    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true"/>
+    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
     <services>
       <service name="BLL.OpenService.HSSEService" behaviorConfiguration="BLL.HSSEServiceBehavior">
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="BLL.HSSEServiceBinding" name="BLL.HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="BLL.HSSEServiceBinding" name="BLL.HSSEServiceEndpoint" contract="BLL.OpenService.IHSSEService" />
       </service>
     </services>
     <behaviors>
       <serviceBehaviors>
         <behavior name="BLL.HSSEServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="false"/>
-          <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
-          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647"/>
+          <serviceMetadata httpGetEnabled="true" />
+          <serviceDebug includeExceptionDetailInFaults="false" />
+          <dataContractSerializer maxItemsInObjectGraph="2147483647" />
+          <serviceThrottling maxConcurrentCalls="2147483647" maxConcurrentInstances="2147483647" maxConcurrentSessions="2147483647" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
     <bindings>
       <basicHttpBinding>
         <binding name="WebService1Soap" maxBufferPoolSize="5242880000" maxReceivedMessageSize="2147483647">
-          <security mode="Transport"/>
+          <security mode="Transport" />
         </binding>
       </basicHttpBinding>
       <wsHttpBinding>
         <binding name="BLL.HSSEServiceBinding" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="5242880000" maxReceivedMessageSize="2147483647" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-          <readerQuotas maxDepth="32" maxStringContentLength="8192000" maxArrayLength="16384000" maxBytesPerRead="4096000" maxNameTableCharCount="16384000"/>
+          <readerQuotas maxDepth="32" maxStringContentLength="8192000" maxArrayLength="16384000" maxBytesPerRead="4096000" maxNameTableCharCount="16384000" />
           <security mode="Transport">
-            <transport clientCredentialType="Windows" proxyCredentialType="None"/>
-            <message clientCredentialType="None" establishSecurityContext="false" negotiateServiceCredential="false"/>
+            <transport clientCredentialType="Windows" proxyCredentialType="None" />
+            <message clientCredentialType="None" establishSecurityContext="false" negotiateServiceCredential="false" />
           </security>
         </binding>
         <binding name="HSSEServiceEndpoint" maxBufferPoolSize="5242880000" maxReceivedMessageSize="2147483647">
           <security mode="Transport">
-            <transport clientCredentialType="Windows" proxyCredentialType="None"/>
-            <message clientCredentialType="None" establishSecurityContext="false" negotiateServiceCredential="false"/>
+            <transport clientCredentialType="Windows" proxyCredentialType="None" />
+            <message clientCredentialType="None" establishSecurityContext="false" negotiateServiceCredential="false" />
           </security>
         </binding>
       </wsHttpBinding>
@@ -178,26 +178,26 @@
   </system.serviceModel>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
-			</dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Apache.NMS" publicKeyToken="82756feee3957618" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0"/>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="13.0.0.0"/>
+        <assemblyIdentity name="Apache.NMS" publicKeyToken="82756feee3957618" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1"/>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
\ 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 @@
   <package id="Apache.NMS" version="1.8.0" targetFramework="net40" />
   <package id="Apache.NMS.ActiveMQ" version="1.7.2" targetFramework="net40" />
   <package id="Microsoft.Office.Interop.Word" version="15.0.4797.1004" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net40" requireReinstallation="true" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
   <package id="NPOI" version="2.5.5" targetFramework="net461" />
   <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
   <package id="RestSharp" version="106.15.0" targetFramework="net461" />
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 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Model</RootNamespace>
     <AssemblyName>Model</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
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 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SgManager.AI</RootNamespace>
     <AssemblyName>SgManager.AI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
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 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebAPI</RootNamespace>
     <AssemblyName>WebAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />