From 236df8a38c94501676470bb3a38fe835350cb1c2 Mon Sep 17 00:00:00 2001
From: liyh <ahjdlyh2008123@126.com>
Date: Wed, 24 Jul 2024 15:02:00 +0800
Subject: [PATCH 1/6] 121111

---
 SGGL/BLL/BLL.csproj | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 4473098d..c320958d 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -615,12 +615,6 @@
     <Compile Include="JDGL\WBS\WbsSetService.cs" />
     <Compile Include="JDGL\WBS\WorkloadStatisticsService.cs" />
     <Compile Include="Notice\NoticeService.cs" />
-    <Compile Include="obj\Debug\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
-    <Compile Include="obj\Debug\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
-    <Compile Include="obj\Debug\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
-    <Compile Include="obj\Release\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs" />
-    <Compile Include="obj\Release\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs" />
-    <Compile Include="obj\Release\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" />
     <Compile Include="OfficeCheck\Check\CheckNoticeService.cs" />
     <Compile Include="OfficeCheck\Check\CheckReportService.cs" />
     <Compile Include="OfficeCheck\Check\CheckTable1Service.cs" />

From a12b0f06f673fdd5d5aad598047d3d425adee53a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 24 Jul 2024 15:08:12 +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

---
 .../ManageReportNew/MonthReportEdit.aspx.cs   | 79 ++++++++++++++-----
 1 file changed, 58 insertions(+), 21 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index 56385e6f..c4149d2b 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -219,27 +219,64 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     #region 加载文本框内容
                     var txtReportList = db.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
-                    txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
-                    txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
-                    txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
-
-                    txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
-                    txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
-                    txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
-                    txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
-
-                    imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
-                    txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
-                    imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
-                    txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
-                    imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
-                    txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
-                    imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
-                    txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
-                    imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
-                    txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
-                    imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
-                    txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "0") != null)
+                    {
+                        txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "1") != null)
+                    {
+                        txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "2") != null)
+                    {
+                        txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "20") != null)
+                    {
+                        txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "21") != null)
+                    {
+                        txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "22") != null)
+                    {
+                        txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "8") != null)
+                    {
+                        txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-1") != null)
+                    {
+                        imgPhoto.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ImageUrl;
+                        txtPhotoContent1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-2") != null)
+                    {
+                        imgPhoto2.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ImageUrl;
+                        txtPhotoContent2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-2").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-3") != null)
+                    {
+                        imgPhoto3.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ImageUrl;
+                        txtPhotoContent3.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-3").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-4") != null)
+                    {
+                        imgPhoto4.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ImageUrl;
+                        txtPhotoContent4.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-4").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-5") != null)
+                    {
+                        imgPhoto5.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ImageUrl;
+                        txtPhotoContent5.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-5").ContentText;
+                    }
+                    if (txtReportList.FirstOrDefault(x => x.ContentType == "23-6") != null)
+                    {
+                        imgPhoto6.ImageUrl = "~/" + txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ImageUrl;
+                        txtPhotoContent6.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-6").ContentText;
+                    }
                     #endregion
 
                     //加载所有grid

From fdb49da9cd314627325ba9c81d872333477d6c40 Mon Sep 17 00:00:00 2001
From: liyh <ahjdlyh2008123@126.com>
Date: Wed, 24 Jul 2024 16:02:49 +0800
Subject: [PATCH 3/6] 1212

---
 SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index 9b734955..e47a36b1 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -215,13 +215,13 @@
             <Items>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
-                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
-                    OnClick="btnMenuDel_Click" Hidden="true">
-                </f:MenuButton>
                 <f:MenuButton ID="btnMenuAttachA" runat="server" Icon="FolderUp" Text="Photoes附件" OnClick="btnMenuAttachA_Click" Hidden="true">
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuAttachB" runat="server" Icon="FolderUp" Text="Corrected_Photos附件" OnClick="btnMenuAttachB_Click" Hidden="true">
                 </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
             </Items>
         </f:Menu>
     </form>

From df3087c3806e5d970195f52313c42c561314022f Mon Sep 17 00:00:00 2001
From: liyh <ahjdlyh2008123@126.com>
Date: Wed, 24 Jul 2024 17:53:44 +0800
Subject: [PATCH 4/6] 1212

---
 .../Transfer/PunchlistFrom.aspx.designer.cs    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index ff67cd24..d9a7d3b2 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -257,15 +257,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
-        /// <summary>
-        /// btnMenuDel 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.MenuButton btnMenuDel;
-
         /// <summary>
         /// btnMenuAttachA 控件。
         /// </summary>
@@ -283,5 +274,14 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuAttachB;
+
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
     }
 }

From c73952e36fd2ab4883b47abba22a69695fdec235 Mon Sep 17 00:00:00 2001
From: liyh <ahjdlyh2008123@126.com>
Date: Thu, 25 Jul 2024 14:19:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FineUIPro.Web/Transfer/PunchlistFrom.aspx | 50 ++++++++++++-------
 .../Transfer/PunchlistFrom.aspx.cs            | 24 ++++++++-
 .../Transfer/PunchlistFrom.aspx.designer.cs   | 48 +++++++++++++++---
 3 files changed, 96 insertions(+), 26 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index e47a36b1..321a0b8e 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -21,18 +21,25 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-
-                                <f:TextBox runat="server" ID="txtNum_NO" Label="No." LabelWidth="80px" LabelAlign="Right" Width="150px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="150px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Sub Sys No" LabelWidth="100px" LabelAlign="Right" Width="170px"></f:TextBox>
-                                <f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="200px"
-                                    Width="320px">
-                                </f:DatePicker>
-                                <f:Label ID="Label1" runat="server" Text="至">
-                                </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndDate_Raised" LabelAlign="Right" Width="150px">
-                                </f:DatePicker>
-
+                                <f:TextBox runat="server" ID="txtNum_NO" Label="No." LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Sub Sys No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
+                                <f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="80px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="180px" LabelWidth="100px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
+                                    <f:ListItem Value="FWD" Text="FWD"></f:ListItem>
+                                </f:DropDownList>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
 
@@ -48,19 +55,26 @@
                         </f:Toolbar>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DatePicker runat="server" Label="Required Date" ID="txtStartRequired_Date" LabelAlign="Right" LabelWidth="130px"
-                                    Width="320px">
+                                <f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="100px"
+                                    Width="220px">
+                                </f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndDate_Raised" LabelAlign="Right" Width="110px">
+                                </f:DatePicker>
+                                <f:DatePicker runat="server" Label="Required Date" ID="txtStartRequired_Date" LabelAlign="Right" LabelWidth="110px"
+                                    Width="220px">
                                 </f:DatePicker>
                                 <f:Label ID="Label2" runat="server" Text="至">
                                 </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndRequired_Date" LabelAlign="Right" Width="150px">
+                                <f:DatePicker runat="server" ID="txtEndRequired_Date" LabelAlign="Right" Width="110px">
                                 </f:DatePicker>
-                                <f:DatePicker runat="server" Label="Actual_Date" ID="txtStartActual_Date" LabelAlign="Right" LabelWidth="130px"
-                                    Width="320px">
+                                <f:DatePicker runat="server" Label="Actual_Date" ID="txtStartActual_Date" LabelAlign="Right" LabelWidth="110px"
+                                    Width="220px">
                                 </f:DatePicker>
                                 <f:Label ID="Label3" runat="server" Text="至">
                                 </f:Label>
-                                <f:DatePicker runat="server" ID="txtEndActual_Date" LabelAlign="Right" Width="150px">
+                                <f:DatePicker runat="server" ID="txtEndActual_Date" LabelAlign="Right" Width="110px">
                                 </f:DatePicker>
                             </Items>
                         </f:Toolbar>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 493ce1b1..fe4c5f08 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -83,6 +83,26 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Actual_Date <= @Actual_Date";
                 listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(txtDisc.Text.Trim()))
+            {
+                strSql += " AND Disc = @Disc";
+                listStr.Add(new SqlParameter("@Disc", txtDisc.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(ddlEng.SelectedValue.Trim()))
+            {
+                strSql += " AND IsEng = @IsEng";
+                listStr.Add(new SqlParameter("@IsEng", ddlEng.SelectedValue.Trim() == "Y" ? 1 : 0));
+            }
+            if (!string.IsNullOrEmpty(ddlMatI.SelectedValue.Trim()))
+            {
+                strSql += " AND IsMatI = @IsMatI";
+                listStr.Add(new SqlParameter("@IsMatI", ddlMatI.SelectedValue.Trim() == "Y" ? 1 : 0));
+            }
+            if (!string.IsNullOrEmpty(ddlPunchType.SelectedValue.Trim()))
+            {
+                strSql += " AND Punch_Type = @Punch_Type";
+                listStr.Add(new SqlParameter("@Punch_Type", ddlPunchType.SelectedValue.Trim()));
+            }
             strSql += " order by Num_No ";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -258,7 +278,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
                     //this.btnNew.Hidden = false;
-                    btnMenuAttachA.Hidden=false;
+                    btnMenuAttachA.Hidden = false;
                     btnMenuAttachB.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
@@ -295,7 +315,7 @@ namespace FineUIPro.Web.Transfer
             var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PunchlistFromMenuId);
             if (buttonList.Contains(BLL.Const.BtnAdd))
             {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", this.CurrUser.LoginProjectId+ "PunchlistFrom", BLL.Const.PunchlistFromMenuId)));
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Transfer/PunchlistFrom&menuId={1}", this.CurrUser.LoginProjectId + "PunchlistFrom", BLL.Const.PunchlistFromMenuId)));
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index d9a7d3b2..6eb8ee22 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -87,31 +87,40 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtSub_Sys_No;
 
         /// <summary>
-        /// txtStartDate_Raised 控件。
+        /// txtDisc 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStartDate_Raised;
+        protected global::FineUIPro.TextBox txtDisc;
 
         /// <summary>
-        /// Label1 控件。
+        /// ddlEng 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Label Label1;
+        protected global::FineUIPro.DropDownList ddlEng;
 
         /// <summary>
-        /// txtEndDate_Raised 控件。
+        /// ddlMatI 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndDate_Raised;
+        protected global::FineUIPro.DropDownList ddlMatI;
+
+        /// <summary>
+        /// ddlPunchType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPunchType;
 
         /// <summary>
         /// btnSearch 控件。
@@ -140,6 +149,33 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
 
+        /// <summary>
+        /// txtStartDate_Raised 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartDate_Raised;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// txtEndDate_Raised 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndDate_Raised;
+
         /// <summary>
         /// txtStartRequired_Date 控件。
         /// </summary>

From 7a28c2677d8fd02a471d987720e4442676e53515 Mon Sep 17 00:00:00 2001
From: liyh <ahjdlyh2008123@126.com>
Date: Thu, 25 Jul 2024 14:58:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=B0=BE=E9=A1=B9=E5=87=A0=E4=B8=AA?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_WH_V2024-07-25-li.sql     |  14 +
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  29 +-
 .../Transfer/Chart/PunchlistFromChartNew.aspx |  71 +++++
 .../Chart/PunchlistFromChartNew.aspx.cs       | 133 +++++++++
 .../PunchlistFromChartNew.aspx.designer.cs    | 134 ++++++++++
 .../Transfer/Chart/PunchlistFromProgress.aspx |  61 +++++
 .../Chart/PunchlistFromProgress.aspx.cs       |  96 +++++++
 .../PunchlistFromProgress.aspx.designer.cs    |  89 +++++++
 .../Transfer/Chart/PunchlistFromSort.aspx     | 119 +++++++++
 .../Transfer/Chart/PunchlistFromSort.aspx.cs  | 252 ++++++++++++++++++
 .../Chart/PunchlistFromSort.aspx.designer.cs  | 152 +++++++++++
 .../Transfer/PunchlistFrom.aspx.cs            |  16 +-
 12 files changed, 1156 insertions(+), 10 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_V2024-07-25-li.sql
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.designer.cs

diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-25-li.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-25-li.sql
new file mode 100644
index 00000000..55f9ad7b
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-25-li.sql
@@ -0,0 +1,14 @@
+update Sys_Menu set IsUsed=0 where MenuId in ('C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0','BB5EC5E1-A23D-4A3F-8772-CD40757974EC','F97BCF55-E450-4007-AD84-AB64B3496204','E6F5125D-DD94-4978-B7EB-D9C26694D86D')
+
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('2352E44F-BE12-4012-B43F-AAF649EDAC32','Punchlist from完成统计表',null,'Transfer/Chart/PunchlistFromChartNew.aspx',30,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('CB76462E-9444-4946-B787-ECB33C21E6D0','Punchlist from分类表',null,'Transfer/Chart/PunchlistFromSort.aspx',35,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('549DD0B6-05CB-4C75-B8F5-9AADDEDF399F','Punchlist from进度跟踪表',null,'Transfer/Chart/PunchlistFromProgress.aspx',40,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+GO
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 7591adf4..f169c916 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2021,6 +2021,9 @@
     <Content Include="Transfer\Chart\Instrumentation.aspx" />
     <Content Include="Transfer\Chart\PunchlistFrom.aspx" />
     <Content Include="Transfer\Chart\PunchlistFromChart.aspx" />
+    <Content Include="Transfer\Chart\PunchlistFromChartNew.aspx" />
+    <Content Include="Transfer\Chart\PunchlistFromProgress.aspx" />
+    <Content Include="Transfer\Chart\PunchlistFromSort.aspx" />
     <Content Include="Transfer\Chart\TransferChart.aspx" />
     <Content Include="Transfer\CivilStructure.aspx" />
     <Content Include="Transfer\CivilStructureDataIn.aspx" />
@@ -17587,6 +17590,27 @@
     <Compile Include="Transfer\Chart\PunchlistFromChart.aspx.designer.cs">
       <DependentUpon>PunchlistFromChart.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.cs">
+      <DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFromChartNew.aspx.designer.cs">
+      <DependentUpon>PunchlistFromChartNew.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.cs">
+      <DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFromProgress.aspx.designer.cs">
+      <DependentUpon>PunchlistFromProgress.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFromSort.aspx.cs">
+      <DependentUpon>PunchlistFromSort.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFromSort.aspx.designer.cs">
+      <DependentUpon>PunchlistFromSort.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\Chart\TransferChart.aspx.cs">
       <DependentUpon>TransferChart.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -19072,8 +19096,9 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <!--<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.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">
   </Target>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
new file mode 100644
index 00000000..860f1125
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
@@ -0,0 +1,71 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFromChartNew.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFromChartNew" %>
+
+<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Punchlist from完成统计表</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
+        <f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
+            BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+            <Items>
+                <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                    <Rows>
+                        <f:FormRow ColumnWidths="25% 30% 35%  10%">
+                            <Items>
+                                <f:DropDownList ID="ddlSystemNo" runat="server" Label="System No" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlSystemNo_SelectedIndexChanged" Width="300px" LabelWidth="100px">
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlDateType" runat="server" Label="日期类型" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlDateType_SelectedIndexChanged" Width="200px" LabelWidth="80px">
+                                    <f:ListItem Value="1" Text="一周"></f:ListItem>
+                                    <f:ListItem Value="2" Text="月份"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                    OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                    <f:ListItem Value="Line" Text="折线图"></f:ListItem>
+                                    <f:ListItem Value="Column" Text="柱形图"></f:ListItem>
+                               <%--     <f:ListItem Value="Pie" Text="饼形图"></f:ListItem>
+                                    <f:ListItem Value="StackedArea" Text="堆积面积图"></f:ListItem>
+                                    <f:ListItem Value="Spline" Text="样条图"></f:ListItem>
+                                    <f:ListItem Value="SplineArea" Text="样条面积图"></f:ListItem>
+                                    <f:ListItem Value="StepLine" Text="阶梯线图"></f:ListItem>
+                                    <f:ListItem Value="Stock" Text="股价图"></f:ListItem>
+                                    <f:ListItem Value="Radar" Text="雷达图"></f:ListItem>--%>
+                                </f:DropDownList>
+                                <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
+                                </f:Button>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+        </f:Panel>
+        <f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
+            BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+            <Items>
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="600px" ShowBorder="true"
+                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                    <Tabs>
+                        <f:Tab ID="Tab2" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
+                            TitleToolTip="图形">
+                            <Items>
+                                <f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
+                                    <div id="divAccidentTime">
+                                        <uc1:ChartControl ID="ChartAccidentTime" runat="server" />
+                                    </div>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Tab>
+                    </Tabs>
+                </f:TabStrip>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
new file mode 100644
index 00000000..611f28d4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web.Services.Description;
+using BLL;
+using NPOI.SS.Formula.Functions;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFromChartNew : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                var systemNos = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).GroupBy(p => new { p.System_No }).Select(p => new { System_No = p.Key.System_No }).ToList();
+                int indexRow = 1;
+                ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
+                foreach (var t in systemNos)
+                {
+                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.System_No, t.System_No));
+                    indexRow++;
+                }
+
+            }
+        }
+
+        /// <summary>
+        /// 统计方法
+        /// </summary>
+        private void AnalyseData()
+        {
+            string _systemNo = ddlSystemNo.SelectedValue;
+            if (_systemNo == null)
+                _systemNo = "";
+            _systemNo = _systemNo.Trim();
+            //_systemNo为空则查全部
+            var forms = from x in Funs.DB.Transfer_PunchlistFrom
+                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.System_No == _systemNo || _systemNo == "")
+                        select x;
+
+            string _dateType = ddlDateType.SelectedValue;
+
+            #region 按照当前日期前一周数据
+            if (_dateType == "1")
+            {
+                ///按单位统计
+                DataTable dtTime = new DataTable();
+                dtTime.Columns.Add("日期", typeof(string));
+                dtTime.Columns.Add("计划完成数量", typeof(string));
+                dtTime.Columns.Add("实际完成数量", typeof(string));
+                for (int i = 6; i >= 0; i--)
+                {
+                    DataRow rowTime = dtTime.NewRow();
+                    DateTime QueryTime = DateTime.Now.AddDays(i * -1);
+                    rowTime["日期"] = QueryTime.ToString("yyyy/MM/dd");
+                    DateTime startTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 00:00:00");
+                    DateTime endTime = Convert.ToDateTime(QueryTime.ToString("yyyy-MM-dd") + " 23:59:59");
+                    rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
+                    rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
+                    dtTime.Rows.Add(rowTime);
+                }
+                this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
+            }
+            #endregion
+
+            //按照当前月份到一月份的数据
+            if (_dateType == "2")
+            {
+                ///按单位统计
+                DataTable dtTime = new DataTable();
+                dtTime.Columns.Add("月份", typeof(string));
+                dtTime.Columns.Add("计划完成数量", typeof(string));
+                dtTime.Columns.Add("实际完成数量", typeof(string));
+                for (int i = 1; i <= DateTime.Now.Month; i++)
+                {
+                    DataRow rowTime = dtTime.NewRow();
+                    DateTime QueryTime =Convert.ToDateTime($"{DateTime.Now.Year.ToString()}-{i}-1 00:00:00");
+                    rowTime["月份"] = QueryTime.ToString("yyyy/MM");
+                    DateTime startTime = QueryTime;
+                    DateTime endTime = Convert.ToDateTime(QueryTime.AddMonths(1).AddDays(-1).ToString("yyyy-MM-dd") + " 23:59:59");
+                    rowTime["计划完成数量"] = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
+                    rowTime["实际完成数量"] = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
+                    dtTime.Rows.Add(rowTime);
+                }
+                this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
+            }
+
+        }
+
+        /// <summary>
+        /// 统计分析
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        /// <summary>
+        /// 图形变换 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        /// <summary>
+        /// 现在日期类型
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlDateType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        /// <summary>
+        /// 选择System No
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
new file mode 100644
index 00000000..6997ce9c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class PunchlistFromChartNew
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// ddlSystemNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSystemNo;
+
+        /// <summary>
+        /// ddlDateType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlDateType;
+
+        /// <summary>
+        /// drpChartType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChartType;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// cpAccidentTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel cpAccidentTime;
+
+        /// <summary>
+        /// ChartAccidentTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::Web.Controls.ChartControl ChartAccidentTime;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx
new file mode 100644
index 00000000..1486abcc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx
@@ -0,0 +1,61 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFromProgress.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFromProgress" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Punchlist from进度跟踪表</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="System_No" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="System_No" AllowSorting="true" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                                </f:Button>
+
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+
+                        <f:BoundField Width="180px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." />
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="SystemNoCount" DataField="SystemNoCount" HeaderText="尾项数量" FieldType="Double" />
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="ActualDateCount" DataField="ActualDateCount" HeaderText="已完成数量" FieldType="Double"/>
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="ClearedByCount" DataField="ClearedByCount" HeaderText="Cleared(PIC)" FieldType="Double"/>
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="ConfirmedByCount" DataField="ConfirmedByCount" HeaderText="Confirmed(WUH)" FieldType="Double"/>
+
+                        <f:RenderField Width="180px" TextAlign="Center" ColumnID="VerifiedByCount" DataField="VerifiedByCount" HeaderText="Verified(BASF)" FieldType="Double"/>
+                    </Columns>
+                    <PageItems>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.cs
new file mode 100644
index 00000000..01fa6c0a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.cs
@@ -0,0 +1,96 @@
+using BLL;
+using BLL.CQMS.Comprehensive;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFromProgress : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            StringBuilder strSql = new StringBuilder("");
+            strSql.AppendLine("IF OBJECT_ID('tempdb..#AllPunchlistFromProgressTemp') IS NOT NULL drop table #AllPunchlistFromProgressTemp; ");
+            strSql.AppendLine("IF OBJECT_ID('tempdb..#PunchlistFromProgressTemp') IS NOT NULL drop table #PunchlistFromProgressTemp; ");
+            strSql.AppendLine(" select System_No,Actual_Date,Cleared_By,Confirmed_By,Verified_By,ProjectId ");
+            strSql.AppendLine(" INTO #AllPunchlistFromProgressTemp from Transfer_PunchlistFrom where ProjectId = @ProjectId ");
+            strSql.AppendLine(" select System_No,count(System_No) SystemNoCount,cast(0 as decimal(18,2)) ActualDateCount ");
+            strSql.AppendLine(" ,cast(0 as decimal(18,2)) ClearedByCount,cast(0 as decimal(18,2)) ConfirmedByCount,cast(0 as decimal(18,2)) VerifiedByCount ");
+            strSql.AppendLine(" INTO #PunchlistFromProgressTemp from #AllPunchlistFromProgressTemp where ProjectId = @ProjectId group by System_No ");
+            strSql.AppendLine(" update  a set a.ActualDateCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Actual_Date,'')<>'')  ");
+            strSql.AppendLine(" ,a.ClearedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Cleared_By,'')<>'') ");
+            strSql.AppendLine(" ,a.ConfirmedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Confirmed_By,'')<>'')  ");
+            strSql.AppendLine(" ,a.VerifiedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Verified_By,'')<>'') ");
+            strSql.AppendLine(" from #PunchlistFromProgressTemp a ");
+            strSql.AppendLine(" select *  from #PunchlistFromProgressTemp ");
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+
+            strSql.AppendLine(" order by System_No ");
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.designer.cs
new file mode 100644
index 00000000..253b2cb7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromProgress.aspx.designer.cs
@@ -0,0 +1,89 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class PunchlistFromProgress
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx
new file mode 100644
index 00000000..d4345ba5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx
@@ -0,0 +1,119 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFromSort.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFromSort" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Punchlist from分类表</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .LabelColor {
+            color: Red;
+            font-size: small;
+        }
+        .f-grid-row-summary .f-grid-cell-inner {
+            font-weight: bold;
+            color: red;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" />
+        <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="ddlSystemNo" runat="server" Label="System No" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlSystemNo_SelectedIndexChanged" Width="300px" LabelWidth="100px">
+                        </f:DropDownList>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                        </f:Button>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+        <f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" MarginRight="5px">
+            <Items>
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="550px" ShowBorder="true"
+                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged"
+                    ActiveTabIndex="0">
+                    <Tabs>
+                        <f:Tab ID="Tab1" Title="按专业统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                                    runat="server" DataKeyNames="Disc" AllowCellEditing="true" EnableColumnLines="true"
+                                    ClicksToEdit="2" DataIDField="Disc" AllowSorting="true" OnSort="Grid1_Sort"
+                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                                    EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
+                                    <Columns>
+                                        <f:BoundField DataField="Disc" ColumnID="Disc" HeaderText="专业"   ExpandUnusedSpace="true" MinWidth="150px"/>
+                                        <f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
+                                            <Columns>
+                                                <f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
+                                            </Columns>
+                                        </f:GroupField>
+                                    </Columns>
+                                    <PageItems>
+                                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                            <f:ListItem Text="10" Value="10" />
+                                            <f:ListItem Text="15" Value="15" />
+                                            <f:ListItem Text="20" Value="20" />
+                                            <f:ListItem Text="25" Value="25" />
+                                            <f:ListItem Text="所有行" Value="100000" />
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                        <f:Tab ID="Tab2" Title="按单位统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
+                            <Items>
+                                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                                    runat="server" DataKeyNames="Action_By" AllowCellEditing="true" EnableColumnLines="true"
+                                    ClicksToEdit="2" DataIDField="Action_By" AllowSorting="true" OnSort="Grid2_Sort"
+                                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid2_PageIndexChange"
+                                    EnableRowDoubleClickEvent="true" EnableTextSelection="true"  EnableSummary="true" SummaryPosition="Flow">
+                                    <Columns>
+                                        <f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位"  ExpandUnusedSpace="true" MinWidth="150px"/>
+                                        <f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
+                                            <Columns>
+                                                <f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
+                                            </Columns>
+                                        </f:GroupField>
+                                    </Columns>
+                                    <PageItems>
+                                        <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                        </f:ToolbarText>
+                                        <f:DropDownList runat="server" ID="ddlPageSize2" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize2_SelectedIndexChanged">
+                                            <f:ListItem Text="10" Value="10" />
+                                            <f:ListItem Text="15" Value="15" />
+                                            <f:ListItem Text="20" Value="20" />
+                                            <f:ListItem Text="25" Value="25" />
+                                            <f:ListItem Text="所有行" Value="100000" />
+                                        </f:DropDownList>
+                                    </PageItems>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                    </Tabs>
+                </f:TabStrip>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.cs
new file mode 100644
index 00000000..969123b8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.cs
@@ -0,0 +1,252 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFromSort : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                var systemNos = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).GroupBy(p => new { p.System_No }).Select(p => new { System_No = p.Key.System_No }).ToList();
+                int indexRow = 1;
+                ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
+                foreach (var t in systemNos)
+                {
+                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.System_No, t.System_No));
+                    indexRow++;
+                }
+
+                BindGrid1();
+            }
+        }
+
+        /// <summary>
+        /// 选择System No
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid1();
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid1();
+            BindGrid2();
+        }
+
+        #region 分页、排序
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid2();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid2.SortDirection = e.SortDirection;
+            Grid2.SortField = e.SortField;
+            BindGrid2();
+        }
+        #endregion
+
+        /// <summary>
+        /// 查询绑定数据
+        /// </summary>
+        public void BindGrid1()
+        {
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string _systemNo = string.Empty;
+            _systemNo = ddlSystemNo.SelectedValue;
+            StringBuilder strSql = new StringBuilder("");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp1') IS NOT NULL drop table #AllPunchlistFromSortTemp1; ");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp1') IS NOT NULL drop table #PunchlistFromSortTemp1; ");
+            strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp1 from  Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
+            if (!string.IsNullOrWhiteSpace(_systemNo))
+            {
+                strSql.AppendLine(" AND System_No=@System_No ");
+                listStr.Add(new SqlParameter("@System_No", _systemNo));
+            }
+            strSql.AppendLine(" select Disc,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp1 from #AllPunchlistFromSortTemp1 Group by Disc; ");
+            strSql.AppendLine(" update  a set 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')) ");
+            strSql.AppendLine(",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')) ");
+            strSql.AppendLine(",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')) ");
+            strSql.AppendLine(",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')) ");
+            strSql.AppendLine("from #PunchlistFromSortTemp1 a;");
+            strSql.AppendLine("select *  from #PunchlistFromSortTemp1 ");
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            strSql.AppendLine(" order by Disc ");
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
+            //合计
+            int cat_A_Count = 0;
+            int cat_B_Count = 0;
+            int cat_C_Count = 0;
+            int cat_D_Count = 0;
+            foreach (DataRow row in tb.Rows)
+            {
+                cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
+                cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
+                cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
+                cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
+            }
+
+
+            JObject summary = new JObject();
+            summary.Add("Disc", "合计");
+            summary.Add("Cat_A_Count", cat_A_Count.ToString());
+            summary.Add("Cat_B_Count", cat_B_Count.ToString());
+            summary.Add("Cat_C_Count", cat_C_Count.ToString());
+            summary.Add("Cat_D_Count", cat_D_Count.ToString());
+
+
+            Grid1.SummaryData = summary;
+        }
+
+        /// <summary>
+        /// 查询绑定数据
+        /// </summary>
+        public void BindGrid2()
+        {
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            string _systemNo = string.Empty;
+            _systemNo = ddlSystemNo.SelectedValue;
+            StringBuilder strSql = new StringBuilder("");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp2') IS NOT NULL drop table #AllPunchlistFromSortTemp2; ");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp2') IS NOT NULL drop table #PunchlistFromSortTemp2; ");
+            strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp2 from  Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
+            if (!string.IsNullOrWhiteSpace(_systemNo))
+            {
+                strSql.AppendLine(" AND System_No=@System_No ");
+                listStr.Add(new SqlParameter("@System_No", _systemNo));
+            }
+            strSql.AppendLine(" select Action_By,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp2 from #AllPunchlistFromSortTemp2 Group by Action_By; ");
+            strSql.AppendLine(" update  a set 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')) ");
+            strSql.AppendLine(",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')) ");
+            strSql.AppendLine(",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')) ");
+            strSql.AppendLine(",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')) ");
+            strSql.AppendLine("from #PunchlistFromSortTemp2 a;");
+            strSql.AppendLine("select *  from #PunchlistFromSortTemp2 ");
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            strSql.AppendLine(" order by Action_By ");
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
+            Grid2.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid2.DataSource = table;
+            Grid2.DataBind();
+
+            //合计
+            int cat_A_Count = 0;
+            int cat_B_Count = 0;
+            int cat_C_Count = 0;
+            int cat_D_Count = 0;
+            foreach (DataRow row in tb.Rows)
+            {
+                cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
+                cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
+                cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
+                cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
+            }
+
+
+            JObject summary = new JObject();
+            summary.Add("Action_By", "合计");
+            summary.Add("Cat_A_Count", cat_A_Count.ToString());
+            summary.Add("Cat_B_Count", cat_B_Count.ToString());
+            summary.Add("Cat_C_Count", cat_C_Count.ToString());
+            summary.Add("Cat_D_Count", cat_D_Count.ToString());
+
+
+            Grid2.SummaryData = summary;
+        }
+
+        protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
+        {
+            if (TabStrip1.ActiveTabIndex == 0)
+            {
+                BindGrid1();
+            }
+            else if (TabStrip1.ActiveTabIndex == 1)
+            {
+                BindGrid2();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.designer.cs
new file mode 100644
index 00000000..7574e5e5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromSort.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class PunchlistFromSort
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// ddlSystemNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSystemNo;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+
+        /// <summary>
+        /// ToolbarText2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText2;
+
+        /// <summary>
+        /// ddlPageSize2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize2;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index fe4c5f08..7eeabcf8 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -65,23 +65,23 @@ namespace FineUIPro.Web.Transfer
             }
             if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
             {
-                strSql += " AND Required_Date >= @Required_Date";
-                listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
+                strSql += " AND Required_Date >= @StartRequired_Date";
+                listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
             {
-                strSql += " AND Required_Date <= @Required_Date";
-                listStr.Add(new SqlParameter("@Required_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
+                strSql += " AND Required_Date <= @EndRequired_Date";
+                listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
             {
-                strSql += " AND Actual_Date >= @Actual_Date";
-                listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
+                strSql += " AND Actual_Date >= @StartActual_Date";
+                listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
             {
-                strSql += " AND Actual_Date <= @Actual_Date";
-                listStr.Add(new SqlParameter("@Actual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
+                strSql += " AND Actual_Date <= @EndActual_Date";
+                listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
             }
             if (!string.IsNullOrEmpty(txtDisc.Text.Trim()))
             {