diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-07-30-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-07-30-phf.sql
new file mode 100644
index 00000000..49295379
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-07-30-phf.sql
@@ -0,0 +1,50 @@
+alter table Transfer_LHCSystemList add  UpdateTime datetime NULL
+GO;
+update Transfer_PunchlistFrom set IsMatI='Y' where IsMatI='1'
+GO
+update Transfer_PunchlistFrom set IsMatI='N' where IsMatI='0'
+GO
+CREATE TABLE [dbo].[Transfer_SystemControl](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[SystemNo] [nvarchar](50) NULL,
+	[PlanPWD] [datetime] NULL,
+	[PlanJWD] [datetime] NULL,
+	[McPlan] [datetime] NULL,
+	[SubmitPackage] [nvarchar](200) NULL,
+	[ActualPWD] [datetime] NULL,
+	[ActualJWD] [datetime] NULL,
+	[ActualMC] [datetime] NULL,
+	[Commissioning] [nvarchar](200) NULL,
+	[IaQian] [nvarchar](200) NULL,
+	[TcccQ] [nvarchar](200) NULL,
+	[SystemStatus] [nvarchar](20) NULL,
+	[TurnoverDescription] [nvarchar](50) NULL,
+	[Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Transfer_SystemControl] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+CREATE TABLE [dbo].[Transfer_SystemStatusRemarks](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[TypeName] [nvarchar](50) NULL,
+	[Remarks] [nvarchar](600) NULL,
+ CONSTRAINT [PK_Transfer_SystemStatusRemarks] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Transfer_SystemStatusRemarks', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Transfer_SystemStatusRemarks', @level2type=N'COLUMN',@level2name=N'TypeName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Transfer_SystemStatusRemarks', @level2type=N'COLUMN',@level2name=N'Remarks'
+GO
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
index 821158c6..3333ace5 100644
--- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
+++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
@@ -778,12 +778,12 @@ namespace FineUIPro.Web.AttachFile
                 }
                 #endregion
 
-                #region PunchlistFrom附件保存成功后处理事件
-                if (MenuId == BLL.Const.PunchlistFromMenuId)
-                {
-                    PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
-                }
-                #endregion
+                //#region PunchlistFrom附件保存成功后处理事件
+                //if (MenuId == BLL.Const.PunchlistFromMenuId)
+                //{
+                //    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                //}
+                //#endregion
 
                 PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index b2870513..a8e3d530 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2026,6 +2026,7 @@
     <Content Include="Transfer\Chart\PunchlistFromSort.aspx" />
     <Content Include="Transfer\Chart\Systemstatus.aspx" />
     <Content Include="Transfer\Chart\SystemstatusChart.aspx" />
+    <Content Include="Transfer\Chart\SystemstatusEdit.aspx" />
     <Content Include="Transfer\Chart\SystemStatusSummary.aspx" />
     <Content Include="Transfer\Chart\TransferChart.aspx" />
     <Content Include="Transfer\CivilStructure.aspx" />
@@ -17629,6 +17630,13 @@
     <Compile Include="Transfer\Chart\SystemstatusChart.aspx.designer.cs">
       <DependentUpon>SystemstatusChart.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\Chart\SystemstatusEdit.aspx.cs">
+      <DependentUpon>SystemstatusEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\SystemstatusEdit.aspx.designer.cs">
+      <DependentUpon>SystemstatusEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\Chart\SystemStatusSummary.aspx.cs">
       <DependentUpon>SystemStatusSummary.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -19128,7 +19136,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.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">
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index cb873201..63722353 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx
index c1948b4e..b1e0dcb3 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx
@@ -1,16 +1,105 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SystemStatusSummary.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.SystemStatusSummary" %>
 
+<%@ 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"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>移交状态汇总表</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">
-        <div>
-        </div>
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="TabStrip1" AjaxAspnetControls="divAccidentTime" />
+        <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="Category" AllowCellEditing="true" EnableColumnLines="true"
+                                    ClicksToEdit="2" DataIDField="Category" AllowSorting="true"
+                                    AllowPaging="false" IsDatabasePaging="false"
+                                    EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow"  EnableAfterEditEvent="true" OnAfterEdit="Grid1_AfterEdit">
+                                    <Columns>
+                                        <f:TemplateField ColumnID="tfPageIndex" Width="80px" HeaderText="No.序号" HeaderTextAlign="Center"
+                                            TextAlign="Center" EnableLock="true" Locked="False">
+                                            <ItemTemplate>
+                                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                            </ItemTemplate>
+                                        </f:TemplateField>
+                                        <f:BoundField DataField="Category" ColumnID="Category" HeaderText="Category<br/>分类" ExpandUnusedSpace="true" MinWidth="150px" TextAlign="Center" />
+                                        <f:RenderField Width="120px" ColumnID="System_Qty" DataField="System_Qty" HeaderText="System Qty<br/>系统数量" TextAlign="Center" FieldType="Double" />
+                                        <f:GroupField HeaderText="Cumulative Completion<br/>累计完成" TextAlign="Center" MinWidth="240px">
+                                            <Columns>
+                                                <f:RenderField Width="120px" ColumnID="Cumulative_Plan" DataField="Cumulative_Plan" HeaderText="Plan计划" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="120px" ColumnID="Cumulative_Actual" DataField="Cumulative_Plan" HeaderText="Actual实际" TextAlign="Center" FieldType="Double" />
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:GroupField HeaderText="This Week<br/>本周" TextAlign="Center" MinWidth="240px">
+                                            <Columns>
+                                                <f:RenderField Width="120px" ColumnID="Week_Plan" DataField="Week_Plan" HeaderText="Plan计划" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="120px" ColumnID="Week_Actual" DataField="Week_Plan" HeaderText="Actual实际" TextAlign="Center" FieldType="Double" />
+                                            </Columns>
+                                        </f:GroupField>
+                                        <f:RenderField Width="300px" ColumnID="Remarks" DataField="Remarks" FieldType="String" HeaderText="备注" HeaderTextAlign="Center">
+                                            <Editor>
+                                                <f:TextBox runat="server" ID="txtRemarks"></f:TextBox>                                                
+                                            </Editor>
+                                        </f:RenderField>
+                                    </Columns>
+                                </f:Grid>
+                            </Items>
+                        </f:Tab>
+                        <f:Tab ID="Tab2" Title="数据图表统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
+                            <Toolbars>
+                                <f:Toolbar>
+                                    <Items>
+                                        <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:DropDownList>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <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/SystemStatusSummary.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs
index 5a18bba7..7b86ddfc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.cs
@@ -1,17 +1,225 @@
-using System;
+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 SystemStatusSummary : System.Web.UI.Page
+    public partial class SystemStatusSummary : PageBase
     {
         protected void Page_Load(object sender, EventArgs e)
         {
+            if (!IsPostBack)
+            {
+                BindGrid1();
+            }
+        }
+
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid1();
+        }
+
+
+        /// <summary>
+        /// 查询绑定数据
+        /// </summary>
+        public void BindGrid1()
+        {
+
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            //计算本周日期段
+            DateTime today = DateTime.Today;
+            int dayOfWeek = (int)today.DayOfWeek;
+            DateTime startWeebTime = Convert.ToDateTime(today.AddDays(-dayOfWeek + 1).ToString("yyyy-MM-dd") + " 00:00:00");
+            DateTime endWeebTime = Convert.ToDateTime(today.AddDays(-dayOfWeek + 7).ToString("yyyy-MM-dd") + " 23:59:59");
+
+            StringBuilder strSql = new StringBuilder("");
+            strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllLHCSystemListTemp') IS NOT NULL drop table #AllLHCSystemListTemp; ");
+            strSql.AppendLine("  IF OBJECT_ID('tempdb..#LHCSystemListTemp') IS NOT NULL drop table #LHCSystemListTemp; ");
+            strSql.AppendLine("  select * INTO #AllLHCSystemListTemp from Transfer_LHCSystemList(NOLOCK) where ProjectId =@ProjectId; ");
+            strSql.AppendLine("  select isnull([Type],'0') [Type],(CASE isnull([Type],'0') WHEN '1' THEN 'Non Process system' ELSE 'Process System' END) Category,count(1) System_Qty ");
+            strSql.AppendLine(",cast(0 as decimal(18,2)) Cumulative_Plan,cast(0 as decimal(18,2)) Cumulative_Actual ,cast(0 as decimal(18,2)) Week_Plan,cast(0 as decimal(18,2)) Week_Actual,cast('' as nvarchar(600)) Remarks ");
+            strSql.AppendLine(" INTO #LHCSystemListTemp from #AllLHCSystemListTemp group by isnull([Type],'0'); ");
+            strSql.AppendLine("  update a set a.Cumulative_Plan=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND isnull(b.PlanFinishofTestingDate,'')<>'') ");
+            strSql.AppendLine("  ,a.Cumulative_Actual=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND isnull(b.ActualFinishedDate,'')<>'') ");
+            strSql.AppendLine("  ,a.Week_Plan=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND b.PlanFinishofTestingDate>=@StartWeebTime AND b.PlanFinishofTestingDate<=@EndWeebTime) ");
+            strSql.AppendLine("  ,a.Week_Actual=(select count(1) from #AllLHCSystemListTemp b where isnull(b.[Type],'0')=a.[Type] AND b.ActualFinishedDate>=@StartWeebTime AND b.ActualFinishedDate<=@EndWeebTime) ");
+            strSql.AppendLine("  ,a.Remarks=(select top 1 Remarks from Transfer_SystemStatusRemarks b(NOLOCK) where a.Category=b.TypeName and b.ProjectId=@ProjectId) ");
+            strSql.AppendLine("  from #LHCSystemListTemp a; ");
+            strSql.AppendLine("  select * from #LHCSystemListTemp; ");
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@StartWeebTime", startWeebTime));
+            listStr.Add(new SqlParameter("@EndWeebTime", dayOfWeek));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+
+            //合计
+            int Cumulative_Plan = 0;
+            int Cumulative_Actual = 0;
+            int Week_Plan = 0;
+            int Week_Actual = 0;
+            int System_Qty = 0;
+            foreach (DataRow row in tb.Rows)
+            {
+                System_Qty += Convert.ToInt32(row["System_Qty"]);
+                Cumulative_Plan += Convert.ToInt32(row["Cumulative_Plan"]);
+                Cumulative_Actual += Convert.ToInt32(row["Cumulative_Actual"]);
+                Week_Plan += Convert.ToInt32(row["Week_Plan"]);
+                Week_Actual += Convert.ToInt32(row["Week_Actual"]);
+            }
+
+
+            JObject summary = new JObject();
+            summary.Add("Category", "Total");
+            summary.Add("System_Qty", System_Qty.ToString());
+            summary.Add("Cumulative_Plan", Cumulative_Plan.ToString());
+            summary.Add("Cumulative_Actual", Cumulative_Actual.ToString());
+            summary.Add("Week_Plan", Week_Plan.ToString());
+            summary.Add("Week_Actual", Week_Actual.ToString());
+
+
+            Grid1.SummaryData = summary;
+        }
+
+        /// <summary>
+        /// 查询绑定图表数据
+        /// </summary>
+        public void AnalyseData()
+        {
+            var forms = from x in Funs.DB.Transfer_LHCSystemList
+                        where x.ProjectId == this.CurrUser.LoginProjectId
+                        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));
+                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.PlanFinishofTestingDate <= endTime).Count();
+                    rowTime["实际完成数量"] = forms.Where(x => x.ActualFinishedDate <= endTime).Count();
+                    rowTime["进行中移交包数量"] = forms.Where(x => x.UpdateTime <= endTime && x.Status == "In progress").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));
+                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.PlanFinishofTestingDate <= endTime).Count();
+                    rowTime["实际完成数量"] = forms.Where(x => x.ActualFinishedDate <= endTime).Count();
+                    rowTime["进行中移交包数量"] = forms.Where(x => x.UpdateTime <= endTime && x.Status == "In progress").Count();
+                    dtTime.Rows.Add(rowTime);
+                }
+                this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项完成统计分析", this.drpChartType.SelectedValue, 1300, 550, false));
+            }
+        }
+
+        protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
+        {
+            if (TabStrip1.ActiveTabIndex == 0)
+            {
+                BindGrid1();
+            }
+            else if (TabStrip1.ActiveTabIndex == 1)
+            {
+                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>
+        /// 修改后事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_AfterEdit(object sender, GridAfterEditEventArgs e)
+        {
+            Dictionary<int, Dictionary<string, object>> modifiedDict = Grid1.GetModifiedDict();
+
+            foreach (int rowIndex in modifiedDict.Keys)
+            {
+                string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                string remarks = modifiedDict[rowIndex]["Remarks"].ToString();
+                var updateRemarks = Funs.DB.Transfer_SystemStatusRemarks.FirstOrDefault(p => p.TypeName == rowID && p.ProjectId == this.CurrUser.LoginProjectId);
+                if (updateRemarks != null)
+                {
+                    updateRemarks.Remarks = remarks;
+                    Funs.DB.SubmitChanges();
+                }
+                else
+                {
+                    Model.Transfer_SystemStatusRemarks AddRemarks = new Model.Transfer_SystemStatusRemarks();
+                    AddRemarks.Id = Guid.NewGuid().ToString();
+                    AddRemarks.ProjectId = this.CurrUser.LoginProjectId;
+                    AddRemarks.TypeName= rowID;
+                    AddRemarks.Remarks= remarks;
+                    Funs.DB.Transfer_SystemStatusRemarks.InsertOnSubmit(AddRemarks);
+                    Funs.DB.SubmitChanges();
+                }
+            }
 
         }
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs
index a45770e1..87365792 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemStatusSummary.aspx.designer.cs
@@ -22,5 +22,113 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <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>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// txtRemarks 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemarks;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// ddlDateType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlDateType;
+
+        /// <summary>
+        /// drpChartType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChartType;
+
+        /// <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/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
index 32b12de0..9fdbb1db 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
@@ -4,13 +4,282 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>移交统计表</title>
 </head>
 <body>
     <form id="form1" runat="server">
-        <div>
-        </div>
+        <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" Title="设备材料报验" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="SystemNo" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="SystemNo" AllowSorting="true" 
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableTextSelection="true" AllowColumnLocking="true">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="ddlSystemNo" runat="server" Label="System No" AutoPostBack="true" EnableEdit="true"
+                                    OnSelectedIndexChanged="ddlSystemNo_SelectedIndexChanged" Width="300px" LabelWidth="100px">
+                                </f:DropDownList>
+
+                                <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                                </f:Button>
+
+                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                         <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="true">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                       <%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="50px">
+                        </f:RenderField>--%>
+
+                        <f:RenderField ColumnID="SystemNo" DataField="SystemNo"
+                            FieldType="String" HeaderText="SystemNo" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="120px" EnableLock="true" Locked="true">
+                        </f:RenderField>
+
+                        <f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
+                            HeaderText="Plan PWD<br/>计划PWD" TextAlign="Center"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
+
+                        <f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
+                            HeaderText="Plan JWD<br/>计划联合检查" TextAlign="Center"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
+
+                        <f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
+                            HeaderText="MC Plan<br/>MC 计划" TextAlign="Center"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
+
+                        <f:GroupField HeaderText="Piping<br/>管道测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="PipingCount" DataField="PipingCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="PipingScount" DataField="PipingScount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="PipingPercent" DataField="PipingPercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                        <f:GroupField HeaderText="Equipment<br/>设备测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="EqCount" DataField="EqCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="EqSCount" DataField="EqSCount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="EqPercent" DataField="EqPercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                        <f:GroupField HeaderText="Electric<br/>电气测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="TeCount" DataField="TeCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="TeScount" DataField="TeScount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="TePercent" DataField="TePercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                        <f:GroupField HeaderText="instrument<br/>仪表测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="TiCount" DataField="TiCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="TiScount" DataField="TiScount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="TiPercent" DataField="TiPercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                         <f:GroupField HeaderText="Civil/Structure<br/>土建/建筑/结构测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="TcsCount" DataField="TcsCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="TcsScount" DataField="TcsScount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="TcsPercent" DataField="TcsPercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                        <f:GroupField HeaderText="Firefighting<br/>消防测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="TfCount" DataField="TfCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="TfScount" DataField="TfScount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="TfPercent" DataField="TfPercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                        <f:GroupField HeaderText="Telecom<br/>电信测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="TtCount" DataField="TtCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="TtScount" DataField="TtScount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="TtPercent" DataField="TtPercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                         <f:GroupField HeaderText="Plumbing<br/>地管测试包" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="TpCount" DataField="TpCount"
+                                    HeaderText="总数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="TpScount" DataField="TpScount"
+                                    HeaderText="完成数" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="80px" ColumnID="TpPercent" DataField="TpPercent"
+                                    HeaderText="完成率(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                        <f:TemplateField ColumnID="Count4" minWidth="120px" HeaderText="Total<br/>completion<br/>percentage<br/>总完成率（%）" HeaderTextAlign="Center" TextAlign="Right">
+                            <ItemTemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# totalper(Eval("SystemNo")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+
+                            <f:RenderField MinWidth="140px" ColumnID="SubmitPackage" DataField="SubmitPackage"
+                            HeaderText="Submit Package<br/>系统包提交 " TextAlign="Center"
+                            FieldType="String"/>
+
+                         <f:RenderField MinWidth="120px" ColumnID="ActualPWD" DataField="ActualPWD"
+                            HeaderText="Actual PWD<br/>实际预联合检查" TextAlign="Center"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
+
+                         <f:GroupField HeaderText="PWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="pwdACount" DataField="pwdACount"
+                                    HeaderText="A" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="pwdBCount" DataField="pwdBCount"
+                                    HeaderText="B" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="pwdCCount" DataField="pwdCCount"
+                                    HeaderText="C" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+
+                        <f:RenderField MinWidth="120px" ColumnID="ActualJWD" DataField="ActualJWD"
+                            HeaderText="Actual JWD<br/>实际联合检查" TextAlign="Center"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
+
+
+                        <f:GroupField HeaderText="FWD Punch items  <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
+                            <Columns>
+                                <f:RenderField MinWidth="50px" ColumnID="fwdACount" DataField="fwdACount"
+                                    HeaderText="A" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="fwdBCount" DataField="fwdBCount"
+                                    HeaderText="B" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="50px" ColumnID="fwdCCount" DataField="fwdCCount"
+                                    HeaderText="C" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+
+                        <f:RenderField MinWidth="120px" ColumnID="ActualMC" DataField="ActualMC"
+                            HeaderText="Actual  MC<br/>实际机械完工" TextAlign="Center"
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
+
+
+                          <f:RenderField MinWidth="120px" ColumnID="Commissioning" DataField="Commissioning"
+                            HeaderText="Commissioning<br/>试运行 " TextAlign="Center"
+                            FieldType="String"/>
+
+                          <f:RenderField MinWidth="120px" ColumnID="IaQian" DataField="IaQian"
+                            HeaderText="IA签署 " TextAlign="Center"
+                            FieldType="String"/>
+
+                          <f:RenderField MinWidth="120px" ColumnID="TcccQ" DataField="TcccQ"
+                            HeaderText="TCCC签署" TextAlign="Center"
+                            FieldType="String"/>
+
+                          <f:RenderField MinWidth="120px" ColumnID="SystemStatus" DataField="SystemStatus"
+                            HeaderText="System Status<br/>系统状态 " TextAlign="Center"
+                            FieldType="String"/>
+
+                          <f:RenderField MinWidth="160px" ColumnID="TurnoverDescription" DataField="TurnoverDescription"
+                            HeaderText="Turnover Description" TextAlign="Center"
+                            FieldType="String"/>
+
+                        <f:RenderField MinWidth="120px" ColumnID="Remark" DataField="Remark"
+                            HeaderText="Remark<br/>备注" TextAlign="Center"
+                            FieldType="String"/>
+
+                    </Columns>
+                     <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <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>
+           <f:Window ID="Window1" Title="修改" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
+            Height="600px">
+        </f:Window>
+         <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
     </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index 23fe1cfe..64503e1f 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -1,17 +1,447 @@
-using System;
+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;
+using static FineUIPro.Web.CQMS.Performance.Performance;
+using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.Transfer.Chart
 {
-    public partial class Systemstatus : System.Web.UI.Page
+    public partial class Systemstatus : PageBase
     {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
+            if (!IsPostBack)
+            {
+                var systemCode = Funs.DB.Transfer_LHCSystemList
+                    .Where(x => x.ProjectId == CurrUser.LoginProjectId)
+                    .GroupBy(p => new { p.SystemNo })
+                    .Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
+                int indexRow = 1;
+                ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
+                foreach (var t in systemCode)
+                {
+                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SystemNo, t.SystemNo));
+                    indexRow++;
+                }
 
+                BindGrid();
+
+            }
         }
+
+        public DataTable DataSql()
+        {
+            string strSql = @"
+                    select f.SystemNo,f.ProjectId,
+                    ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount,
+                    case ISNULL(tpi.PipingCount,0)
+                    when 0 then 0
+                    else 100*(ISNULL(tpi1.PipingScount,0)/ISNULL(tpi.PipingCount,0))  end PipingPercent,
+
+                    ISNULL((TseCount+TreCount),0) as EqCount,ISNULL((TseSCount+TreSCount),0) as EqScount,
+                    case ISNULL((TseCount+TreCount),0)
+                    when 0 then 0
+                    else 100 *(ISNULL((TseSCount+TreSCount),0)/ISNULL((TseCount+TreCount),0)) end EqPercent,
+
+                    ISNULL(TeCount,0) TeCount,ISNULL(TeScount,0) TeScount,
+                    case ISNULL(TeCount,0)
+                    when 0 then 0
+                    else 100*(ISNULL(TeScount,0)/ISNULL(TeCount,0))  end TePercent,
+
+                    ISNULL(TiCount,0) TiCount,ISNULL(TiScount,0) TiScount,
+                    case ISNULL(TiCount,0)
+                    when 0 then 0
+                    else 100*(ISNULL(TiScount,0)/ISNULL(TiCount,0))  end TiPercent,
+
+                    ISNULL(TcsCount,0) TcsCount,ISNULL(TcsScount,0) TcsScount,
+                    case ISNULL(TcsCount,0)
+                    when 0 then 0
+                    else 100*(ISNULL(TcsScount,0)/ISNULL(TcsCount,0))  end TcsPercent,
+
+                    ISNULL(TfCount,0) TfCount,ISNULL(TfScount,0) TfScount,
+                    case ISNULL(TfCount,0)
+                    when 0 then 0
+                    else 100*(ISNULL(TfScount,0)/ISNULL(TfCount,0))  end TfPercent,
+
+                    ISNULL(TtCount,0) TtCount,ISNULL(TtScount,0) TtScount,
+                    case ISNULL(TtCount,0)
+                    when 0 then 0
+                    else 100*(ISNULL(TtScount,0)/ISNULL(TtCount,0))  end TtPercent,
+
+                    ISNULL(TpCount,0) TpCount,ISNULL(TpScount,0) TtScount,
+                    case ISNULL(TpCount,0)
+                    when 0 then 0
+                    else 100*(ISNULL(TpScount,0)/ISNULL(TpCount,0))  end TpPercent,
+
+                    ts.PlanPWD,PlanJWD,McPlan,
+                    SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,
+                    IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark,
+                    ISNULL(pwdACount,0) pwdACount,ISNULL(pwdBCount,0) pwdBCount,ISNULL(pwdCCount,0) pwdCCount,
+                    ISNULL(fwdACount,0) fwdACount,ISNULL(fwdBCount,0) fwdBCount,ISNULL(fwdCCount,0) fwdCCount
+                    from(
+                    SELECT SystemNo,ProjectId FROM Transfer_LHCSystemList group by SystemNo,ProjectId
+                    ) f
+                    left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SystemNo=ts.SystemNo
+                    --piping
+                    left join (select count(*)as PipingCount,ProjectId,SYSTEM from Transfer_Piping
+                    group by ProjectId,SYSTEM)
+                    tpi on f.ProjectId=tpi.ProjectId and f.SystemNo=tpi.SYSTEM
+
+                    left join (select count(*)as PipingScount,ProjectId,SYSTEM from Transfer_Piping where FINALStatus='Completed'
+                    group by ProjectId,SYSTEM)
+                    tpi1 on f.ProjectId=tpi1.ProjectId and f.SystemNo=tpi1.SYSTEM
+                    --设备测试包
+                    left join (select count(*)as TseCount,ProjectId,SYSTEM from Transfer_StaticEquipment
+                    group by ProjectId,SYSTEM)
+                    tse on f.ProjectId=tse.ProjectId and f.SystemNo=tse.SYSTEM
+
+                    left join (select count(*)as TseSCount,ProjectId,SYSTEM from Transfer_StaticEquipment where MechanicalFINALStatus='Completed'
+                    group by ProjectId,SYSTEM)
+                    tse1 on f.ProjectId=tse1.ProjectId and f.SystemNo=tse1.SYSTEM
+                    --
+                    left join (select count(*)as TreCount,ProjectId,SYSTEM from Transfer_RotatingEquipment
+                    group by ProjectId,SYSTEM)
+                    tre on f.ProjectId=tre.ProjectId and f.SystemNo=tre.SYSTEM
+
+                    left join (select count(*)as TreSCount,ProjectId,SYSTEM from Transfer_RotatingEquipment where MechanicalFINALStatus='Completed'
+                    group by ProjectId,SYSTEM)
+                    tre1 on f.ProjectId=tre1.ProjectId and f.SystemNo=tre1.SYSTEM
+
+                    --Transfer_Electrical
+                    left join (select count(*)as TeCount,ProjectId,SystemName from Transfer_Electrical
+                    group by ProjectId,SystemName)
+                    te on f.ProjectId=te.ProjectId and f.SystemNo=te.SystemName
+
+                    left join (select count(*)as TeScount,ProjectId,SystemName from Transfer_Electrical where FINAL_Status='Completed'
+                    group by ProjectId,SystemName)
+                    te1 on f.ProjectId=te1.ProjectId and f.SystemNo=te1.SystemName
+
+                    --Transfer_Instrumentation
+                    left join (select count(*)as TiCount,ProjectId,SystemName from Transfer_Instrumentation
+                    group by ProjectId,SystemName)
+                    ti on f.ProjectId=ti.ProjectId and f.SystemNo=ti.SystemName
+
+                    left join (select count(*)as TiScount,ProjectId,SystemName from Transfer_Instrumentation where FINAL_Status='Completed'
+                    group by ProjectId,SystemName)
+                    ti1 on f.ProjectId=ti1.ProjectId and f.SystemNo=ti1.SystemName
+
+                    --Transfer_Civil_Structure
+                    left join (select count(*)as TcsCount,ProjectId,SystemName from Transfer_Civil_Structure
+                    group by ProjectId,SystemName)
+                    tcs on f.ProjectId=tcs.ProjectId and f.SystemNo=tcs.SystemName
+
+                    left join (select count(*)as TcsScount,ProjectId,SystemName from Transfer_Civil_Structure where FINAL_Status='Completed'
+                    group by ProjectId,SystemName)
+                    tcs1 on f.ProjectId=tcs1.ProjectId and f.SystemNo=tcs1.SystemName
+
+                    --Transfer_Firefighting
+                    left join (select count(*)as TfCount,ProjectId,SystemName from Transfer_Firefighting
+                    group by ProjectId,SystemName)
+                    tf on f.ProjectId=tf.ProjectId and f.SystemNo=tf.SystemName
+
+                    left join (select count(*)as TfScount,ProjectId,SystemName from Transfer_Firefighting where FINAL_Status='Completed'
+                    group by ProjectId,SystemName)
+                    tf1 on f.ProjectId=tf1.ProjectId and f.SystemNo=tf1.SystemName
+
+                    --Transfer_Telecom
+                    left join (select count(*)as TtCount,ProjectId,SystemName from Transfer_Telecom
+                    group by ProjectId,SystemName)
+                    Tt on f.ProjectId=Tt.ProjectId and f.SystemNo=Tt.SystemName
+
+                    left join (select count(*)as TtScount,ProjectId,SystemName from Transfer_Telecom where FINAL_Status='Completed'
+                    group by ProjectId,SystemName)
+                    Tt1 on f.ProjectId=Tt1.ProjectId and f.SystemNo=Tt1.SystemName
+
+                    --Transfer_Plumbing
+                    left join (select count(*)as TpCount,ProjectId,SystemName from Transfer_Plumbing
+                    group by ProjectId,SystemName)
+                    tp on f.ProjectId=tp.ProjectId and f.SystemNo=tp.SystemName
+
+                    left join (select count(*)as TpScount,ProjectId,SystemName from Transfer_Plumbing where FINAL_Status='Completed'
+                    group by ProjectId,SystemName)
+                    tp1 on f.ProjectId=tp1.ProjectId and f.SystemNo=tp1.SystemName
+                    
+                    left join (select count(*) as pwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
+                    and Punch_Type='PWD' and Cat='A' group by ProjectId,System_No)
+                    tpA on f.ProjectId=tpA.ProjectId and f.SystemNo=tpA.System_No
+
+                    left join (select count(*) as pwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
+                    and Punch_Type='PWD' and Cat='B' group by ProjectId,System_No)
+                    tpB on f.ProjectId=tpB.ProjectId and f.SystemNo=tpB.System_No
+
+                    left join (select count(*) as pwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
+                    and Punch_Type='PWD' and Cat='C' group by ProjectId,System_No)
+                    tpC on f.ProjectId=tpC.ProjectId and f.SystemNo=tpC.System_No
+
+                    left join (select count(*) as fwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
+                    and Punch_Type='FWD' and Cat='A' group by ProjectId,System_No)
+                    tpfA on f.ProjectId=tpfA.ProjectId and f.SystemNo=tpfA.System_No
+
+                    left join (select count(*) as fwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
+                    and Punch_Type='FWD' and Cat='B' group by ProjectId,System_No)
+                    tpfB on f.ProjectId=tpfB.ProjectId and f.SystemNo=tpfB.System_No
+
+                    left join (select count(*) as fwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
+                    and Punch_Type='FWD' and Cat='C' group by ProjectId,System_No)
+                    tpfC on f.ProjectId=tpfC.ProjectId and f.SystemNo=tpfC.System_No
+
+                              where f.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+
+            if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue))
+            {
+                strSql += " AND SystemNo='" + ddlSystemNo.SelectedValue + "' ";
+            }
+
+            strSql += " order by SystemNo ";
+            SqlParameter[] parameter = listStr.ToArray();
+            return SQLHelper.GetDataTableRunText(strSql, parameter);
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            DataTable tb = DataSql();
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #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);
+            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();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            
+            string SystemNo = Grid1.SelectedRowID;
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SystemstatusEdit.aspx?SystemNo={0}", SystemNo, "编辑 - ")));
+        }
+        #endregion
+
+        protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        /// <summary>
+        /// 获取总完成率
+        /// </summary>
+        /// <param name="systemNo"></param>
+        /// <returns></returns>
+        protected string totalper(object systemNo)
+        {
+            string rate = string.Empty;
+            if (systemNo != null)
+            {
+                var pid = CurrUser.LoginProjectId;
+                var scode = systemNo.ToString();
+                //根据systemNo和projectid获取所有数据 和完成的数据
+                #region 九个表的数据
+                var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList();
+                var list2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList();
+                var list3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList();
+                var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
+                var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
+                var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
+                var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
+                var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
+                #endregion
+
+                float allcount = (list1.Count + list2.Count + list3.Count + list4.Count +
+                    list5.Count + list6.Count + list7.Count + list8.Count);
+
+                float allScount = (list1.Where(x => x.FINALStatus == "Completed").ToList().Count + list2.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count
+                    + list3.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + list4.Where(x => x.FINAL_Status == "Completed").ToList().Count +
+                    list5.Where(x => x.FINAL_Status == "Completed").ToList().Count + list6.Where(x => x.FINAL_Status == "Completed").ToList().Count
+                    + list7.Where(x => x.FINAL_Status == "Completed").ToList().Count + list8.Where(x => x.FINAL_Status == "Completed").ToList().Count
+                    );
+
+                if (Convert.ToInt32(allcount)==0)
+                {
+                    return "0";
+                }
+                var rateF = 100 * (allScount / allcount);
+                rate = rateF.ToString("F2");
+            }
+            return rate;
+        }
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("项目月报" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            //sb.Append("<tr>");
+            //foreach (GridColumn column in grid.Columns)
+            //{
+            //    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+            //    {
+            //        sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+            //    }
+            //}
+            //sb.Append("</tr>");
+            MultiHeaderTable mht = new MultiHeaderTable();
+            mht.ResolveMultiHeaderTable(Grid1.Columns);
+
+            foreach (List<object[]> rows in mht.MultiTable)
+            {
+                sb.Append("<tr>");
+                foreach (object[] cell in rows)
+                {
+                    int rowspan = Convert.ToInt32(cell[0]);
+                    int colspan = Convert.ToInt32(cell[1]);
+                    GridColumn column = cell[2] as GridColumn;
+                    if (column.Hidden == false)
+                    {
+                        sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
+                        rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
+                        colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
+                        colspan != 1 ? " style=\"text-align:center;\"" : "",
+                        column.HeaderText);
+                    }
+                }
+                sb.Append("</tr>");
+            }
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                //if (row.Grid.gr.Hidden == false) { 
+                foreach (GridColumn column in mht.Columns)
+                {
+                    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+                    {
+                        string html = row.Values[column.ColumnIndex].ToString();
+
+                        if (column.ColumnID == "tfPageIndex")
+                        {
+                            html = (row.FindControl("lblPageIndex") as AspNet.Label).Text;
+                        }
+                       
+                        else if (column.ColumnID == "Count4")
+                        {
+                            html = (row.FindControl("Label5") as AspNet.Label).Text;
+                        }
+
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                }
+                //}
+                sb.Append("</tr>");
+            }
+            
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
index 2d01287e..592ff387 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
@@ -22,5 +22,131 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </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>
+        /// ddlSystemNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSystemNo;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label5;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
     }
 }
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
new file mode 100644
index 00000000..e98acddc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
@@ -0,0 +1,105 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SystemstatusEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.SystemstatusEdit" %>
+
+<!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>移交统计表编辑</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" Title="HSE事故(对人员)记录"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                         <f:DatePicker runat="server" Label="Plan PWD/计划PWD" ID="txtPlanPWD"  DateFormatString="yyyy-MM-dd" 
+                             LabelAlign="Right" LabelWidth="200px"  Required="true" ShowRedStar="true">
+                        </f:DatePicker>
+
+                         <f:DatePicker runat="server" Label="Plan JWD/计划联合检查" ID="txtPlanJWD" DateFormatString="yyyy-MM-dd" 
+                             LabelAlign="Right"  Required="true" ShowRedStar="true">
+                        </f:DatePicker>
+
+                         <f:DatePicker runat="server" Label="MC Plan/MC 计划" ID="txtMcPlan" DateFormatString="yyyy-MM-dd" 
+                             LabelAlign="Right"  Required="true" ShowRedStar="true">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtSubmitPackage" runat="server" Label="Submit Package/系统包提交 " LabelAlign="Right" LabelWidth="200px">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                         <f:DatePicker runat="server" Label="Actual PWD/实际预联合检查" ID="txtActualPWD"  DateFormatString="yyyy-MM-dd" 
+                             LabelAlign="Right" LabelWidth="200px">
+                        </f:DatePicker>
+
+                         <f:DatePicker runat="server" Label="Actual JWD/实际联合检查" ID="txtActualJWD" DateFormatString="yyyy-MM-dd" 
+                             LabelAlign="Right">
+                        </f:DatePicker>
+
+                         <f:DatePicker runat="server" Label="Actual  MC/实际机械完工" ID="txtActualMC" DateFormatString="yyyy-MM-dd" 
+                             LabelAlign="Right">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                         <f:TextBox ID="txtCommissioning" runat="server" Label="Commissioning/试运行" LabelAlign="Right" LabelWidth="200px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtIaQian" runat="server" Label="IA签署" LabelAlign="Right">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTcccQ" runat="server" Label="TCCC签署" LabelAlign="Right">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                          <f:DropDownList ID="ddlSystemStatus" runat="server" Label="System Status/系统状态" LabelWidth="200px" Required="true" ShowRedStar="true">
+                            <f:ListItem Value="" Text=""></f:ListItem>
+                            <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                            <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                            <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                        </f:DropDownList>
+
+                        <f:TextBox ID="txtTurnoverDescription" runat="server" Label="Turnover Description" LabelAlign="Right">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                 <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtRemark" runat="server" Label="Remark/备注 " LabelAlign="Right" LabelWidth="200px">
+                        </f:TextArea>
+                    </Items>
+                </f:FormRow>
+
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1" Text="保存"
+                            OnClick="btnSave_Click">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.cs
new file mode 100644
index 00000000..b89ff589
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.cs
@@ -0,0 +1,142 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class SystemstatusEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string SystemNo
+        {
+            get
+            {
+                return (string)ViewState["SystemNo"];
+            }
+            set
+            {
+                ViewState["SystemNo"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+
+        public string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack) {
+                ProjectId = this.CurrUser.LoginProjectId;
+                SystemNo = Request.Params["SystemNo"];
+                var model = Funs.DB.Transfer_SystemControl.FirstOrDefault(x => x.ProjectId == ProjectId && x.SystemNo == SystemNo);
+                if (model!=null)
+                {
+                    Id = model.Id;
+                    txtPlanPWD.Text = model.PlanPWD.ToString();
+                    txtPlanJWD.Text = model.PlanJWD.ToString();
+                    txtMcPlan.Text = model.McPlan.ToString();
+                    txtSubmitPackage.Text = model.SubmitPackage;
+                    txtActualPWD.Text = model.ActualPWD.ToString();
+                    txtActualJWD.Text = model.ActualJWD.ToString();
+                    txtActualMC.Text = model.ActualMC.ToString();
+                    txtCommissioning.Text = model.Commissioning;
+                    txtIaQian.Text = model.IaQian;
+                    txtTcccQ.Text = model.TcccQ;
+                    ddlSystemStatus.SelectedValue = model.SystemStatus;
+                    txtTurnoverDescription.Text = model.TurnoverDescription;
+                    txtRemark.Text = model.Remark;
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e) {
+            var model = new Model.Transfer_SystemControl()
+            {
+                ProjectId=ProjectId,
+                SystemNo=SystemNo,
+                PlanPWD= Convert.ToDateTime(txtPlanPWD.Text),
+                PlanJWD=Convert.ToDateTime(txtPlanJWD.Text),
+                McPlan=Convert.ToDateTime(txtMcPlan.Text),
+                SubmitPackage= txtSubmitPackage.Text,
+                Commissioning= txtCommissioning.Text,
+                IaQian= txtIaQian.Text,
+                TcccQ= txtTcccQ.Text,
+                SystemStatus= ddlSystemStatus.SelectedValue,
+                TurnoverDescription= txtTurnoverDescription.Text,
+                Remark= txtRemark.Text
+            };
+            if (!string.IsNullOrEmpty(txtActualPWD.Text))
+            {
+                model.ActualPWD = Convert.ToDateTime(txtActualPWD.Text);
+            }
+            if (!string.IsNullOrEmpty(txtActualJWD.Text))
+            {
+                model.ActualJWD = Convert.ToDateTime(txtActualJWD.Text);
+            }
+            if (!string.IsNullOrEmpty(txtActualMC.Text))
+            {
+                model.ActualMC = Convert.ToDateTime(txtActualMC.Text);
+            }
+            if (string.IsNullOrEmpty(Id))
+            {
+                model.Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_SystemControl.InsertOnSubmit(model);
+            }
+            else {
+                model.Id = Id;
+                var newModel = Funs.DB.Transfer_SystemControl.FirstOrDefault(p => p.Id == this.Id);
+                newModel.PlanPWD = model.PlanPWD;
+                newModel.PlanJWD = model.PlanJWD;
+                newModel.McPlan = model.McPlan;
+                newModel.SubmitPackage = model.SubmitPackage;
+                newModel.Commissioning = model.Commissioning;
+                newModel.IaQian = model.IaQian;
+                newModel.TcccQ = model.TcccQ;
+                newModel.SystemStatus = model.SystemStatus;
+                newModel.TurnoverDescription = model.TurnoverDescription;
+                newModel.Remark = model.Remark;
+                newModel.ActualPWD = model.ActualPWD;
+                newModel.ActualJWD = model.ActualJWD;
+                newModel.ActualMC = model.ActualMC;
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("编辑成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
new file mode 100644
index 00000000..fb9f979a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
@@ -0,0 +1,188 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class SystemstatusEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// txtPlanPWD 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPlanPWD;
+
+        /// <summary>
+        /// txtPlanJWD 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPlanJWD;
+
+        /// <summary>
+        /// txtMcPlan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtMcPlan;
+
+        /// <summary>
+        /// txtSubmitPackage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtSubmitPackage;
+
+        /// <summary>
+        /// txtActualPWD 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtActualPWD;
+
+        /// <summary>
+        /// txtActualJWD 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtActualJWD;
+
+        /// <summary>
+        /// txtActualMC 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtActualMC;
+
+        /// <summary>
+        /// txtCommissioning 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCommissioning;
+
+        /// <summary>
+        /// txtIaQian 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIaQian;
+
+        /// <summary>
+        /// txtTcccQ 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTcccQ;
+
+        /// <summary>
+        /// ddlSystemStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSystemStatus;
+
+        /// <summary>
+        /// txtTurnoverDescription 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTurnoverDescription;
+
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
index ac2f6da7..fe2bf1ab 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
@@ -36,7 +36,7 @@ namespace FineUIPro.Web.Transfer
                 if (Type=="1")
                 {
                     var a = Grid1;
-                    Grid1.Columns[3].Hidden = false;
+                    Grid1.Columns[4].Hidden = false;
                 }
                 GetButtonPower();
                 BindGrid();
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs
index 07df687d..62a27f36 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs
@@ -523,7 +523,7 @@ namespace FineUIPro.Web.Transfer
                             model.ActualFinishedDate = t3;
                     }
 
-                    
+                    model.UpdateTime = DateTime.Now;
                     list.Add(model);
                     //}
                     //else
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index 95720d13..7d45c29e 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -244,14 +244,14 @@
         </f:Panel>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
-            Height="500px">
+            Height="500px" OnClose="WindowAtt_Close">
         </f:Window>
         <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
             Width="700px" Height="560px">
         </f:Window>
         <f:Window ID="Window1" Title="尾项管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
             Height="600px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index afbd3ffb..2c47563e 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -212,6 +212,10 @@ namespace FineUIPro.Web.Transfer
         {
             BindGrid();
         }
+        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
         #endregion
 
         #region 删除
@@ -569,7 +573,6 @@ namespace FineUIPro.Web.Transfer
             Response.Flush();
             Response.Close();
             File.Delete(newUrl);
-
         }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
index d4a631ad..8183ad5c 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
@@ -17,65 +17,68 @@
             <Rows>
                 <f:FormRow>
                     <Items>
+                        <f:TextBox ID="txtNum_NO" runat="server" Label="No." LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
                         <f:TextBox ID="txtSystem_No" runat="server" Label="系统号/System No." LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
                         </f:TextBox>
-                        <f:TextBox ID="txtSub_Sys_No" runat="server" Label="子系统号/Sub-sys. No." LabelAlign="Right" LabelWidth="200px"  Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtSub_Sys_No" runat="server" Label="子系统号/Sub-sys. No." LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
                         </f:TextBox>
-                        <f:DropDownList ID="ddlCat" runat="server" Label="Cat." LabelWidth="200px"  Required="true" ShowRedStar="true">
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="ddlCat" runat="server" Label="Cat." LabelWidth="200px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
                             <f:ListItem Value="A" Text="A"></f:ListItem>
                             <f:ListItem Value="B" Text="B"></f:ListItem>
                             <f:ListItem Value="C" Text="C"></f:ListItem>
                             <f:ListItem Value="D" Text="D"></f:ListItem>
                         </f:DropDownList>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextBox ID="txtRaised_By" runat="server" Label="提出人/Raised By" LabelAlign="Right" LabelWidth="180px"  Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtRaised_By" runat="server" Label="提出人/Raised By" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
                         </f:TextBox>
-                        <f:DatePicker runat="server" Label="提出时间/Date Raised" ID="txtDate_Raised" LabelAlign="Right" LabelWidth="200px" Width="300px"  Required="true" ShowRedStar="true">
+                        <f:DatePicker runat="server" Label="提出时间/Date Raised" ID="txtDate_Raised" LabelAlign="Right" LabelWidth="200px" Width="300px" Required="true" ShowRedStar="true">
                         </f:DatePicker>
-                        <f:TextBox ID="txtDisc" runat="server" Label="专业/Disc." LabelAlign="Right" LabelWidth="200px"  Required="true" ShowRedStar="true">
-                        </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlIsEng" runat="server" Label="设计需求/Eng(Y/N)" LabelWidth="180px"  Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtDisc" runat="server" Label="专业/Disc." LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                        <f:DropDownList ID="ddlIsEng" runat="server" Label="设计需求/Eng(Y/N)" LabelWidth="180px" Required="true" ShowRedStar="true">
                             <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="ddlIsMatI" runat="server" Label="材料需求/Mat’l(Y/N)" LabelWidth="200px" Width="300px"  Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="ddlIsMatI" runat="server" Label="材料需求/Mat’l(Y/N)" LabelWidth="200px" Width="300px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
                             <f:ListItem Value="Y" Text="Y"></f:ListItem>
                             <f:ListItem Value="Y1" Text="Y1"></f:ListItem>
                             <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
                             <f:ListItem Value="N" Text="N"></f:ListItem>
                         </f:DropDownList>
-                        <f:TextBox ID="txtPunch_Type" runat="server" Label="尾项类别/Punch Type" LabelAlign="Right" LabelWidth="200px"  Required="true" ShowRedStar="true">
-                        </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-
-                        <f:DatePicker runat="server" Label="要求完成时间/Required Date" ID="txtRequired_Date" LabelAlign="Right" LabelWidth="210px"  Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="txtPunch_Type" runat="server" Label="尾项类别/Punch Type" LabelWidth="200px" Required="true" ShowRedStar="true">
+                            <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:DatePicker runat="server" Label="要求完成时间/Required Date" ID="txtRequired_Date" LabelAlign="Right" LabelWidth="210px" Required="true" ShowRedStar="true">
                         </f:DatePicker>
-                        <f:TextBox ID="txtAction_By" runat="server" Label="责任单位/Action By" LabelAlign="Right" LabelWidth="200px" Width="300px"  Required="true" ShowRedStar="true">
-                        </f:TextBox>
-                        <f:TextBox ID="txtPIC" runat="server" Label="责任人PIC" LabelAlign="Right" LabelWidth="200px"  Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtAction_By" runat="server" Label="责任单位/Action By" LabelAlign="Right" LabelWidth="200px" Width="300px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtPIC_WUH" runat="server" Label="责任人-五环/PIC-WUH" LabelAlign="Right" LabelWidth="180px"  Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtPIC" runat="server" Label="责任人PIC" LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtPIC_WUH" runat="server" Label="责任人-五环/PIC-WUH" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                         <f:DatePicker runat="server" Label="实际完成时间/Actual Date" ID="txtActual_Date" LabelAlign="Right" LabelWidth="180px" Width="300px">
                         </f:DatePicker>
-                        <f:ToolbarFill runat="server"></f:ToolbarFill>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs
index b599f9ef..7a8ab639 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.cs
@@ -50,6 +50,7 @@ namespace FineUIPro.Web.Transfer
                 var TransferPunchlistFrom = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(p => p.Id == this.Id);
                 if (TransferPunchlistFrom != null)
                 {
+                    this.txtNum_NO.Text = TransferPunchlistFrom.Num_NO;
                     this.txtSystem_No.Text = TransferPunchlistFrom.System_No;
                     this.txtSub_Sys_No.Text = TransferPunchlistFrom.Sub_Sys_No;
                     this.txtDESCRIPTION.Text = TransferPunchlistFrom.DESCRIPTION;
@@ -63,7 +64,7 @@ namespace FineUIPro.Web.Transfer
                     else
                         this.ddlIsEng.SelectedValue = "N";
                     this.ddlIsMatI.SelectedValue = TransferPunchlistFrom.IsMatI ?? "";
-                    this.txtPunch_Type.Text = TransferPunchlistFrom.Punch_Type;
+                    this.txtPunch_Type.SelectedValue = TransferPunchlistFrom.Punch_Type ?? "";
                     if (TransferPunchlistFrom.Required_Date != null)
                         this.txtRequired_Date.Text = Convert.ToDateTime(TransferPunchlistFrom.Required_Date).ToString("yyyy-MM-dd");
                     this.txtAction_By.Text = TransferPunchlistFrom.Action_By;
@@ -83,6 +84,16 @@ namespace FineUIPro.Web.Transfer
                         this.txtVerified_Date.Text = Convert.ToDateTime(TransferPunchlistFrom.Verified_Date).ToString("yyyy-MM-dd");
                     this.txtRemark.Text = TransferPunchlistFrom.Remark;
                 }
+                else
+                {
+                    var maxNumNO = 0;
+                    var modelTp = Funs.DB.Transfer_PunchlistFrom.OrderByDescending(x => x.Num_NO).FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
+                    if (modelTp == null)
+                        maxNumNO = 1;
+                    else
+                        maxNumNO = Convert.ToInt32(modelTp.Num_NO) + 1;
+                    this.txtNum_NO.Text = maxNumNO.ToString("0000");
+                }
             }
         }
 
@@ -122,12 +133,12 @@ namespace FineUIPro.Web.Transfer
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (SaveData() == 0) {
-                Alert.ShowInTop("保存失败！", MessageBoxIcon.Warning);
+            if (SaveData() == 0)
+            {
                 return;
             }
-            ShowNotify("保存成功",MessageBoxIcon.Success);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
 
         /// <summary>
@@ -136,19 +147,13 @@ namespace FineUIPro.Web.Transfer
         /// <returns></returns>
         private int SaveData()
         {
-            int reutState = 0;            
-            var maxNumNO = 0;
-            var modelTp = Funs.DB.Transfer_PunchlistFrom.OrderByDescending(x => x.Num_NO).FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId);
-            if (modelTp == null)
-                maxNumNO = 1;
-            else
-                maxNumNO = Convert.ToInt32(modelTp.Num_NO) + 1;
+            int reutState = 0;
 
             Model.Transfer_PunchlistFrom newTransferFrom = new Model.Transfer_PunchlistFrom()
             {
-                Id= Guid.NewGuid().ToString(),
-                Num_NO = maxNumNO.ToString("0000"),
-                ProjectId=this.ProjectId,
+                Id = Guid.NewGuid().ToString(),
+                Num_NO = this.txtNum_NO.Text.Trim(),
+                ProjectId = this.ProjectId,
                 System_No = this.txtSystem_No.Text.Trim(),
                 Sub_Sys_No = this.txtSub_Sys_No.Text.Trim(),
                 DESCRIPTION = this.txtDESCRIPTION.Text.Trim(),
@@ -158,20 +163,20 @@ namespace FineUIPro.Web.Transfer
                 Disc = this.txtDisc.Text.Trim(),
                 IsEng = this.ddlIsEng.SelectedValue == "Y" ? true : false,
                 IsMatI = this.ddlIsMatI.SelectedValue,
-                Punch_Type = this.txtPunch_Type.Text.Trim(),
-                Required_Date= Funs.GetNewDateTime(this.txtRequired_Date.Text),
-                Action_By= this.txtAction_By.Text.Trim(),
-                PIC= this.txtPIC.Text.Trim(),
-                PIC_WUH=this.txtPIC_WUH.Text.Trim(),
-                Correction_Action= this.txtCorrection_Action.Text.Trim(),
+                Punch_Type = this.txtPunch_Type.SelectedValue,
+                Required_Date = Funs.GetNewDateTime(this.txtRequired_Date.Text),
+                Action_By = this.txtAction_By.Text.Trim(),
+                PIC = this.txtPIC.Text.Trim(),
+                PIC_WUH = this.txtPIC_WUH.Text.Trim(),
+                Correction_Action = this.txtCorrection_Action.Text.Trim(),
                 Actual_Date = Funs.GetNewDateTime(this.txtActual_Date.Text),
-                Cleared_By= this.txtCleared_By.Text.Trim(),
+                Cleared_By = this.txtCleared_By.Text.Trim(),
                 Cleared_Date = Funs.GetNewDateTime(this.txtCleared_Date.Text),
-                Confirmed_By= this.txtConfirmed_By.Text.Trim(),
+                Confirmed_By = this.txtConfirmed_By.Text.Trim(),
                 Confirmed_Date = Funs.GetNewDateTime(this.txtConfirmed_Date.Text),
-                Verified_By= this.txtVerified_By.Text.Trim(),
+                Verified_By = this.txtVerified_By.Text.Trim(),
                 Verified_Date = Funs.GetNewDateTime(this.txtVerified_Date.Text),
-                Remark= this.txtRemark.Text.Trim()
+                Remark = this.txtRemark.Text.Trim()
             };
 
             if (newTransferFrom.Cleared_Date == null && newTransferFrom.Confirmed_Date == null && newTransferFrom.Verified_Date == null)
@@ -184,11 +189,24 @@ namespace FineUIPro.Web.Transfer
             var TransferPunchlistFrom = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(p => p.Id == this.Id);
             if (TransferPunchlistFrom == null)
             {
+                if (Funs.DB.Transfer_PunchlistFrom.Where(p => p.ProjectId == this.ProjectId && p.Num_NO == newTransferFrom.Num_NO).Count() > 0)
+                {
+                    ShowNotify("录入的NO.重复了，不能保存", MessageBoxIcon.Warning);
+                    return reutState;
+                }
+
                 Funs.DB.Transfer_PunchlistFrom.InsertOnSubmit(newTransferFrom);
-                this.Id = newTransferFrom.Id;                
+                this.Id = newTransferFrom.Id;
             }
-            else 
+            else
             {
+                if (Funs.DB.Transfer_PunchlistFrom.Where(p => p.ProjectId == this.ProjectId && p.Num_NO == newTransferFrom.Num_NO && p.Id != TransferPunchlistFrom.Id).Count() > 0)
+                {
+                    ShowNotify("录入的NO.重复了，不能保存", MessageBoxIcon.Warning);
+                    return reutState;
+                }
+
+                TransferPunchlistFrom.Num_NO = newTransferFrom.Num_NO;
                 TransferPunchlistFrom.System_No = newTransferFrom.System_No;
                 TransferPunchlistFrom.Sub_Sys_No = newTransferFrom.Sub_Sys_No;
                 TransferPunchlistFrom.DESCRIPTION = newTransferFrom.DESCRIPTION;
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs
index ef019b0c..dd9a5818 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx.designer.cs
@@ -41,6 +41,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
 
+        /// <summary>
+        /// txtNum_NO 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtNum_NO;
+
         /// <summary>
         /// txtSystem_No 控件。
         /// </summary>
@@ -120,7 +129,7 @@ namespace FineUIPro.Web.Transfer
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtPunch_Type;
+        protected global::FineUIPro.DropDownList txtPunch_Type;
 
         /// <summary>
         /// txtRequired_Date 控件。
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 486cdd53..3d461a97 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -2537,6 +2537,12 @@ namespace Model
     partial void InsertTransfer_StaticEquipment(Transfer_StaticEquipment instance);
     partial void UpdateTransfer_StaticEquipment(Transfer_StaticEquipment instance);
     partial void DeleteTransfer_StaticEquipment(Transfer_StaticEquipment instance);
+    partial void InsertTransfer_SystemControl(Transfer_SystemControl instance);
+    partial void UpdateTransfer_SystemControl(Transfer_SystemControl instance);
+    partial void DeleteTransfer_SystemControl(Transfer_SystemControl instance);
+    partial void InsertTransfer_SystemStatusRemarks(Transfer_SystemStatusRemarks instance);
+    partial void UpdateTransfer_SystemStatusRemarks(Transfer_SystemStatusRemarks instance);
+    partial void DeleteTransfer_SystemStatusRemarks(Transfer_SystemStatusRemarks instance);
     partial void InsertTransfer_Telecom(Transfer_Telecom instance);
     partial void UpdateTransfer_Telecom(Transfer_Telecom instance);
     partial void DeleteTransfer_Telecom(Transfer_Telecom instance);
@@ -9429,6 +9435,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Transfer_SystemControl> Transfer_SystemControl
+		{
+			get
+			{
+				return this.GetTable<Transfer_SystemControl>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Transfer_SystemStatusRemarks> Transfer_SystemStatusRemarks
+		{
+			get
+			{
+				return this.GetTable<Transfer_SystemStatusRemarks>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Transfer_Telecom> Transfer_Telecom
 		{
 			get
@@ -62027,8 +62049,6 @@ namespace Model
 		
 		private EntityRef<Base_Project> _Base_Project;
 		
-		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -62080,7 +62100,6 @@ namespace Model
 		public Check_CheckSpecial()
 		{
 			this._Base_Project = default(EntityRef<Base_Project>);
-			this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
 			OnCreated();
 		}
 		
@@ -62399,10 +62418,6 @@ namespace Model
 			{
 				if ((this._CheckItemSetId != value))
 				{
-					if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
 					this.OnCheckItemSetIdChanging(value);
 					this.SendPropertyChanging();
 					this._CheckItemSetId = value;
@@ -62546,40 +62561,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)]
-		public Technique_CheckItemSet Technique_CheckItemSet
-		{
-			get
-			{
-				return this._Technique_CheckItemSet.Entity;
-			}
-			set
-			{
-				Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity;
-				if (((previousValue != value) 
-							|| (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false)))
-				{
-					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._Technique_CheckItemSet.Entity = null;
-						previousValue.Check_CheckSpecial.Remove(this);
-					}
-					this._Technique_CheckItemSet.Entity = value;
-					if ((value != null))
-					{
-						value.Check_CheckSpecial.Add(this);
-						this._CheckItemSetId = value.CheckItemSetId;
-					}
-					else
-					{
-						this._CheckItemSetId = default(string);
-					}
-					this.SendPropertyChanged("Technique_CheckItemSet");
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -370540,8 +370521,6 @@ namespace Model
 		
 		private System.Nullable<bool> _IsBuiltIn;
 		
-		private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
-		
 		private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
 		
     #region 可扩展性方法定义
@@ -370568,7 +370547,6 @@ namespace Model
 		
 		public Technique_CheckItemSet()
 		{
-			this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
 			this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(this.detach_Technique_CheckItemDetail));
 			OnCreated();
 		}
@@ -370733,19 +370711,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
-		public EntitySet<Check_CheckSpecial> Check_CheckSpecial
-		{
-			get
-			{
-				return this._Check_CheckSpecial;
-			}
-			set
-			{
-				this._Check_CheckSpecial.Assign(value);
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
 		public EntitySet<Technique_CheckItemDetail> Technique_CheckItemDetail
 		{
@@ -370779,18 +370744,6 @@ namespace Model
 			}
 		}
 		
-		private void attach_Check_CheckSpecial(Check_CheckSpecial entity)
-		{
-			this.SendPropertyChanging();
-			entity.Technique_CheckItemSet = this;
-		}
-		
-		private void detach_Check_CheckSpecial(Check_CheckSpecial entity)
-		{
-			this.SendPropertyChanging();
-			entity.Technique_CheckItemSet = null;
-		}
-		
 		private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity)
 		{
 			this.SendPropertyChanging();
@@ -392684,6 +392637,8 @@ namespace Model
 		
 		private string _SystemNo;
 		
+		private System.Nullable<System.DateTime> _UpdateTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -392716,6 +392671,8 @@ namespace Model
     partial void OnDescribeChanged();
     partial void OnSystemNoChanging(string value);
     partial void OnSystemNoChanged();
+    partial void OnUpdateTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnUpdateTimeChanged();
     #endregion
 		
 		public Transfer_LHCSystemList()
@@ -393003,6 +392960,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpdateTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> UpdateTime
+		{
+			get
+			{
+				return this._UpdateTime;
+			}
+			set
+			{
+				if ((this._UpdateTime != value))
+				{
+					this.OnUpdateTimeChanging(value);
+					this.SendPropertyChanging();
+					this._UpdateTime = value;
+					this.SendPropertyChanged("UpdateTime");
+					this.OnUpdateTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -394376,12 +394353,8 @@ namespace Model
 		
 		private string _Comments;
 		
-		private string _Num_NO;
-		
 		private string _System_No;
 		
-		private string _Sub_Sys_No;
-		
 		private string _Cat;
 		
 		private string _Raised_By;
@@ -394402,8 +394375,6 @@ namespace Model
 		
 		private string _PIC_WUH;
 		
-		private string _Correction_Action;
-		
 		private System.Nullable<System.DateTime> _Actual_Date;
 		
 		private string _Cleared_By;
@@ -394422,6 +394393,12 @@ namespace Model
 		
 		private string _Remark;
 		
+		private string _Sub_Sys_No;
+		
+		private string _Num_NO;
+		
+		private string _Correction_Action;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -394458,12 +394435,8 @@ namespace Model
     partial void OnPUNCH_ITEM_STATUSChanged();
     partial void OnCommentsChanging(string value);
     partial void OnCommentsChanged();
-    partial void OnNum_NOChanging(string value);
-    partial void OnNum_NOChanged();
     partial void OnSystem_NoChanging(string value);
     partial void OnSystem_NoChanged();
-    partial void OnSub_Sys_NoChanging(string value);
-    partial void OnSub_Sys_NoChanged();
     partial void OnCatChanging(string value);
     partial void OnCatChanged();
     partial void OnRaised_ByChanging(string value);
@@ -394484,8 +394457,6 @@ namespace Model
     partial void OnPICChanged();
     partial void OnPIC_WUHChanging(string value);
     partial void OnPIC_WUHChanged();
-    partial void OnCorrection_ActionChanging(string value);
-    partial void OnCorrection_ActionChanged();
     partial void OnActual_DateChanging(System.Nullable<System.DateTime> value);
     partial void OnActual_DateChanged();
     partial void OnCleared_ByChanging(string value);
@@ -394504,6 +394475,12 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
+    partial void OnSub_Sys_NoChanging(string value);
+    partial void OnSub_Sys_NoChanged();
+    partial void OnNum_NOChanging(string value);
+    partial void OnNum_NOChanged();
+    partial void OnCorrection_ActionChanging(string value);
+    partial void OnCorrection_ActionChanged();
     #endregion
 		
 		public Transfer_PunchlistFrom()
@@ -394831,26 +394808,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")]
-		public string Num_NO
-		{
-			get
-			{
-				return this._Num_NO;
-			}
-			set
-			{
-				if ((this._Num_NO != value))
-				{
-					this.OnNum_NOChanging(value);
-					this.SendPropertyChanging();
-					this._Num_NO = value;
-					this.SendPropertyChanged("Num_NO");
-					this.OnNum_NOChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")]
 		public string System_No
 		{
@@ -394871,26 +394828,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
-		public string Sub_Sys_No
-		{
-			get
-			{
-				return this._Sub_Sys_No;
-			}
-			set
-			{
-				if ((this._Sub_Sys_No != value))
-				{
-					this.OnSub_Sys_NoChanging(value);
-					this.SendPropertyChanging();
-					this._Sub_Sys_No = value;
-					this.SendPropertyChanged("Sub_Sys_No");
-					this.OnSub_Sys_NoChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")]
 		public string Cat
 		{
@@ -395091,26 +395028,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
-		public string Correction_Action
-		{
-			get
-			{
-				return this._Correction_Action;
-			}
-			set
-			{
-				if ((this._Correction_Action != value))
-				{
-					this.OnCorrection_ActionChanging(value);
-					this.SendPropertyChanging();
-					this._Correction_Action = value;
-					this.SendPropertyChanged("Correction_Action");
-					this.OnCorrection_ActionChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")]
 		public System.Nullable<System.DateTime> Actual_Date
 		{
@@ -395291,6 +395208,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
+		public string Sub_Sys_No
+		{
+			get
+			{
+				return this._Sub_Sys_No;
+			}
+			set
+			{
+				if ((this._Sub_Sys_No != value))
+				{
+					this.OnSub_Sys_NoChanging(value);
+					this.SendPropertyChanging();
+					this._Sub_Sys_No = value;
+					this.SendPropertyChanged("Sub_Sys_No");
+					this.OnSub_Sys_NoChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")]
+		public string Num_NO
+		{
+			get
+			{
+				return this._Num_NO;
+			}
+			set
+			{
+				if ((this._Num_NO != value))
+				{
+					this.OnNum_NOChanging(value);
+					this.SendPropertyChanging();
+					this._Num_NO = value;
+					this.SendPropertyChanged("Num_NO");
+					this.OnNum_NOChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
+		public string Correction_Action
+		{
+			get
+			{
+				return this._Correction_Action;
+			}
+			set
+			{
+				if ((this._Correction_Action != value))
+				{
+					this.OnCorrection_ActionChanging(value);
+					this.SendPropertyChanging();
+					this._Correction_Action = value;
+					this.SendPropertyChanged("Correction_Action");
+					this.OnCorrection_ActionChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -396012,6 +395989,562 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_SystemControl")]
+	public partial class Transfer_SystemControl : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _SystemNo;
+		
+		private System.Nullable<System.DateTime> _PlanPWD;
+		
+		private System.Nullable<System.DateTime> _PlanJWD;
+		
+		private System.Nullable<System.DateTime> _McPlan;
+		
+		private string _SubmitPackage;
+		
+		private System.Nullable<System.DateTime> _ActualPWD;
+		
+		private System.Nullable<System.DateTime> _ActualJWD;
+		
+		private System.Nullable<System.DateTime> _ActualMC;
+		
+		private string _Commissioning;
+		
+		private string _IaQian;
+		
+		private string _TcccQ;
+		
+		private string _SystemStatus;
+		
+		private string _TurnoverDescription;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnSystemNoChanging(string value);
+    partial void OnSystemNoChanged();
+    partial void OnPlanPWDChanging(System.Nullable<System.DateTime> value);
+    partial void OnPlanPWDChanged();
+    partial void OnPlanJWDChanging(System.Nullable<System.DateTime> value);
+    partial void OnPlanJWDChanged();
+    partial void OnMcPlanChanging(System.Nullable<System.DateTime> value);
+    partial void OnMcPlanChanged();
+    partial void OnSubmitPackageChanging(string value);
+    partial void OnSubmitPackageChanged();
+    partial void OnActualPWDChanging(System.Nullable<System.DateTime> value);
+    partial void OnActualPWDChanged();
+    partial void OnActualJWDChanging(System.Nullable<System.DateTime> value);
+    partial void OnActualJWDChanged();
+    partial void OnActualMCChanging(System.Nullable<System.DateTime> value);
+    partial void OnActualMCChanged();
+    partial void OnCommissioningChanging(string value);
+    partial void OnCommissioningChanged();
+    partial void OnIaQianChanging(string value);
+    partial void OnIaQianChanged();
+    partial void OnTcccQChanging(string value);
+    partial void OnTcccQChanged();
+    partial void OnSystemStatusChanging(string value);
+    partial void OnSystemStatusChanged();
+    partial void OnTurnoverDescriptionChanging(string value);
+    partial void OnTurnoverDescriptionChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Transfer_SystemControl()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemNo", DbType="NVarChar(50)")]
+		public string SystemNo
+		{
+			get
+			{
+				return this._SystemNo;
+			}
+			set
+			{
+				if ((this._SystemNo != value))
+				{
+					this.OnSystemNoChanging(value);
+					this.SendPropertyChanging();
+					this._SystemNo = value;
+					this.SendPropertyChanged("SystemNo");
+					this.OnSystemNoChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanPWD", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PlanPWD
+		{
+			get
+			{
+				return this._PlanPWD;
+			}
+			set
+			{
+				if ((this._PlanPWD != value))
+				{
+					this.OnPlanPWDChanging(value);
+					this.SendPropertyChanging();
+					this._PlanPWD = value;
+					this.SendPropertyChanged("PlanPWD");
+					this.OnPlanPWDChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanJWD", DbType="DateTime")]
+		public System.Nullable<System.DateTime> PlanJWD
+		{
+			get
+			{
+				return this._PlanJWD;
+			}
+			set
+			{
+				if ((this._PlanJWD != value))
+				{
+					this.OnPlanJWDChanging(value);
+					this.SendPropertyChanging();
+					this._PlanJWD = value;
+					this.SendPropertyChanged("PlanJWD");
+					this.OnPlanJWDChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_McPlan", DbType="DateTime")]
+		public System.Nullable<System.DateTime> McPlan
+		{
+			get
+			{
+				return this._McPlan;
+			}
+			set
+			{
+				if ((this._McPlan != value))
+				{
+					this.OnMcPlanChanging(value);
+					this.SendPropertyChanging();
+					this._McPlan = value;
+					this.SendPropertyChanged("McPlan");
+					this.OnMcPlanChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubmitPackage", DbType="NVarChar(200)")]
+		public string SubmitPackage
+		{
+			get
+			{
+				return this._SubmitPackage;
+			}
+			set
+			{
+				if ((this._SubmitPackage != value))
+				{
+					this.OnSubmitPackageChanging(value);
+					this.SendPropertyChanging();
+					this._SubmitPackage = value;
+					this.SendPropertyChanged("SubmitPackage");
+					this.OnSubmitPackageChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualPWD", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ActualPWD
+		{
+			get
+			{
+				return this._ActualPWD;
+			}
+			set
+			{
+				if ((this._ActualPWD != value))
+				{
+					this.OnActualPWDChanging(value);
+					this.SendPropertyChanging();
+					this._ActualPWD = value;
+					this.SendPropertyChanged("ActualPWD");
+					this.OnActualPWDChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualJWD", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ActualJWD
+		{
+			get
+			{
+				return this._ActualJWD;
+			}
+			set
+			{
+				if ((this._ActualJWD != value))
+				{
+					this.OnActualJWDChanging(value);
+					this.SendPropertyChanging();
+					this._ActualJWD = value;
+					this.SendPropertyChanged("ActualJWD");
+					this.OnActualJWDChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualMC", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ActualMC
+		{
+			get
+			{
+				return this._ActualMC;
+			}
+			set
+			{
+				if ((this._ActualMC != value))
+				{
+					this.OnActualMCChanging(value);
+					this.SendPropertyChanging();
+					this._ActualMC = value;
+					this.SendPropertyChanged("ActualMC");
+					this.OnActualMCChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Commissioning", DbType="NVarChar(200)")]
+		public string Commissioning
+		{
+			get
+			{
+				return this._Commissioning;
+			}
+			set
+			{
+				if ((this._Commissioning != value))
+				{
+					this.OnCommissioningChanging(value);
+					this.SendPropertyChanging();
+					this._Commissioning = value;
+					this.SendPropertyChanged("Commissioning");
+					this.OnCommissioningChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IaQian", DbType="NVarChar(200)")]
+		public string IaQian
+		{
+			get
+			{
+				return this._IaQian;
+			}
+			set
+			{
+				if ((this._IaQian != value))
+				{
+					this.OnIaQianChanging(value);
+					this.SendPropertyChanging();
+					this._IaQian = value;
+					this.SendPropertyChanged("IaQian");
+					this.OnIaQianChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TcccQ", DbType="NVarChar(200)")]
+		public string TcccQ
+		{
+			get
+			{
+				return this._TcccQ;
+			}
+			set
+			{
+				if ((this._TcccQ != value))
+				{
+					this.OnTcccQChanging(value);
+					this.SendPropertyChanging();
+					this._TcccQ = value;
+					this.SendPropertyChanged("TcccQ");
+					this.OnTcccQChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemStatus", DbType="NVarChar(20)")]
+		public string SystemStatus
+		{
+			get
+			{
+				return this._SystemStatus;
+			}
+			set
+			{
+				if ((this._SystemStatus != value))
+				{
+					this.OnSystemStatusChanging(value);
+					this.SendPropertyChanging();
+					this._SystemStatus = value;
+					this.SendPropertyChanged("SystemStatus");
+					this.OnSystemStatusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TurnoverDescription", DbType="NVarChar(50)")]
+		public string TurnoverDescription
+		{
+			get
+			{
+				return this._TurnoverDescription;
+			}
+			set
+			{
+				if ((this._TurnoverDescription != value))
+				{
+					this.OnTurnoverDescriptionChanging(value);
+					this.SendPropertyChanging();
+					this._TurnoverDescription = value;
+					this.SendPropertyChanged("TurnoverDescription");
+					this.OnTurnoverDescriptionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_SystemStatusRemarks")]
+	public partial class Transfer_SystemStatusRemarks : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _TypeName;
+		
+		private string _Remarks;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnTypeNameChanging(string value);
+    partial void OnTypeNameChanged();
+    partial void OnRemarksChanging(string value);
+    partial void OnRemarksChanged();
+    #endregion
+		
+		public Transfer_SystemStatusRemarks()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeName", DbType="NVarChar(50)")]
+		public string TypeName
+		{
+			get
+			{
+				return this._TypeName;
+			}
+			set
+			{
+				if ((this._TypeName != value))
+				{
+					this.OnTypeNameChanging(value);
+					this.SendPropertyChanging();
+					this._TypeName = value;
+					this.SendPropertyChanged("TypeName");
+					this.OnTypeNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(600)")]
+		public string Remarks
+		{
+			get
+			{
+				return this._Remarks;
+			}
+			set
+			{
+				if ((this._Remarks != value))
+				{
+					this.OnRemarksChanging(value);
+					this.SendPropertyChanging();
+					this._Remarks = value;
+					this.SendPropertyChanged("Remarks");
+					this.OnRemarksChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_Telecom")]
 	public partial class Transfer_Telecom : INotifyPropertyChanging, INotifyPropertyChanged
 	{