diff --git a/DataBase/版本日志/SUBQHSE_V2024-11-15-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2024-11-15-xiaj.sql
new file mode 100644
index 00000000..6390a1e8
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2024-11-15-xiaj.sql
@@ -0,0 +1,24 @@
+
+
+--1���޸Ĺܵ����ֶ���������
+ALTER TABLE Transfer_Piping ALTER COLUMN TotalFactor decimal(10, 2);
+ALTER TABLE Transfer_Piping ALTER COLUMN CompleteFactor decimal(10, 2);
+update Transfer_Piping set CompleteProportion='0'where CompleteProportion='' or CompleteProportion is null;
+go
+ALTER TABLE Transfer_Piping ALTER COLUMN CompleteProportion decimal(10, 2);
+go
+
+
+
+--3���ƽ�ͳ�Ʊ��������Ⱥͱ�����
+IF NOT EXISTS(select * from sys.columns where name='Insulation' and [object_id]=object_id(N'Transfer_SystemControl')) 
+BEGIN
+	--�����
+	ALTER TABLE Transfer_SystemControl ADD ElectricHeatTracing nvarchar(50) NULL;
+	--����/��
+	ALTER TABLE Transfer_SystemControl ADD Insulation nvarchar(50) NULL;
+END
+go
+
+
+
diff --git a/DataBase/版本日志/SUBQHSE_V2024-11-22-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2024-11-22-xiaj.sql
new file mode 100644
index 00000000..547482e5
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2024-11-22-xiaj.sql
@@ -0,0 +1,13 @@
+
+--��ʷβ�������޸�
+update Transfer_PunchlistFrom set IsMatI='Y2' where IsMatI='Y';
+update Transfer_PunchlistFrom set Punch_Type='JWD' where Punch_Type='FWD';
+go
+
+
+update Transfer_PunchlistFrom set Sub_Sys_No='LHC1-CVL05-01-01' where Sub_Sys_No='CVL05-01';
+update Transfer_PunchlistFrom set Sub_Sys_No='LHC1-EL01-00-01' where Sub_Sys_No='EL01-01';
+
+go
+
+
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls
index b02bca19..f4490857 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板（旧）.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板（旧）.xls
new file mode 100644
index 00000000..45cf4ca9
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板（旧）.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls
index 53bc3cda..50260a8f 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls differ
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index c96c4cf4..f3e0c40a 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -61,7 +61,7 @@ else  CONVERT(DECIMAL(10,2),100*(ISNULL(tpi2.ReinstateScount,0)*1.0/ISNULL(tpi.P
 (ISNULL(TseCount,0)+ISNULL(TreCount,0)) as EqCount,ISNULL((ISNULL(TseSCount,0)+ISNULL(TreSCount,0)),0) as EqScount,
 case (ISNULL(TseCount,0)+ISNULL(TreCount,0))
 when 0 then 0
-else  CONVERT(DECIMAL(10,2),100 *((ISNULL(TseSCount,0)+ISNULL(TreSCount,0)*1.0/ISNULL((ISNULL(TseCount,0)+ISNULL(TreCount,0)),0)))) end EqPercent,
+else  CONVERT(DECIMAL(10,2),100 *(((ISNULL(TseSCount,0)+ISNULL(TreSCount,0))*1.0/(ISNULL(TseCount,0)+ISNULL(TreCount,0))))) end EqPercent,
 
 ISNULL(TeCount,0) TeCount,ISNULL(TeScount,0) TeScount,
 case ISNULL(TeCount,0)
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
index 9c38a22e..b631a3df 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
@@ -73,8 +73,8 @@
 
                         <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
                             <Columns>
-                                <f:BoundField Width="90px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
-                                <f:BoundField Width="100px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" />
+                                <f:BoundField Width="100px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
+                                <f:BoundField Width="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" />
                                 <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
                             </Columns>
                         </f:GroupField>
@@ -86,28 +86,28 @@
                                 </f:RenderField>--%>
 
                                 <f:RenderField ColumnID="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="90px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
 
-                                <f:RenderField ColumnID="PipingPressuretest" DataField="PipingPressuretest" FieldType="String" HeaderText="Piping Pressure test" TextAlign="Center"
+                                <%--<f:RenderField ColumnID="PipingPressuretest" DataField="PipingPressuretest" FieldType="String" HeaderText="Piping Pressure test" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="150px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="PipingLeak" DataField="PipingLeak" FieldType="String" HeaderText="Piping Leak/<br/>Vacuum Test" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="120px">
-                                </f:RenderField>
+                                </f:RenderField>--%>
 
                                 <f:RenderField ColumnID="PipingBlowing" DataField="PipingBlowing" FieldType="String" HeaderText="Piping Blowing" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="90px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
 
-                        <f:BoundField Width="110px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
+                        <f:BoundField MinWidth="120px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
 
                     </Columns>
                     <Listeners>
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
index c16ef0e6..0db982b6 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 10);
+                AddDatasetToSQL(ds.Tables[0], 8);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 11);
+                AddDatasetToSQL2(ds.Tables[0], 8);
             }
             catch (Exception ex)
             {
@@ -335,21 +335,21 @@ namespace FineUIPro.Web.Transfer
                         //var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
 
                         var obj1 = model.InstallationCalibration = pds.Rows[i][5].ToString().Trim();
-                        var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim();
-                        var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim();
-                        var obj4 = model.PipingBlowing = pds.Rows[i][8].ToString().Trim();
-                        var obj5 = model.Looptest = pds.Rows[i][9].ToString().Trim();
+                        //var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim();
+                        //var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim();
+                        var obj4 = model.PipingBlowing = pds.Rows[i][6].ToString().Trim();
+                        var obj5 = model.Looptest = pds.Rows[i][7].ToString().Trim();
 
                         #region 判断状态
                         var listObj = new List<string>();
                         listObj.Add(obj1);
-                        listObj.Add(obj2);
-                        listObj.Add(obj3);
+                        //listObj.Add(obj2);
+                        //listObj.Add(obj3);
                         listObj.Add(obj4);
                         listObj.Add(obj5);
                         //listObj.Add(obj0);
                         //全是NA或Completed 状态是Completed
-                        if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
+                        if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
                         {
                             model.FINAL_Status = "Completed";
                             list.Add(model);
@@ -357,7 +357,7 @@ namespace FineUIPro.Web.Transfer
                         }
 
                         //如果全是NA或Not Start 就是 Not Start
-                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 5)
+                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
                         {
                             model.FINAL_Status = "Not Start";
                             list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
index d7749ed1..ad09ff88 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
@@ -67,7 +67,7 @@
                                     <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: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>
@@ -79,7 +79,7 @@
                                     <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>--%>
 
                                 <f:DropDownList ID="ddlPipingBlowing" runat="server" Label="Piping Blowing" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
index 8cf84f39..3be30efb 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
@@ -56,8 +56,8 @@ namespace FineUIPro.Web.Transfer
                         txtSubsystem.Text = model.Subsystem;
                         txtTest_Package.Text = model.Test_Package;
                         ddlInstallationCalibration.SelectedValue = model.InstallationCalibration;
-                        ddlPipingPressuretest.SelectedValue = model.PipingPressuretest;
-                        ddlPipingLeak.SelectedValue = model.PipingLeak;
+                        //ddlPipingPressuretest.SelectedValue = model.PipingPressuretest;
+                        //ddlPipingLeak.SelectedValue = model.PipingLeak;
                         ddlPipingBlowing.SelectedValue = model.PipingBlowing;
                         ddlLooptest.SelectedValue = model.Looptest;
                         //ddlCalibration.SelectedValue = model.Calibration;
@@ -77,8 +77,8 @@ namespace FineUIPro.Web.Transfer
                 Subsystem = txtSubsystem.Text,
                 Test_Package = txtTest_Package.Text,
                 InstallationCalibration = ddlInstallationCalibration.SelectedValue,
-                PipingPressuretest = ddlPipingPressuretest.SelectedValue,
-                PipingLeak = ddlPipingLeak.SelectedValue,
+                //PipingPressuretest = ddlPipingPressuretest.SelectedValue,
+                //PipingLeak = ddlPipingLeak.SelectedValue,
                 PipingBlowing = ddlPipingBlowing.SelectedValue,
                 Looptest = ddlLooptest.SelectedValue,
                 //Calibration= ddlCalibration.SelectedValue,
@@ -89,19 +89,19 @@ namespace FineUIPro.Web.Transfer
             #region 判断状态
             var listObj = new List<string>();
             listObj.Add(model.InstallationCalibration);
-            listObj.Add(model.PipingPressuretest);
-            listObj.Add(model.PipingLeak);
+            //listObj.Add(model.PipingPressuretest);
+            //listObj.Add(model.PipingLeak);
             listObj.Add(model.PipingBlowing);
             listObj.Add(model.Looptest);
             //listObj.Add(model.Calibration);
 
             //全是NA或Completed 状态是Completed
-            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
             {
                 model.FINAL_Status = "Completed";
             }
             //如果全是NA或Not Start 就是 Not Start
-            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 5)
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.FINAL_Status = "Not Start";
             }
@@ -123,8 +123,8 @@ namespace FineUIPro.Web.Transfer
                     newModel.Subsystem = txtSubsystem.Text;
                     newModel.Test_Package = txtTest_Package.Text;
                     newModel.InstallationCalibration = ddlInstallationCalibration.SelectedValue;
-                    newModel.PipingPressuretest = ddlPipingPressuretest.SelectedValue;
-                    newModel.PipingLeak = ddlPipingLeak.SelectedValue;
+                    //newModel.PipingPressuretest = ddlPipingPressuretest.SelectedValue;
+                    //newModel.PipingLeak = ddlPipingLeak.SelectedValue;
                     newModel.PipingBlowing = ddlPipingBlowing.SelectedValue;
                     newModel.Looptest = ddlLooptest.SelectedValue;
                     //newModel.Calibration = ddlCalibration.SelectedValue;
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
index 2f26b40a..010b72ff 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
@@ -95,24 +95,6 @@ namespace FineUIPro.Web.Transfer
         /// </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>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index ff2cc19f..fc6e24b4 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -46,14 +46,15 @@
                         </f:Toolbar>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="180px" LabelWidth="100px">
+                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="170px" LabelWidth="100px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
-                                    <f:ListItem Value="FWD" Text="FWD"></f:ListItem>
+                                    <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
+                                    <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
                                 </f:DropDownList>
                                 <%--<f:TextBox runat="server" ID="txtAction_By" Label="Action By" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>--%>
                                 <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="180px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="180px" LabelAlign="Right" Width="300px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="260px"></f:TextBox>
                                 <f:DropDownList ID="ddlStatus" runat="server" Label="状态/Status" AutoPostBack="true" Width="200px" LabelWidth="100px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
@@ -154,7 +155,7 @@
 
                         <f:BoundField MinWidth="180px" TextAlign="Center" ColumnID="Sub_Sys_No" DataField="Sub_Sys_No" HeaderText="Turnover<br>System Code" />
 
-                        <f:BoundField MinWidth="120px" TextAlign="left" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="尾项内容<br>Description" />
+                        <f:BoundField MinWidth="280px" TextAlign="left" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="尾项内容<br>Description" />
 
                         <f:TemplateField ColumnID="ImagePhotoes" Width="120px" HeaderText="Photoes" HeaderTextAlign="Center"
                             TextAlign="Left">
@@ -178,7 +179,7 @@
 
                         <f:BoundField Width="100px" TextAlign="Center" ColumnID="Punch_Type" DataField="Punch_Type" HeaderText="尾项类别<br>Punch Type" />
 
-                        <f:RenderField Width="150px" TextAlign="Center" ColumnID="Required_Date" DataField="Required_Date" HeaderText="要求完成时间<br>Required Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
+                        <f:RenderField Width="120px" TextAlign="Center" ColumnID="Required_Date" DataField="Required_Date" HeaderText="要求完成时间<br>Required Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
                         <f:BoundField Width="100px" TextAlign="Center" ColumnID="Action_By" DataField="Action_By" HeaderText="责任单位<br>Action By" />
 
@@ -197,7 +198,7 @@
                         <%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Corrected_Photos" DataField="Corrected_Photos" HeaderText="Corrected Photos" />--%>
 
 
-                        <f:RenderField Width="150px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="实际完成时间<br>Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
+                        <f:RenderField Width="120px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="实际完成时间<br>Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
                         <f:GroupField HeaderText="Cleared(PIC）监理核查" TextAlign="Center" MinWidth="200px">
                             <Columns>
@@ -223,9 +224,9 @@
                             </Columns>
                         </f:GroupField>
 
-                        <f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="状态<br>Status" />
+                        <f:BoundField Width="120px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="状态<br>Status" />
 
-                        <f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="备注<br>Remark" />
+                        <f:BoundField Width="180px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="备注<br>Remark" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -254,7 +255,7 @@
         </f:Window>
         <f:Window ID="Window1" Title="尾项管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
-            Height="600px">
+            Height="700px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
index baa61888..df04f1b5 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
@@ -17,7 +17,7 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtNum_NO" runat="server" Label="No." LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtNum_NO" runat="server" Label="No." LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                         <f:TextBox ID="txtSystem_No" runat="server" Label="系统号/System No." LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
                         </f:TextBox>
@@ -27,7 +27,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlCat" runat="server" Label="Cat." LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="ddlCat" runat="server" Label="Cat." LabelWidth="160px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
                             <f:ListItem Value="A" Text="A"></f:ListItem>
                             <f:ListItem Value="B" Text="B"></f:ListItem>
@@ -42,7 +42,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtDisc" runat="server" Label="专业/Disc." LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtDisc" runat="server" Label="专业/Disc." LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                         <f:DropDownList ID="ddlIsEng" runat="server" Label="设计需求/Eng(Y/N)" LabelWidth="180px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
@@ -51,7 +51,7 @@
                         </f:DropDownList>
                         <f:DropDownList ID="ddlIsMatI" runat="server" Label="材料需求/Mat’l(Y/N)" LabelWidth="200px" Width="300px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
-                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                            <%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
                             <f:ListItem Value="Y1" Text="Y1"></f:ListItem>
                             <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
                             <f:ListItem Value="N" Text="N"></f:ListItem>
@@ -60,10 +60,11 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="txtPunch_Type" runat="server" Label="尾项类别/Punch Type" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="txtPunch_Type" runat="server" Label="尾项类别/Punch Type" LabelWidth="160px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
                             <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
-                            <f:ListItem Value="FWD" Text="FWD"></f:ListItem>
+                            <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
+                            <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
                         </f:DropDownList>
                         <f:DatePicker runat="server" Label="要求完成时间/Required Date" ID="txtRequired_Date" LabelAlign="Right" LabelWidth="210px" Required="true" ShowRedStar="true">
                         </f:DatePicker>
@@ -73,22 +74,22 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtPIC" runat="server" Label="责任人PIC" LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtPIC" runat="server" Label="责任人PIC" LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                         <f:TextBox ID="txtPIC_WUH" runat="server" Label="责任人-五环/PIC-WUH" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
                         </f:TextBox>
-                        <f:DatePicker runat="server" Label="实际完成时间/Actual Date" ID="txtActual_Date" LabelAlign="Right" LabelWidth="180px" Width="300px">
+                        <f:DatePicker runat="server" Label="实际完成时间/Actual Date" ID="txtActual_Date" LabelAlign="Right" LabelWidth="200px" Width="300px">
                         </f:DatePicker>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea ID="txtDESCRIPTION" runat="server" Label="尾项内容/Description" LabelAlign="Right" LabelWidth="180px"></f:TextArea>
+                        <f:TextArea ID="txtDESCRIPTION" runat="server" Label="尾项内容/Description" LabelAlign="Right" LabelWidth="160px"></f:TextArea>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea ID="txtCorrection_Action" runat="server" Label="整改措施/Correction Action" LabelAlign="Right" LabelWidth="200px" Width="300px">
+                        <f:TextArea ID="txtCorrection_Action" runat="server" Label="整改措施/Correction Action" LabelAlign="Right" LabelWidth="160px" Width="300px">
                         </f:TextArea>
                     </Items>
                 </f:FormRow>
@@ -134,7 +135,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea runat="server" ID="txtRemark" Label="备注/Remark" LabelWidth="200px" MarginTop="10px"></f:TextArea>
+                        <f:TextArea runat="server" ID="txtRemark" Label="备注/Remark" LabelWidth="160px" MarginTop="10px"></f:TextArea>
                     </Items>
                 </f:FormRow>
             </Rows>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index 787bac49..ad5e4d9a 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -90,7 +90,7 @@
                         </f:GroupField>
                         <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center"
+                                <f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Construction" TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>
 
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
index 8ead1e0a..868e9377 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
@@ -53,7 +53,7 @@
                     <Items>
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
-                                <f:DropDownList ID="ddlInternalinspection" runat="server" Label="Internal inspection" LabelWidth="180px">
+                                <f:DropDownList ID="ddlInternalinspection" runat="server" Label="Construction" 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>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index df2b89c2..71396b97 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 />