From b308165d8c05f94fd270597d6d188e046c9d1306 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Wed, 31 Jul 2024 17:38:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  48 +++++
 SGGL/FineUIPro.Web/Transfer/Electrical.aspx   |  11 +-
 .../FineUIPro.Web/Transfer/Electrical.aspx.cs |  14 ++
 .../Transfer/Electrical.aspx.designer.cs      |  27 +++
 .../Transfer/ElectricalEdit.aspx              |  92 ++++++++
 .../Transfer/ElectricalEdit.aspx.cs           | 133 ++++++++++++
 .../Transfer/ElectricalEdit.aspx.designer.cs  | 143 +++++++++++++
 .../Transfer/Instrumentation.aspx             |  11 +-
 .../Transfer/Instrumentation.aspx.cs          |  13 ++
 .../Transfer/Instrumentation.aspx.designer.cs |  27 +++
 .../Transfer/InstrumentationEdit.aspx         |  99 +++++++++
 .../Transfer/InstrumentationEdit.aspx.cs      | 137 ++++++++++++
 .../InstrumentationEdit.aspx.designer.cs      | 152 ++++++++++++++
 .../FineUIPro.Web/Transfer/LHCSystemList.aspx |   7 +
 .../Transfer/LHCSystemList.aspx.cs            |  36 ++--
 .../Transfer/LHCSystemList.aspx.designer.cs   |  18 ++
 .../Transfer/LHCSystemListEdit.aspx           |  94 +++++++++
 .../Transfer/LHCSystemListEdit.aspx.cs        | 149 +++++++++++++
 .../LHCSystemListEdit.aspx.designer.cs        | 170 +++++++++++++++
 SGGL/FineUIPro.Web/Transfer/Piping.aspx       |  12 +-
 SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs    |   8 +-
 .../Transfer/Piping.aspx.designer.cs          |  18 ++
 SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx   | 145 +++++++++++++
 .../FineUIPro.Web/Transfer/PipingEdit.aspx.cs | 151 ++++++++++++++
 .../Transfer/PipingEdit.aspx.designer.cs      | 197 ++++++++++++++++++
 .../Transfer/RotatingEquipment.aspx           |  10 +-
 .../Transfer/RotatingEquipment.aspx.cs        |   8 +-
 .../RotatingEquipment.aspx.designer.cs        |  18 ++
 .../Transfer/RotatingEquipmentEdit.aspx       |  85 ++++++++
 .../Transfer/RotatingEquipmentEdit.aspx.cs    | 127 +++++++++++
 .../RotatingEquipmentEdit.aspx.designer.cs    | 134 ++++++++++++
 .../Transfer/StaticEquipment.aspx             |   8 +-
 .../Transfer/StaticEquipment.aspx.cs          |   8 +-
 .../Transfer/StaticEquipment.aspx.designer.cs |  18 ++
 .../Transfer/StaticEquipmentEdit.aspx         |  85 ++++++++
 .../Transfer/StaticEquipmentEdit.aspx.cs      | 128 ++++++++++++
 .../StaticEquipmentEdit.aspx.designer.cs      | 134 ++++++++++++
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 38 files changed, 2646 insertions(+), 31 deletions(-)
 create mode 100644 SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.designer.cs

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index a8e3d530..cac89b50 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2033,16 +2033,20 @@
     <Content Include="Transfer\CivilStructureDataIn.aspx" />
     <Content Include="Transfer\Electrical.aspx" />
     <Content Include="Transfer\ElectricalDataIn.aspx" />
+    <Content Include="Transfer\ElectricalEdit.aspx" />
     <Content Include="Transfer\Firefighting.aspx" />
     <Content Include="Transfer\FirefightingDataIn.aspx" />
     <Content Include="Transfer\HVAC.aspx" />
     <Content Include="Transfer\HVACDataIn.aspx" />
     <Content Include="Transfer\Instrumentation.aspx" />
     <Content Include="Transfer\InstrumentationDataIn.aspx" />
+    <Content Include="Transfer\InstrumentationEdit.aspx" />
     <Content Include="Transfer\LHCSystemList.aspx" />
     <Content Include="Transfer\LHCSystemListDataIn.aspx" />
+    <Content Include="Transfer\LHCSystemListEdit.aspx" />
     <Content Include="Transfer\Piping.aspx" />
     <Content Include="Transfer\PipingDataIn.aspx" />
+    <Content Include="Transfer\PipingEdit.aspx" />
     <Content Include="Transfer\Plumbing.aspx" />
     <Content Include="Transfer\PlumbingDataIn.aspx" />
     <Content Include="Transfer\ProjectSetup.aspx" />
@@ -2052,8 +2056,10 @@
     <Content Include="Transfer\PunchlistFromEdit.aspx" />
     <Content Include="Transfer\RotatingEquipment.aspx" />
     <Content Include="Transfer\RotatingEquipmentDataIn.aspx" />
+    <Content Include="Transfer\RotatingEquipmentEdit.aspx" />
     <Content Include="Transfer\StaticEquipment.aspx" />
     <Content Include="Transfer\StaticEquipmentDataIn.aspx" />
+    <Content Include="Transfer\StaticEquipmentEdit.aspx" />
     <Content Include="Transfer\Telecom.aspx" />
     <Content Include="Transfer\TelecomDataIn.aspx" />
     <Content Include="Video\Video.aspx" />
@@ -17679,6 +17685,13 @@
     <Compile Include="Transfer\ElectricalDataIn.aspx.designer.cs">
       <DependentUpon>ElectricalDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\ElectricalEdit.aspx.cs">
+      <DependentUpon>ElectricalEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\ElectricalEdit.aspx.designer.cs">
+      <DependentUpon>ElectricalEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\Firefighting.aspx.cs">
       <DependentUpon>Firefighting.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17721,6 +17734,13 @@
     <Compile Include="Transfer\InstrumentationDataIn.aspx.designer.cs">
       <DependentUpon>InstrumentationDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\InstrumentationEdit.aspx.cs">
+      <DependentUpon>InstrumentationEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\InstrumentationEdit.aspx.designer.cs">
+      <DependentUpon>InstrumentationEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\LHCSystemList.aspx.cs">
       <DependentUpon>LHCSystemList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17735,6 +17755,13 @@
     <Compile Include="Transfer\LHCSystemListDataIn.aspx.designer.cs">
       <DependentUpon>LHCSystemListDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\LHCSystemListEdit.aspx.cs">
+      <DependentUpon>LHCSystemListEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\LHCSystemListEdit.aspx.designer.cs">
+      <DependentUpon>LHCSystemListEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\Piping.aspx.cs">
       <DependentUpon>Piping.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17749,6 +17776,13 @@
     <Compile Include="Transfer\PipingDataIn.aspx.designer.cs">
       <DependentUpon>PipingDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\PipingEdit.aspx.cs">
+      <DependentUpon>PipingEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\PipingEdit.aspx.designer.cs">
+      <DependentUpon>PipingEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\Plumbing.aspx.cs">
       <DependentUpon>Plumbing.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17812,6 +17846,13 @@
     <Compile Include="Transfer\RotatingEquipmentDataIn.aspx.designer.cs">
       <DependentUpon>RotatingEquipmentDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\RotatingEquipmentEdit.aspx.cs">
+      <DependentUpon>RotatingEquipmentEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipmentEdit.aspx.designer.cs">
+      <DependentUpon>RotatingEquipmentEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\StaticEquipment.aspx.cs">
       <DependentUpon>StaticEquipment.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17826,6 +17867,13 @@
     <Compile Include="Transfer\StaticEquipmentDataIn.aspx.designer.cs">
       <DependentUpon>StaticEquipmentDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\StaticEquipmentEdit.aspx.cs">
+      <DependentUpon>StaticEquipmentEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipmentEdit.aspx.designer.cs">
+      <DependentUpon>StaticEquipmentEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\Telecom.aspx.cs">
       <DependentUpon>Telecom.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
index 6339062c..04dd395f 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
@@ -45,7 +45,8 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-
+                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>--%>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@@ -109,12 +110,20 @@
                 </f:Grid>
             </Items>
         </f:Panel>
+         <f:Window ID="Window1" Title="Electrical" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </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:Menu ID="Menu1" runat="server">
             <Items>
+                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
index 6851b722..0b2907d6 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
@@ -22,9 +22,23 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("ElectricalEdit.aspx") + "return false;";
             }
         }
 
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ElectricalEdit.aspx?Id={0}", id, "编辑 - ")));
+        }
+
+
         /// <summary>
         /// 数据绑定
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
index fe7892fc..7f87aba8 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -122,6 +131,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -140,6 +158,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx
new file mode 100644
index 00000000..684b0d2c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx
@@ -0,0 +1,92 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ElectricalEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.ElectricalEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtELECTRICAL" runat="server" Label="Tag No" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSystemName" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTest_Package" runat="server" Label="Turn over Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></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:DropDownList ID="ddlCommunicationtest" runat="server" Label="Communication test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlLoopTest" runat="server" Label="Loop Test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/ElectricalEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
new file mode 100644
index 00000000..f542d9d6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
@@ -0,0 +1,133 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class ElectricalEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtELECTRICAL.Text = model.ELECTRICAL;
+                        txtSystemName.Text = model.SystemName;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTest_Package.Text = model.Test_Package;
+                        ddlInstallation.SelectedValue = model.Installation;
+                        ddlCommunicationtest.SelectedValue = model.Communicationtest;
+                        ddlCableLaying.SelectedValue = model.CableLaying;
+                        ddlLoopTest.SelectedValue = model.LoopTest;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_Electrical
+            {
+                ProjectId = ProjectId,
+                ELECTRICAL = txtELECTRICAL.Text,
+                SystemName = txtSystemName.Text,
+                Subsystem = txtSubsystem.Text,
+                Test_Package = txtTest_Package.Text,
+                Installation = ddlInstallation.SelectedValue,
+                Communicationtest = ddlCommunicationtest.SelectedValue,
+                CableLaying = ddlCableLaying.SelectedValue,
+                LoopTest = ddlLoopTest.SelectedValue,
+
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.Installation);
+            listObj.Add(model.Communicationtest);
+            listObj.Add(model.CableLaying);
+            listObj.Add(model.LoopTest);
+
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
+            {
+                model.FINAL_Status = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+            {
+                model.FINAL_Status = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.FINAL_Status = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.ELECTRICAL = txtELECTRICAL.Text;
+                    newModel.SystemName = txtSystemName.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.Test_Package = txtTest_Package.Text;
+                    newModel.Installation = ddlInstallation.SelectedValue;
+                    newModel.Communicationtest = ddlCommunicationtest.SelectedValue;
+                    newModel.CableLaying = ddlCommunicationtest.SelectedValue;
+                    newModel.LoopTest = ddlLoopTest.SelectedValue;
+                    newModel.FINAL_Status = model.FINAL_Status;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_Electrical.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.designer.cs
new file mode 100644
index 00000000..3c4a7f29
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.designer.cs
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class ElectricalEdit
+    {
+
+        /// <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>
+        /// txtELECTRICAL 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtELECTRICAL;
+
+        /// <summary>
+        /// txtSystemName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystemName;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTest_Package 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTest_Package;
+
+        /// <summary>
+        /// ddlInstallation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInstallation;
+
+        /// <summary>
+        /// ddlCommunicationtest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCommunicationtest;
+
+        /// <summary>
+        /// ddlCableLaying 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCableLaying;
+
+        /// <summary>
+        /// ddlLoopTest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlLoopTest;
+
+        /// <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/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
index 6d42864e..515c0198 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
@@ -26,7 +26,7 @@
 
                                 <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status"  LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -45,7 +45,8 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>--%>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@@ -113,12 +114,18 @@
                 </f:Grid>
             </Items>
         </f:Panel>
+        <f:Window ID="Window1" Title="Instrumentation" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </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:Menu ID="Menu1" runat="server">
             <Items>
+                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
index b937b0ec..562cb686 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
@@ -22,9 +22,22 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("InstrumentationEdit.aspx") + "return false;";
             }
         }
 
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InstrumentationEdit.aspx?Id={0}", id, "编辑 - ")));
+        }
+
         /// <summary>
         /// 数据绑定
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
index a7420b4b..94838967 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -122,6 +131,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -140,6 +158,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
new file mode 100644
index 00000000..b24ef35e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
@@ -0,0 +1,99 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InstrumentationEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.InstrumentationEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtINSTRUMENTATION" runat="server" Label="Tag No" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSystemName" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTest_Package" runat="server" Label="Turn over Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation&Calibration" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlPipingPressuretest" runat="server" Label="Piping Pressure test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlPipingLeak" runat="server" Label="Piping Leak/Vacuum Test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlPipingBlowing" runat="server" Label="Piping Blowing" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlLooptest" runat="server" Label="Loop test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
new file mode 100644
index 00000000..f9ff83df
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
@@ -0,0 +1,137 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class InstrumentationEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtINSTRUMENTATION.Text = model.INSTRUMENTATION;
+                        txtSystemName.Text = model.SystemName;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTest_Package.Text = model.Test_Package;
+                        ddlInstallationCalibration.SelectedValue = model.InstallationCalibration;
+                        ddlPipingPressuretest.SelectedValue = model.PipingPressuretest;
+                        ddlPipingLeak.SelectedValue = model.PipingLeak;
+                        ddlPipingBlowing.SelectedValue = model.PipingBlowing;
+                        ddlLooptest.SelectedValue = model.Looptest;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_Instrumentation
+            {
+                ProjectId = ProjectId,
+                INSTRUMENTATION = txtINSTRUMENTATION.Text,
+                SystemName = txtSystemName.Text,
+                Subsystem = txtSubsystem.Text,
+                Test_Package = txtTest_Package.Text,
+                InstallationCalibration = ddlInstallationCalibration.SelectedValue,
+                PipingPressuretest = ddlPipingPressuretest.SelectedValue,
+                PipingLeak = ddlPipingLeak.SelectedValue,
+                PipingBlowing = ddlPipingBlowing.SelectedValue,
+                Looptest= ddlLooptest.SelectedValue
+
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.InstallationCalibration);
+            listObj.Add(model.PipingPressuretest);
+            listObj.Add(model.PipingLeak);
+            listObj.Add(model.PipingBlowing);
+            listObj.Add(model.Looptest);
+
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
+            {
+                model.FINAL_Status = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
+            {
+                model.FINAL_Status = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.FINAL_Status = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.INSTRUMENTATION = txtINSTRUMENTATION.Text;
+                    newModel.SystemName = txtSystemName.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.Test_Package = txtTest_Package.Text;
+                    newModel.InstallationCalibration = ddlInstallationCalibration.SelectedValue;
+                    newModel.PipingPressuretest = ddlPipingPressuretest.SelectedValue;
+                    newModel.PipingLeak = ddlPipingLeak.SelectedValue;
+                    newModel.PipingBlowing = ddlPipingBlowing.SelectedValue;
+                    newModel.Looptest = ddlLooptest.SelectedValue;
+                    newModel.FINAL_Status = model.FINAL_Status;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_Instrumentation.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
new file mode 100644
index 00000000..48a8dbf7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
@@ -0,0 +1,152 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class InstrumentationEdit
+    {
+
+        /// <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>
+        /// txtINSTRUMENTATION 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtINSTRUMENTATION;
+
+        /// <summary>
+        /// txtSystemName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystemName;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTest_Package 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTest_Package;
+
+        /// <summary>
+        /// ddlInstallationCalibration 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInstallationCalibration;
+
+        /// <summary>
+        /// ddlPipingPressuretest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPipingPressuretest;
+
+        /// <summary>
+        /// ddlPipingLeak 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPipingLeak;
+
+        /// <summary>
+        /// ddlPipingBlowing 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPipingBlowing;
+
+        /// <summary>
+        /// ddlLooptest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlLooptest;
+
+        /// <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 b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
index 9c8295af..7ac24cb0 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
@@ -39,6 +39,10 @@
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
+
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
                             </Items>
@@ -128,6 +132,9 @@
         </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>
+
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
index fe2bf1ab..7a8f8ea5 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
@@ -40,9 +40,30 @@ namespace FineUIPro.Web.Transfer
                 }
                 GetButtonPower();
                 BindGrid();
+
+                btnNew.OnClientClick = Window1.GetShowReference("LHCSystemListEdit.aspx?Type="+Type) + "return false;";
             }
         }
 
+        #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 id = Grid1.SelectedRowID;
+           
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LHCSystemListEdit.aspx?Id={0}&Type={1}", id,Type, "编辑 - ")));
+        }
+        #endregion
+
         /// <summary>
         /// 数据绑定
         /// </summary>
@@ -155,21 +176,6 @@ namespace FineUIPro.Web.Transfer
         #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;
-            }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx?InspectionEquipmentId={0}", Grid1.SelectedRowID, "编辑 - ")));
-        }
-
         /// <summary>
         /// Grid行双击事件
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs
index 2bb0bef2..e1eface1 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs
@@ -86,6 +86,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -149,6 +158,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx
new file mode 100644
index 00000000..4070fd32
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx
@@ -0,0 +1,94 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LHCSystemListEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.LHCSystemListEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox  ID="txtSN" NoDecimal="true" ShowTrigger="false" runat="server" Label="SN" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:NumberBox>
+                        <f:TextBox ID="txtSystem_No" runat="server" LabelWidth="180px" Label="系统号/System No." LabelAlign="Right" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                       
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                         <f:TextBox ID="txtCommissioningsystemcode" runat="server" Label="Commissioning system code"
+                            LabelWidth="180px" LabelAlign="Right" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                        <f:TextBox ID="txtCommissioningCodeDescription" runat="server" Label="Commissioning Code Description" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                        
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSubCommissioningsystem" runat="server" Label="Sub-system No"
+                            LabelWidth="180px" LabelAlign="Right" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                         <f:DatePicker runat="server" Label="Plan Start of Testing Date" LabelWidth="180px"
+                             ID="txtPlanStartofTestingDate" LabelAlign="Right" >
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+
+                 <f:FormRow ID="Type1" runat="server" Hidden="true"> 
+                    <Items>
+                        <f:TextArea ID="txtDescribe" runat="server" Label="试车代号描述" LabelAlign="Right" LabelWidth="180px"></f:TextArea>
+                     </Items>
+                 </f:FormRow>
+
+                 <f:FormRow>
+                    <Items>
+                        <f:DatePicker runat="server" Label="Plan Finish of Testing Date"
+                            ID="txtPlanFinishofTestingDate" LabelAlign="Right" LabelWidth="180px">
+                        </f:DatePicker>
+                        
+                         <f:DatePicker runat="server" Label="Actual Finished Date" 
+                             ID="txtActualFinishedDate" LabelAlign="Right" LabelWidth="180px" >
+                        </f:DatePicker>
+                        
+                       
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                         <f:DropDownList ID="ddlSStatus" runat="server" Label="Status" LabelWidth="180px">
+                            <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>
+                    </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/LHCSystemListEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.cs
new file mode 100644
index 00000000..4d39540a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.cs
@@ -0,0 +1,149 @@
+using BLL;
+using System;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class LHCSystemListEdit : PageBase
+    {
+
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        private string Type
+        {
+            get
+            {
+                return (string)ViewState["Type"];
+            }
+            set
+            {
+                ViewState["Type"] = value;
+            }
+        }
+        #endregion
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack) {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                Type= Request.Params["Type"];
+                if (Type == "1")
+                    Type1.Hidden = false;
+                else
+                    Type1.Hidden = true;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_LHCSystemList.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtSN.Text = model.SN.ToString();
+                        txtSystem_No.Text = model.SystemNo;
+                        txtCommissioningsystemcode.Text = model.Commissioningsystemcode;
+                        txtCommissioningCodeDescription.Text = model.CommissioningCodeDescription;
+                        txtSubCommissioningsystem.Text = model.SubCommissioningsystem;
+                        if (model.PlanStartofTestingDate != null)
+                        {
+                            txtPlanStartofTestingDate.Text = Convert.ToDateTime(model.PlanStartofTestingDate).ToString("yyyy-MM-dd");
+                        }
+                        txtDescribe.Text = model.Describe;
+
+                        if (model.PlanFinishofTestingDate != null)
+                        {
+                            txtPlanFinishofTestingDate.Text = Convert.ToDateTime(model.PlanFinishofTestingDate).ToString("yyyy-MM-dd");
+                        }
+
+                        if (model.ActualFinishedDate != null)
+                        {
+                            txtActualFinishedDate.Text = Convert.ToDateTime(model.ActualFinishedDate).ToString("yyyy-MM-dd");
+                        }
+
+                        ddlSStatus.SelectedValue = model.Status;
+                    }
+                }
+                else {
+                    var model = Funs.DB.Transfer_LHCSystemList.OrderByDescending(x => x.SN).FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId
+                    && x.Type==Type);
+                    if (model == null)
+                        txtSN.Text = "1001";
+                    else
+                        txtSN.Text = (Convert.ToInt32(model.SN) + 1).ToString();
+                }
+                
+
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e) {
+            var model = new Model.Transfer_LHCSystemList() { 
+                ProjectId=ProjectId,
+                Type=Type,
+                SN=Convert.ToInt32(txtSN.Text),
+                SystemNo= txtSystem_No.Text,
+                Commissioningsystemcode= txtCommissioningsystemcode.Text,
+                CommissioningCodeDescription= txtCommissioningCodeDescription.Text,
+                SubCommissioningsystem= txtSubCommissioningsystem.Text,
+                PlanStartofTestingDate = Funs.GetNewDateTime(this.txtPlanStartofTestingDate.Text),
+                Describe=txtDescribe.Text,
+                PlanFinishofTestingDate = Funs.GetNewDateTime(this.txtPlanFinishofTestingDate.Text),
+                ActualFinishedDate = Funs.GetNewDateTime(this.txtActualFinishedDate.Text),
+                Status=ddlSStatus.SelectedValue
+            };
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_LHCSystemList.FirstOrDefault(x => x.Id == Id);
+                if (newModel!=null)
+                {
+                    newModel.SN = model.SN;
+                    newModel.SystemNo = model.SystemNo;
+                    newModel.Commissioningsystemcode = model.Commissioningsystemcode;
+                    newModel.CommissioningCodeDescription = model.CommissioningCodeDescription;
+                    newModel.SubCommissioningsystem = model.SubCommissioningsystem;
+                    newModel.PlanStartofTestingDate = model.PlanStartofTestingDate;
+                    newModel.Describe = model.Describe;
+                    newModel.PlanFinishofTestingDate = model.PlanFinishofTestingDate;
+                    newModel.ActualFinishedDate = model.ActualFinishedDate;
+                    newModel.Status = model.Status;
+                    newModel.UpdateTime = DateTime.Now;
+                }
+            }
+            else {
+                model.Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_LHCSystemList.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.designer.cs
new file mode 100644
index 00000000..115421a4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemListEdit.aspx.designer.cs
@@ -0,0 +1,170 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class LHCSystemListEdit
+    {
+
+        /// <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>
+        /// txtSN 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtSN;
+
+        /// <summary>
+        /// txtSystem_No 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem_No;
+
+        /// <summary>
+        /// txtCommissioningsystemcode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCommissioningsystemcode;
+
+        /// <summary>
+        /// txtCommissioningCodeDescription 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCommissioningCodeDescription;
+
+        /// <summary>
+        /// txtSubCommissioningsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubCommissioningsystem;
+
+        /// <summary>
+        /// txtPlanStartofTestingDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPlanStartofTestingDate;
+
+        /// <summary>
+        /// Type1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow Type1;
+
+        /// <summary>
+        /// txtDescribe 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtDescribe;
+
+        /// <summary>
+        /// txtPlanFinishofTestingDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtPlanFinishofTestingDate;
+
+        /// <summary>
+        /// txtActualFinishedDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtActualFinishedDate;
+
+        /// <summary>
+        /// ddlSStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSStatus;
+
+        /// <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/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index c205a6da..e8530f85 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -22,11 +22,11 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="Test Package No" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="Test Package No" LabelWidth="150px" LabelAlign="Right"></f:TextBox>
 
                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -37,6 +37,9 @@
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
+
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
                             </Items>
@@ -138,7 +141,7 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="设备材料报验" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="Piping" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="900px" Height="480px">
         </f:Window>
@@ -152,6 +155,9 @@
         </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>
+
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
index 5dc9ae0a..683c61b5 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
@@ -22,6 +22,8 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+
+                btnNew.OnClientClick = Window1.GetShowReference("PipingEdit.aspx") + "return false;";
             }
         }
 
@@ -148,10 +150,12 @@ namespace FineUIPro.Web.Transfer
         {
             if (Grid1.SelectedRowIndexArray.Length == 0)
             {
-                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx?InspectionEquipmentId={0}", Grid1.SelectedRowID, "编辑 - ")));
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipingEdit.aspx?Id={0}", id, "编辑 - ")));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
index 008b6e73..5ef7233f 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -203,6 +212,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
new file mode 100644
index 00000000..a76c037d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
@@ -0,0 +1,145 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PipingEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.PipingEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtPIPINGLINENUMBER" runat="server" Label="Test Package No" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSYSTEM" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Sub-System"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTestPackage" runat="server" Label="Turn over Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Ready for Test" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlPWD" runat="server" Label="Pwd" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlApunchclosed" runat="server" Label="A punch closed" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlNDTReport" runat="server" Label="NDT Report" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlTemperaryMeasurement" runat="server" Label="Temperary Measurement" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlFWDfinished" runat="server" Label="FWD finished" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Hydrostatic test schedule" runat="server">
+                            <Items>
+                                 <f:DropDownList ID="ddlHydrostaticTest" runat="server" Label="Hydrostatic Test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlReport" runat="server" Label="Report" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Pre-Commissioning" runat="server">
+                            <Items>
+                                 <f:DropDownList ID="ddlBlowingflushing" runat="server" Label="Blowing /flushing &Dry out" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlSystemreinstalled" runat="server" Label="System reinstalled" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                 <f:TextBox ID="txtBlowingReport" runat="server" Label="Blowing & flushing Report"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/PipingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
new file mode 100644
index 00000000..4a4b9628
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
@@ -0,0 +1,151 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class PipingEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id)) {
+                    var model = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.Id == Id);
+                    if (model!=null)
+                    {
+                        txtPIPINGLINENUMBER.Text = model.PIPINGLINENUMBER;
+                        txtSYSTEM.Text = model.SYSTEM;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTestPackage.Text = model.TestPackage;
+                        ddlPWD.SelectedValue = model.PWD;
+                        ddlApunchclosed.SelectedValue = model.Apunchclosed;
+                        ddlNDTReport.SelectedValue = model.NDTReport;
+                        ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
+                        ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
+                        ddlReport.SelectedValue = model.Report;
+                        ddlBlowingflushing.SelectedValue = model.Blowingflushing;
+                        ddlFWDfinished.SelectedValue = model.FWDfinished;
+                        ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
+                        txtBlowingReport.Text = model.BlowingReport;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e) {
+            var model = new Model.Transfer_Piping() {
+                ProjectId = ProjectId,
+                PIPINGLINENUMBER = txtPIPINGLINENUMBER.Text,
+                SYSTEM = txtSYSTEM.Text,
+                Subsystem = txtSubsystem.Text,
+                TestPackage = txtTestPackage.Text,
+                PWD = ddlPWD.SelectedValue,
+                Apunchclosed = ddlApunchclosed.SelectedValue,
+                NDTReport= ddlNDTReport.SelectedValue,
+                TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
+                HydrostaticTest=ddlHydrostaticTest.SelectedValue,
+                Report= ddlReport.SelectedValue,
+                Blowingflushing= ddlBlowingflushing.SelectedValue,
+                FWDfinished= ddlFWDfinished.SelectedValue,
+                Systemreinstalled= ddlSystemreinstalled.SelectedValue,
+                BlowingReport= txtBlowingReport.Text
+            };
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.PWD);
+            listObj.Add(model.Apunchclosed);
+            listObj.Add(model.NDTReport);
+            listObj.Add(model.TemperaryMeasurement);
+            listObj.Add(model.HydrostaticTest);
+            listObj.Add(model.Report);
+            listObj.Add(model.Blowingflushing);
+            listObj.Add(model.FWDfinished);
+            listObj.Add(model.Systemreinstalled);
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 9)
+            {
+                model.FINALStatus = "Completed";
+              
+            }
+            //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 9)
+            {
+                model.FINALStatus = "Not Start";
+               
+            }
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.FINALStatus = "In progress";
+            }
+
+           
+            #endregion
+
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.Id == Id);
+                newModel.PIPINGLINENUMBER = model.PIPINGLINENUMBER;
+                newModel.SYSTEM = model.SYSTEM;
+                newModel.Subsystem = newModel.Subsystem;
+                newModel.TestPackage = txtTestPackage.Text;
+                newModel.PWD = ddlPWD.SelectedValue;
+                newModel.Apunchclosed = ddlApunchclosed.SelectedValue;
+                newModel.NDTReport = ddlNDTReport.SelectedValue;
+                newModel.TemperaryMeasurement = ddlTemperaryMeasurement.SelectedValue;
+                newModel.HydrostaticTest = ddlHydrostaticTest.SelectedValue;
+                newModel.Report = ddlReport.SelectedValue;
+                newModel.Blowingflushing = ddlBlowingflushing.SelectedValue;
+                newModel.FWDfinished = ddlFWDfinished.SelectedValue;
+                newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
+                newModel.BlowingReport = txtBlowingReport.Text;
+                newModel.FINALStatus = model.FINALStatus;
+            }
+            else {
+                model.Id=Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_Piping.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
new file mode 100644
index 00000000..e398fe76
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class PipingEdit
+    {
+
+        /// <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>
+        /// txtPIPINGLINENUMBER 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPIPINGLINENUMBER;
+
+        /// <summary>
+        /// txtSYSTEM 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSYSTEM;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTestPackage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTestPackage;
+
+        /// <summary>
+        /// ddlPWD 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPWD;
+
+        /// <summary>
+        /// ddlApunchclosed 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlApunchclosed;
+
+        /// <summary>
+        /// ddlNDTReport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlNDTReport;
+
+        /// <summary>
+        /// ddlTemperaryMeasurement 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlTemperaryMeasurement;
+
+        /// <summary>
+        /// ddlFWDfinished 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlFWDfinished;
+
+        /// <summary>
+        /// ddlHydrostaticTest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlHydrostaticTest;
+
+        /// <summary>
+        /// ddlReport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlReport;
+
+        /// <summary>
+        /// ddlBlowingflushing 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlBlowingflushing;
+
+        /// <summary>
+        /// ddlSystemreinstalled 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlSystemreinstalled;
+
+        /// <summary>
+        /// txtBlowingReport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBlowingReport;
+
+        /// <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/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
index c7482359..9f443fc2 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -26,7 +26,7 @@
 
                                 <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -44,6 +44,9 @@
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
+
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
                             </Items>
@@ -106,7 +109,7 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="设备材料报验" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="RotatingEquipment" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="900px" Height="480px">
         </f:Window>
@@ -120,6 +123,9 @@
         </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>
+
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
index 2466cc85..8fc46b92 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
@@ -22,6 +22,8 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+
+                btnNew.OnClientClick = Window1.GetShowReference("RotatingEquipmentEdit.aspx") + "return false;";
             }
         }
 
@@ -150,10 +152,12 @@ namespace FineUIPro.Web.Transfer
         {
             if (Grid1.SelectedRowIndexArray.Length == 0)
             {
-                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx?InspectionEquipmentId={0}", Grid1.SelectedRowID, "编辑 - ")));
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RotatingEquipmentEdit.aspx?Id={0}", id, "编辑 - ")));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
index 45a31804..115321fb 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -158,6 +167,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
new file mode 100644
index 00000000..81928deb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
@@ -0,0 +1,85 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RotatingEquipmentEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.RotatingEquipmentEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtRotatingEquipment" runat="server" Label="Tag No" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSYSTEM" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTestPackage" runat="server" Label="Turn over Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlAlignment" runat="server" Label="Alignment" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlMotorsoloruntest" runat="server" Label="Motor solorun test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlStandalonetest" runat="server" Label="Standalone test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/RotatingEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
new file mode 100644
index 00000000..50096285
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
@@ -0,0 +1,127 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class RotatingEquipmentEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtRotatingEquipment.Text = model.RotatingEquipment;
+                        txtSYSTEM.Text = model.SYSTEM;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTestPackage.Text = model.TestPackage;
+                        ddlAlignment.SelectedValue = model.Alignment;
+                        ddlMotorsoloruntest.SelectedValue = model.Motorsoloruntest;
+                        ddlStandalonetest.SelectedValue = model.Standalonetest;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_RotatingEquipment
+            {
+                ProjectId = ProjectId,
+                RotatingEquipment = txtRotatingEquipment.Text,
+                SYSTEM = txtSYSTEM.Text,
+                Subsystem = txtSubsystem.Text,
+                TestPackage = txtTestPackage.Text,
+                Alignment = ddlAlignment.SelectedValue,
+                Motorsoloruntest = ddlMotorsoloruntest.SelectedValue,
+                Standalonetest = ddlStandalonetest.SelectedValue
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.Alignment);
+            listObj.Add(model.Motorsoloruntest);
+            listObj.Add(model.Standalonetest);
+
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
+            {
+                model.MechanicalFINALStatus = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+            {
+                model.MechanicalFINALStatus = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.MechanicalFINALStatus = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.RotatingEquipment = txtRotatingEquipment.Text;
+                    newModel.SYSTEM = txtSYSTEM.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.TestPackage = txtTestPackage.Text;
+                    newModel.Alignment = ddlAlignment.SelectedValue;
+                    newModel.Motorsoloruntest = ddlMotorsoloruntest.SelectedValue;
+                    newModel.Standalonetest = ddlStandalonetest.SelectedValue;
+                    newModel.MechanicalFINALStatus = model.MechanicalFINALStatus;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_RotatingEquipment.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.designer.cs
new file mode 100644
index 00000000..e9cccf64
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.designer.cs
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class RotatingEquipmentEdit
+    {
+
+        /// <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>
+        /// txtRotatingEquipment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRotatingEquipment;
+
+        /// <summary>
+        /// txtSYSTEM 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSYSTEM;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTestPackage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTestPackage;
+
+        /// <summary>
+        /// ddlAlignment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlAlignment;
+
+        /// <summary>
+        /// ddlMotorsoloruntest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlMotorsoloruntest;
+
+        /// <summary>
+        /// ddlStandalonetest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlStandalonetest;
+
+        /// <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/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index 51419a3f..245053a0 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -34,7 +34,7 @@
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
                                 </f:DatePicker>--%>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status"  LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -44,6 +44,9 @@
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                  <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
+
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
                             </Items>
@@ -130,6 +133,9 @@
         </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>
+
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
index 4b741121..0b4dd7eb 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
@@ -22,6 +22,8 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+
+                btnNew.OnClientClick = Window1.GetShowReference("StaticEquipmentEdit.aspx") + "return false;";
             }
         }
 
@@ -149,10 +151,12 @@ namespace FineUIPro.Web.Transfer
         {
             if (Grid1.SelectedRowIndexArray.Length == 0)
             {
-                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx?InspectionEquipmentId={0}", Grid1.SelectedRowID, "编辑 - ")));
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("StaticEquipmentEdit.aspx?Id={0}", id, "编辑 - ")));
         }
 
         /// <summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
index 5430b04c..2c4495a0 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -194,6 +203,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
new file mode 100644
index 00000000..61e26409
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
@@ -0,0 +1,85 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="StaticEquipmentEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.StaticEquipmentEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtStaticEquipment" runat="server" Label="Tag No" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSYSTEM" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTestPackage" runat="server" Label="Turn over Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlInternalinspection" runat="server" Label="Internal inspection" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlInternalsPacking" runat="server" Label="Internals/Packing installation" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlBOXupRecord" runat="server" Label="BOX-up Record" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/StaticEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
new file mode 100644
index 00000000..952bb15a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
@@ -0,0 +1,128 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class StaticEquipmentEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_StaticEquipment.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtStaticEquipment.Text = model.StaticEquipment;
+                        txtSYSTEM.Text = model.SYSTEM;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTestPackage.Text = model.TestPackage;
+                        ddlInternalinspection.SelectedValue = model.Internalinspection;
+                        ddlInternalsPacking.SelectedValue = model.InternalsPacking;
+                        ddlBOXupRecord.SelectedValue = model.BOXupRecord;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_StaticEquipment
+            {
+                ProjectId = ProjectId,
+                StaticEquipment = txtStaticEquipment.Text,
+                SYSTEM = txtSYSTEM.Text,
+                Subsystem = txtSubsystem.Text,
+                TestPackage = txtTestPackage.Text,
+                Internalinspection = ddlInternalinspection.SelectedValue,
+                InternalsPacking = ddlInternalsPacking.SelectedValue,
+                BOXupRecord = ddlBOXupRecord.SelectedValue
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.Internalinspection);
+            listObj.Add(model.InternalsPacking);
+            listObj.Add(model.BOXupRecord);
+
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
+            {
+                model.MechanicalFINALStatus = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+            {
+                model.MechanicalFINALStatus = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.MechanicalFINALStatus = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_StaticEquipment.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.StaticEquipment = txtStaticEquipment.Text;
+                    newModel.SYSTEM = txtSYSTEM.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.TestPackage = txtTestPackage.Text;
+                    newModel.Internalinspection = ddlInternalinspection.SelectedValue;
+                    newModel.InternalsPacking = ddlInternalsPacking.SelectedValue;
+                    newModel.BOXupRecord = ddlBOXupRecord.SelectedValue;
+                    newModel.MechanicalFINALStatus = model.MechanicalFINALStatus;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_StaticEquipment.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.designer.cs
new file mode 100644
index 00000000..092a9b88
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.designer.cs
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class StaticEquipmentEdit
+    {
+
+        /// <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>
+        /// txtStaticEquipment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtStaticEquipment;
+
+        /// <summary>
+        /// txtSYSTEM 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSYSTEM;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTestPackage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTestPackage;
+
+        /// <summary>
+        /// ddlInternalinspection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInternalinspection;
+
+        /// <summary>
+        /// ddlInternalsPacking 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInternalsPacking;
+
+        /// <summary>
+        /// ddlBOXupRecord 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlBOXupRecord;
+
+        /// <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/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index bd497c6b..5fe155da 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.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 />
     <IISExpressSSLPort />

From 8daba4e189e044aa0bf69dc4c4b10ce36518958b Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Thu, 1 Aug 2024 10:56:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  32 ++++
 .../Transfer/Chart/Systemstatus.aspx.cs       |  19 +-
 .../Transfer/CivilStructure.aspx              |  11 +-
 .../Transfer/CivilStructure.aspx.cs           |  13 ++
 .../Transfer/CivilStructure.aspx.designer.cs  |  27 +++
 .../Transfer/CivilStructureEdit.aspx          | 121 ++++++++++++
 .../Transfer/CivilStructureEdit.aspx.cs       | 151 +++++++++++++++
 .../CivilStructureEdit.aspx.designer.cs       | 179 ++++++++++++++++++
 SGGL/FineUIPro.Web/Transfer/Firefighting.aspx |  11 +-
 .../Transfer/Firefighting.aspx.cs             |  13 ++
 .../Transfer/Firefighting.aspx.designer.cs    |  27 +++
 .../Transfer/FirefightingEdit.aspx            |  86 +++++++++
 .../Transfer/FirefightingEdit.aspx.cs         | 127 +++++++++++++
 .../FirefightingEdit.aspx.designer.cs         | 134 +++++++++++++
 SGGL/FineUIPro.Web/Transfer/Plumbing.aspx     |  13 +-
 SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs  |  13 ++
 .../Transfer/Plumbing.aspx.designer.cs        |  27 +++
 SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx |  86 +++++++++
 .../Transfer/PlumbingEdit.aspx.cs             | 127 +++++++++++++
 .../Transfer/PlumbingEdit.aspx.designer.cs    | 134 +++++++++++++
 SGGL/FineUIPro.Web/Transfer/Telecom.aspx      |  11 +-
 SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs   |  13 ++
 .../Transfer/Telecom.aspx.designer.cs         |  27 +++
 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx  |  92 +++++++++
 .../Transfer/TelecomEdit.aspx.cs              | 131 +++++++++++++
 .../Transfer/TelecomEdit.aspx.designer.cs     | 143 ++++++++++++++
 26 files changed, 1751 insertions(+), 17 deletions(-)
 create mode 100644 SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.designer.cs

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index cac89b50..b538f6f6 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -2031,11 +2031,13 @@
     <Content Include="Transfer\Chart\TransferChart.aspx" />
     <Content Include="Transfer\CivilStructure.aspx" />
     <Content Include="Transfer\CivilStructureDataIn.aspx" />
+    <Content Include="Transfer\CivilStructureEdit.aspx" />
     <Content Include="Transfer\Electrical.aspx" />
     <Content Include="Transfer\ElectricalDataIn.aspx" />
     <Content Include="Transfer\ElectricalEdit.aspx" />
     <Content Include="Transfer\Firefighting.aspx" />
     <Content Include="Transfer\FirefightingDataIn.aspx" />
+    <Content Include="Transfer\FirefightingEdit.aspx" />
     <Content Include="Transfer\HVAC.aspx" />
     <Content Include="Transfer\HVACDataIn.aspx" />
     <Content Include="Transfer\Instrumentation.aspx" />
@@ -2049,6 +2051,7 @@
     <Content Include="Transfer\PipingEdit.aspx" />
     <Content Include="Transfer\Plumbing.aspx" />
     <Content Include="Transfer\PlumbingDataIn.aspx" />
+    <Content Include="Transfer\PlumbingEdit.aspx" />
     <Content Include="Transfer\ProjectSetup.aspx" />
     <Content Include="Transfer\ProjectSetupDataIn.aspx" />
     <Content Include="Transfer\PunchlistFrom.aspx" />
@@ -2062,6 +2065,7 @@
     <Content Include="Transfer\StaticEquipmentEdit.aspx" />
     <Content Include="Transfer\Telecom.aspx" />
     <Content Include="Transfer\TelecomDataIn.aspx" />
+    <Content Include="Transfer\TelecomEdit.aspx" />
     <Content Include="Video\Video.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
@@ -17671,6 +17675,13 @@
     <Compile Include="Transfer\CivilStructureDataIn.aspx.designer.cs">
       <DependentUpon>CivilStructureDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\CivilStructureEdit.aspx.cs">
+      <DependentUpon>CivilStructureEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\CivilStructureEdit.aspx.designer.cs">
+      <DependentUpon>CivilStructureEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\Electrical.aspx.cs">
       <DependentUpon>Electrical.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17706,6 +17717,13 @@
     <Compile Include="Transfer\FirefightingDataIn.aspx.designer.cs">
       <DependentUpon>FirefightingDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\FirefightingEdit.aspx.cs">
+      <DependentUpon>FirefightingEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\FirefightingEdit.aspx.designer.cs">
+      <DependentUpon>FirefightingEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\HVAC.aspx.cs">
       <DependentUpon>HVAC.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17797,6 +17815,13 @@
     <Compile Include="Transfer\PlumbingDataIn.aspx.designer.cs">
       <DependentUpon>PlumbingDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\PlumbingEdit.aspx.cs">
+      <DependentUpon>PlumbingEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\PlumbingEdit.aspx.designer.cs">
+      <DependentUpon>PlumbingEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\ProjectSetup.aspx.cs">
       <DependentUpon>ProjectSetup.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -17888,6 +17913,13 @@
     <Compile Include="Transfer\TelecomDataIn.aspx.designer.cs">
       <DependentUpon>TelecomDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\TelecomEdit.aspx.cs">
+      <DependentUpon>TelecomEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\TelecomEdit.aspx.designer.cs">
+      <DependentUpon>TelecomEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Video\Video.aspx.cs">
       <DependentUpon>Video.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index 64503e1f..489cb0c2 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -50,42 +50,43 @@ namespace FineUIPro.Web.Transfer.Chart
                     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,
+                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(tpi1.PipingScount,0)*1.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,
+                    else  CONVERT(DECIMAL(10,2),100 *(ISNULL((TseSCount+TreSCount),0)*1.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,
+                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TeScount,0)*1.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,
+                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TiScount,0)*1.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,
+                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TcsScount,0)*1.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,
+                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TfScount,0)*1.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,
+                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0)))  end TtPercent,
+
+                    ISNULL(TpCount,0) TpCount,ISNULL(TpScount,0) TpScount,
 
-                    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,
+                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TpScount,0)*1.0/ISNULL(TpCount,0)))  end TpPercent,
 
                     ts.PlanPWD,PlanJWD,McPlan,
                     SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
index 23c52378..4e7e2c41 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
@@ -26,7 +26,7 @@
 
                                  <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -44,7 +44,8 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-
+                                  <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>--%>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@@ -124,12 +125,18 @@
                 </f:Grid>
             </Items>
         </f:Panel>
+         <f:Window ID="Window1" Title="CivilStructure" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </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:Menu ID="Menu1" runat="server">
             <Items>
+                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
index 71547de1..9935c7e7 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
@@ -22,9 +22,22 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("CivilStructureEdit.aspx") + "return false;";
             }
         }
 
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CivilStructureEdit.aspx?Id={0}", id, "编辑 - ")));
+        }
+
         /// <summary>
         /// 数据绑定
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
index f91ecef9..d7430e7a 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -122,6 +131,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -140,6 +158,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
new file mode 100644
index 00000000..2f5b30ce
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
@@ -0,0 +1,121 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CivilStructureEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.CivilStructureEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtCivil_Structure" runat="server" Label="Structure/Civil/Architecture" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSystemName" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlFoundation" runat="server" Label="Foundation" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlMainstructure" runat="server" Label="Main structure acceptance" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlBuildingdecoration" runat="server" Label="Building decoration" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlEquipment" runat="server" Label="Equipment" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlInstrument" runat="server" Label="Instrument" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlElectrical" runat="server" Label="Electrical" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlFireFighting" runat="server" Label="Fire Fighting" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlHVAC" runat="server" Label="HVAC" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/CivilStructureEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
new file mode 100644
index 00000000..51c7bff3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
@@ -0,0 +1,151 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class CivilStructureEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtCivil_Structure.Text = model.Civil_Structure;
+                        txtSystemName.Text = model.SystemName;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTest_Package.Text = model.Test_Package;
+                        ddlFoundation.SelectedValue = model.Foundation;
+                        ddlMainstructure.SelectedValue = model.Mainstructure;
+                        ddlBuildingdecoration.SelectedValue = model.Buildingdecoration;
+                        ddlEquipment.SelectedValue = model.Equipment;
+
+                        ddlInstrument.SelectedValue = model.Instrument;
+                        ddlElectrical.SelectedValue = model.Electrical;
+                        ddlFireFighting.SelectedValue = model.FireFighting;
+                        ddlHVAC.SelectedValue = model.HVAC;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_Civil_Structure
+            {
+                ProjectId = ProjectId,
+                Civil_Structure = txtCivil_Structure.Text,
+                SystemName = txtSystemName.Text,
+                Subsystem = txtSubsystem.Text,
+                Test_Package = txtTest_Package.Text,
+                Foundation = ddlFoundation.SelectedValue,
+                Mainstructure = ddlMainstructure.SelectedValue,
+                Buildingdecoration = ddlBuildingdecoration.SelectedValue,
+                Equipment = ddlEquipment.SelectedValue,
+
+                Instrument = ddlInstrument.SelectedValue,
+                Electrical = ddlElectrical.SelectedValue,
+                FireFighting = ddlFireFighting.SelectedValue,
+                HVAC = ddlHVAC.SelectedValue,
+
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.Foundation);
+            listObj.Add(model.Mainstructure);
+            listObj.Add(model.Buildingdecoration);
+            listObj.Add(model.Equipment);
+
+            listObj.Add(model.Instrument);
+            listObj.Add(model.Electrical);
+            listObj.Add(model.FireFighting);
+            listObj.Add(model.HVAC);
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 8)
+            {
+                model.FINAL_Status = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 8)
+            {
+                model.FINAL_Status = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.FINAL_Status = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.Civil_Structure = txtCivil_Structure.Text;
+                    newModel.SystemName = txtSystemName.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.Test_Package = txtTest_Package.Text;
+                    newModel.Foundation = ddlFoundation.SelectedValue;
+                    newModel.Mainstructure = ddlMainstructure.SelectedValue;
+                    newModel.Buildingdecoration = ddlBuildingdecoration.SelectedValue;
+                    newModel.Equipment = ddlEquipment.SelectedValue;
+
+                    newModel.Instrument = ddlInstrument.SelectedValue;
+                    newModel.Electrical = ddlElectrical.SelectedValue;
+                    newModel.FireFighting = ddlFireFighting.SelectedValue;
+                    newModel.HVAC = ddlHVAC.SelectedValue;
+                    newModel.FINAL_Status = model.FINAL_Status;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_Civil_Structure.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.designer.cs
new file mode 100644
index 00000000..94ce50b1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class CivilStructureEdit
+    {
+
+        /// <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>
+        /// txtCivil_Structure 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCivil_Structure;
+
+        /// <summary>
+        /// txtSystemName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystemName;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTest_Package 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTest_Package;
+
+        /// <summary>
+        /// ddlFoundation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlFoundation;
+
+        /// <summary>
+        /// ddlMainstructure 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlMainstructure;
+
+        /// <summary>
+        /// ddlBuildingdecoration 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlBuildingdecoration;
+
+        /// <summary>
+        /// ddlEquipment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlEquipment;
+
+        /// <summary>
+        /// ddlInstrument 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInstrument;
+
+        /// <summary>
+        /// ddlElectrical 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlElectrical;
+
+        /// <summary>
+        /// ddlFireFighting 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlFireFighting;
+
+        /// <summary>
+        /// ddlHVAC 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlHVAC;
+
+        /// <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/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
index 3c6bc6e1..ab81d877 100644
--- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
@@ -26,7 +26,7 @@
 
                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status"   LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -45,7 +45,8 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-
+                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>--%>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@@ -105,12 +106,18 @@
                 </f:Grid>
             </Items>
         </f:Panel>
+          <f:Window ID="Window1" Title="Firefighting" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </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:Menu ID="Menu1" runat="server">
             <Items>
+                   <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs
index 5bc6a4b7..9554ea95 100644
--- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs
@@ -22,9 +22,22 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("FirefightingEdit.aspx") + "return false;";
             }
         }
 
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("FirefightingEdit.aspx?Id={0}", id, "编辑 - ")));
+        }
+
         /// <summary>
         /// 数据绑定
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs
index 7328b1f3..6973ed38 100644
--- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -122,6 +131,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -140,6 +158,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx
new file mode 100644
index 00000000..4d22300b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx
@@ -0,0 +1,86 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FirefightingEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.FirefightingEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtFirefighting" runat="server" Label="Firefighting" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSystemName" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlDebugging" runat="server" Label="Debugging" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlAcceptancecheck" runat="server" Label="Acceptance check" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/FirefightingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
new file mode 100644
index 00000000..b1096fb8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
@@ -0,0 +1,127 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class FirefightingEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_Firefighting.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtFirefighting.Text = model.Firefighting;
+                        txtSystemName.Text = model.SystemName;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTest_Package.Text = model.Test_Package;
+                        ddlInstallation.SelectedValue = model.Installation;
+                        ddlDebugging.SelectedValue = model.Debugging;
+                        ddlAcceptancecheck.SelectedValue = model.Acceptancecheck;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_Firefighting
+            {
+                ProjectId = ProjectId,
+                Firefighting = txtFirefighting.Text,
+                SystemName = txtSystemName.Text,
+                Subsystem = txtSubsystem.Text,
+                Test_Package = txtTest_Package.Text,
+                Installation = ddlInstallation.SelectedValue,
+                Debugging = ddlDebugging.SelectedValue,
+                Acceptancecheck = ddlAcceptancecheck.SelectedValue,
+
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.Installation);
+            listObj.Add(model.Debugging);
+            listObj.Add(model.Acceptancecheck);
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
+            {
+                model.FINAL_Status = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+            {
+                model.FINAL_Status = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.FINAL_Status = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_Firefighting.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.Firefighting = txtFirefighting.Text;
+                    newModel.SystemName = txtSystemName.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.Test_Package = txtTest_Package.Text;
+                    newModel.Installation = ddlInstallation.SelectedValue;
+                    newModel.Debugging = ddlDebugging.SelectedValue;
+                    newModel.Acceptancecheck = ddlAcceptancecheck.SelectedValue;
+                    newModel.FINAL_Status = model.FINAL_Status;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_Firefighting.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.designer.cs
new file mode 100644
index 00000000..edd363f5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.designer.cs
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class FirefightingEdit
+    {
+
+        /// <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>
+        /// txtFirefighting 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtFirefighting;
+
+        /// <summary>
+        /// txtSystemName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystemName;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTest_Package 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTest_Package;
+
+        /// <summary>
+        /// ddlInstallation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInstallation;
+
+        /// <summary>
+        /// ddlDebugging 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlDebugging;
+
+        /// <summary>
+        /// ddlAcceptancecheck 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlAcceptancecheck;
+
+        /// <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/Plumbing.aspx b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
index 383090e6..4b9b6d1b 100644
--- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
@@ -26,7 +26,7 @@
 
                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                  <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                  <f:DropDownList runat="server" ID="ddStatus" Label="Status"  LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -37,7 +37,8 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-
+                                  <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>--%>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@@ -97,12 +98,20 @@
                 </f:Grid>
             </Items>
         </f:Panel>
+         <f:Window ID="Window1" Title="Plumbing" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </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:Menu ID="Menu1" runat="server">
             <Items>
+                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
diff --git a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs
index 9f5225f7..6d4589f5 100644
--- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs
@@ -23,9 +23,22 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("PlumbingEdit.aspx") + "return false;";
             }
         }
 
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PlumbingEdit.aspx?Id={0}", id, "编辑 - ")));
+        }
+
         /// <summary>
         /// 数据绑定
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs
index 2a065db0..722a10ba 100644
--- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -122,6 +131,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -140,6 +158,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx
new file mode 100644
index 00000000..f676ae35
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx
@@ -0,0 +1,86 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PlumbingEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.PlumbingEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtPlumbing" runat="server" Label="Plumbing" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSystemName" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlNdt" runat="server" Label="NDT" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlFlushing" runat="server" Label="Flushing" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlRunningTest" runat="server" Label="Running Test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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/PlumbingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
new file mode 100644
index 00000000..c4c28b4a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
@@ -0,0 +1,127 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class PlumbingEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_Plumbing.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtPlumbing.Text = model.Plumbing;
+                        txtSystemName.Text = model.SystemName;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTest_Package.Text = model.Test_Package;
+                        ddlNdt.SelectedValue = model.Ndt;
+                        ddlFlushing.SelectedValue = model.Flushing;
+                        ddlRunningTest.SelectedValue = model.RunningTest;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_Plumbing
+            {
+                ProjectId = ProjectId,
+                Plumbing = txtPlumbing.Text,
+                SystemName = txtSystemName.Text,
+                Subsystem = txtSubsystem.Text,
+                Test_Package = txtTest_Package.Text,
+                Ndt = ddlNdt.SelectedValue,
+                Flushing = ddlFlushing.SelectedValue,
+                RunningTest = ddlRunningTest.SelectedValue,
+
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.Ndt);
+            listObj.Add(model.Flushing);
+            listObj.Add(model.RunningTest);
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
+            {
+                model.FINAL_Status = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+            {
+                model.FINAL_Status = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.FINAL_Status = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_Plumbing.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.Plumbing = txtPlumbing.Text;
+                    newModel.SystemName = txtSystemName.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.Test_Package = txtTest_Package.Text;
+                    newModel.Ndt = ddlNdt.SelectedValue;
+                    newModel.Flushing = ddlFlushing.SelectedValue;
+                    newModel.RunningTest = ddlRunningTest.SelectedValue;
+                    newModel.FINAL_Status = model.FINAL_Status;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_Plumbing.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.designer.cs
new file mode 100644
index 00000000..2bb3c588
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.designer.cs
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class PlumbingEdit
+    {
+
+        /// <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>
+        /// txtPlumbing 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPlumbing;
+
+        /// <summary>
+        /// txtSystemName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystemName;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTest_Package 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTest_Package;
+
+        /// <summary>
+        /// ddlNdt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlNdt;
+
+        /// <summary>
+        /// ddlFlushing 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlFlushing;
+
+        /// <summary>
+        /// ddlRunningTest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlRunningTest;
+
+        /// <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/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
index 44df42ed..fe313915 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
@@ -26,7 +26,7 @@
 
                                 <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true"/>
                                     <f:ListItem Value="Not Start" Text="Not Start"/>
                                     <f:ListItem Value="In progress" Text="In progress"/>
@@ -44,7 +44,8 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-
+                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
+                                </f:Button>
                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>--%>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@@ -108,12 +109,18 @@
                 </f:Grid>
             </Items>
         </f:Panel>
+          <f:Window ID="Window1" Title="Telecom" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </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:Menu ID="Menu1" runat="server">
             <Items>
+                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
+                </f:MenuButton>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
index 0ba55acc..4f3a7afb 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
@@ -23,9 +23,22 @@ namespace FineUIPro.Web.Transfer
             {
                 GetButtonPower();
                 BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("TelecomEdit.aspx") + "return false;";
             }
         }
 
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string id = Grid1.SelectedRowID;
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TelecomEdit.aspx?Id={0}", id, "编辑 - ")));
+        }
+
         /// <summary>
         /// 数据绑定
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
index 965ca7b5..ea647151 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
 
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -122,6 +131,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
 
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -140,6 +158,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
 
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
new file mode 100644
index 00000000..5c35b2da
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
@@ -0,0 +1,92 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TelecomEdit.aspx.cs" Inherits="FineUIPro.Web.Transfer.TelecomEdit" %>
+
+<!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"
+            AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
+            LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtTelecom" runat="server" Label="Telecom" LabelAlign="Right"
+                            LabelWidth="180px" Required="true" ShowRedStar="true">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtSystemName" runat="server" Label="System No"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+
+                        <f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
+                            LabelAlign="Right" LabelWidth="180px">
+                        </f:TextBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></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:DropDownList ID="ddlCommunication" runat="server" Label="Communication test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                 <f:DropDownList ID="ddlFunctionTest" runat="server" Label="Function Test" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </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>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
new file mode 100644
index 00000000..a0bb65ad
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
@@ -0,0 +1,131 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class TelecomEdit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Id = Request.Params["Id"];
+                ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Id))
+                {
+                    var model = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Id == Id);
+                    if (model != null)
+                    {
+                        txtTelecom.Text = model.Telecom;
+                        txtSystemName.Text = model.SystemName;
+                        txtSubsystem.Text = model.Subsystem;
+                        txtTest_Package.Text = model.Test_Package;
+                        ddlInstallation.SelectedValue = model.Installation;
+                        ddlCommunication.SelectedValue = model.Communication;
+                        ddlCableLaying.SelectedValue = model.CableLaying;
+                        ddlFunctionTest.SelectedValue = model.FunctionTest;
+                    }
+                }
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_Telecom
+            {
+                ProjectId = ProjectId,
+                Telecom = txtTelecom.Text,
+                SystemName = txtSystemName.Text,
+                Subsystem = txtSubsystem.Text,
+                Test_Package = txtTest_Package.Text,
+                Installation = ddlInstallation.SelectedValue,
+                Communication = ddlCommunication.SelectedValue,
+                CableLaying = ddlCableLaying.SelectedValue,
+                FunctionTest = ddlFunctionTest.SelectedValue,
+
+            };
+
+            #region 判断状态
+            var listObj = new List<string>();
+            listObj.Add(model.Installation);
+            listObj.Add(model.Communication);
+            listObj.Add(model.CableLaying);
+            listObj.Add(model.FunctionTest);
+            //全是NA或Completed 状态是Completed
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count ==4)
+            {
+                model.FINAL_Status = "Completed";
+            } //如果全是Not Start 就是 Not Start
+            else if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+            {
+                model.FINAL_Status = "Not Start";
+            }
+
+            //如果其中有一项是In progress 或Not Start 是 In progress
+            else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
+            {
+                model.FINAL_Status = "In progress";
+            }
+
+            #endregion
+            if (!string.IsNullOrEmpty(Id))
+            {
+                var newModel = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Id == Id);
+                if (newModel != null)
+                {
+                    newModel.Telecom = txtTelecom.Text;
+                    newModel.SystemName = txtSystemName.Text;
+                    newModel.Subsystem = txtSubsystem.Text;
+                    newModel.Test_Package = txtTest_Package.Text;
+                    newModel.Installation = ddlInstallation.SelectedValue;
+                    newModel.Communication = ddlCommunication.SelectedValue;
+                    newModel.CableLaying = ddlCableLaying.SelectedValue;
+                    newModel.FunctionTest = ddlFunctionTest.SelectedValue;
+                    newModel.FINAL_Status = model.FINAL_Status;
+                }
+            }
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
+                Funs.DB.Transfer_Telecom.InsertOnSubmit(model);
+            }
+            Funs.DB.SubmitChanges();
+            ShowNotify("保存成功", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.designer.cs
new file mode 100644
index 00000000..dc109ae1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.designer.cs
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class TelecomEdit
+    {
+
+        /// <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>
+        /// txtTelecom 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTelecom;
+
+        /// <summary>
+        /// txtSystemName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystemName;
+
+        /// <summary>
+        /// txtSubsystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubsystem;
+
+        /// <summary>
+        /// txtTest_Package 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTest_Package;
+
+        /// <summary>
+        /// ddlInstallation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInstallation;
+
+        /// <summary>
+        /// ddlCommunication 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCommunication;
+
+        /// <summary>
+        /// ddlCableLaying 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCableLaying;
+
+        /// <summary>
+        /// ddlFunctionTest 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlFunctionTest;
+
+        /// <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;
+    }
+}

From 5beb4131258ed81e3ddd560bc0feae79dc8db625 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 1 Aug 2024 13:53:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?20240801=20NCR=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs | 2 +-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
index beaaf315..6d5b0218 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs
@@ -358,7 +358,7 @@ namespace FineUIPro.Web.Comprehensive
             {
                 lists = lists.Where(x => x.NCRCode.Contains(this.txtNCRCode.Text.Trim()));
             }
-            lists = lists.OrderBy(x => x.RemarkCode);
+            lists = lists.OrderBy(x => x.IssuedDate);
             if (lists != null)
             {
                 string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index cac89b50..19932390 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19184,7 +19184,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From 3a2352f0e1aba2cf113ca47e447118dcefac70ac Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Thu, 1 Aug 2024 16:02:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E4=BA=A4?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_WH_V2024-08-01-phf.sql | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_V2024-08-01-phf.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-08-01-phf.sql b/DataBase/版本日志/SGGLDB_WH_V2024-08-01-phf.sql
new file mode 100644
index 00000000..b7b53077
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-08-01-phf.sql
@@ -0,0 +1,17 @@
+update sys_menu set menuname='β�����ͳ�Ʊ�<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Punchlist Completion Table' 
+where menuid='2352E44F-BE12-4012-B43F-AAF649EDAC32'
+
+update sys_menu set menuname='�����<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Punchlist Classification Table' 
+where menuid='CB76462E-9444-4946-B787-ECB33C21E6D0'
+
+update sys_menu set menuname='β����ȸ��ٱ�<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Punchlist Status Table' 
+where menuid='549DD0B6-05CB-4C75-B8F5-9AADDEDF399F'
+
+update sys_menu set menuname='�ƽ�ͳ�Ʊ�<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Turnover Table' 
+where menuid='E305689E-5D84-4C1A-BF67-85FA2D828115'
+
+update sys_menu set menuname='�ƽ�ͳ��ͼ��<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Turnover Chart' 
+where menuid='60838E30-4A46-4878-B299-C234900B10B7'
+
+update sys_menu set menuname='�ƽ�״̬���ܱ�<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Turnover Summary Table' 
+where menuid='25C13642-AE77-42E2-B0FB-32663B68F93F'
\ No newline at end of file