From 9ce0a751430b0cf70889190a6b5d755963cb9407 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Mon, 18 Nov 2024 19:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=AE=A1=E7=90=86=EF=BC=9B?=
 =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CQMS/Comprehensive/InspectionMachine.aspx |   2 +-
 .../InspectionMachineDataIn.aspx.cs           |   2 +-
 .../File/Excel/DataIn/机具报验导入模板.xls    | Bin 18432 -> 18432 bytes
 .../Transfer/CivilStructure.aspx              |   3 +-
 .../Transfer/CivilStructure.aspx.cs           |  15 ++--
 .../Transfer/CivilStructure.aspx.designer.cs  |   4 +-
 SGGL/FineUIPro.Web/Transfer/Electrical.aspx   |  43 ++++-----
 .../FineUIPro.Web/Transfer/Electrical.aspx.cs |  13 ++-
 .../Transfer/Electrical.aspx.designer.cs      |   4 +-
 .../Transfer/Instrumentation.aspx             |  43 ++++-----
 .../Transfer/Instrumentation.aspx.cs          |  15 ++--
 .../Transfer/Instrumentation.aspx.designer.cs |   4 +-
 .../FineUIPro.Web/Transfer/LHCSystemList.aspx |   6 +-
 SGGL/FineUIPro.Web/Transfer/Piping.aspx       |   2 +-
 .../FineUIPro.Web/Transfer/PunchlistFrom.aspx |  82 +++++++++---------
 .../Transfer/PunchlistFrom.aspx.designer.cs   |  54 ++++++------
 .../Transfer/RotatingEquipment.aspx           |   3 +-
 .../Transfer/RotatingEquipment.aspx.cs        |  11 ++-
 .../RotatingEquipment.aspx.designer.cs        |   4 +-
 .../Transfer/StaticEquipment.aspx             |  47 +++++-----
 .../Transfer/StaticEquipment.aspx.cs          |  11 ++-
 .../Transfer/StaticEquipment.aspx.designer.cs |   4 +-
 SGGL/FineUIPro.Web/Transfer/Telecom.aspx      |   3 +-
 SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs   |  11 ++-
 .../Transfer/Telecom.aspx.designer.cs         |   4 +-
 25 files changed, 213 insertions(+), 177 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
index 91601a21..838acfdf 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
@@ -59,7 +59,7 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField ColumnID="tfPageIndex" Width="80px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
index 2c786170..3edb1a77 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
@@ -542,7 +542,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                             oldViewInfo.TestCycle = pds.Rows[i][7].ToString().Trim();
 
-                            oldViewInfo.IsOnSite = pds.Rows[i][8].ToString().Trim() == "是" ? true : false;
+                            oldViewInfo.IsVerification = pds.Rows[i][8].ToString().Trim() == "是" ? true : false;
 
                             if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
                             {
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls
index 3ba4c985f1ffbbf6c2408c98b0c55d193d2cb65b..c61e5f4a1da55448537a23c3f40b61c15edd2124 100644
GIT binary patch
delta 1197
zcmaJ>O-K}B7=FIlnQvx)W>?KJmo1kPHAqo0bytn?XY;3vQh16eu_%xb>|lpwmO_X+
zBz*^ix)fa`Y^%L_kgcF=3PC|Zb+en-z}Vhz#@*Q!YCh(B=Xsy^Z=R2t%reU?vsZJf
zUiEzS_RGXqv7j!oyW+QMvuEO#mNhl78<@c?I?xU=#Ye>@9utqarDo<|wC29?u8`dU
zh8iG-y(=I8fm(W&{whGN^mE5g@%`1+R@{mM<?-b2s`TrX@l?%?*BpNoxa=0%N0b_r
z{Kh{D`HO{$briRO+n5^ki!TRa^%GFn?o6kR7Nm{h8%aBsGi%?~vqiDlT30{cC0(4I
z!!=x?brYRfA~AL!wxybXX%S%Or{;w0OiI%T_{k`Av%R}PObztqR@&A$Ki>v~AU679
z;_9gy<x{7)n4Dx$kxf1obKL=ZkP=m-DTdKnIO$=9m{g;OeemI)=3$lcQV|bp(2$CG
zn1f@xjMt%K`>@9wFp#p#0{rwI-veGi00GnmJsd<3>tzFkXy`h>$D1&*RhAz{7#GUw
zlX7g`7$lA8Je4q6K+N{E*xgb)WSE6N)KXqU&c1<TWEqD4v%*e}6n?~!UsjMxjyMP6
zB88BTB3$G{N)E7xNJE>1D?$xtNVX#4g!B^9F-npZIRj(Pxw}RE6e&k{QGmE$2?dD@
zl~9N{vxH3IOeuw%7{<6*={>=YinqOIX*Uy(X<tn=GbXkYP2q?$97BW_=R!-avS==w
zyw4nSkcr8G#W$x9Df+Z>{lSDakvn3k$~dW$FHjGu5_Ss>4tDK+oG(=Jl~~LSO^f`{
tljGk11hA-R=5_RA)8`L#g7myTD1Spad-%Oi??EqpK0Wk3WJSAb`~{eL%f0{r

delta 1139
zcmaJ>OH30%82)Cv-M(8<v@Mj_;G-Hztpd_kYnH-Vi3x#V^yI-r6E#v3=|K)ndm%9)
z5^yd?Ie;fUC~9vWlqm7wg>do_6D2W$BUcg){<F(=+eV$q%<T7n|7*Y5Y<ZfMr`d~}
zvLi92mCw(8<zw;$8{(UCi9O`w_JuYdSTC+%6xWfbHHHFi<1+2H=;Xc12!Eic^7Gu!
z*2*`f%Uc2%b^;-6kHzQ@G(#bz+mlUAYE+E^hFv)6_C&qiVcHFU+4Q&T_7>o;cB(tj
zKsf)A$kmugG8!@pivoOOS0p@u!H+vW7oCSt6q%|cS2@u9E*u^@Dl7^c!8Kf^S->$&
z(Ca4e$AfH%hvHi7i#-5rtcb>;Y^dUh0HTaUi*2t6pOKGL-o~FPtb>nscd}VN-#yGi
zd@Vg+D#A-{fYu(MAQ=KPnuQJvOT=jVEo_4glT_ODmnlvQSlA9bw1|Zjx}x<O-a##{
zhjc!#7j(i|m%s%VzPqgiZnzQjSl9y(Ue`3>rKW=}i}%5Ym6~`z{J10<;4?j)rGyX%
zWv1dc<rSk>-`}8}PKNA%reBW{%J%8{iVQ-oK3#DGNrY_VVIUj&Ngfl)=r55vCM2Eo
z&)0BO2#L!xkOOB(785y<BT-D`B2Uq};pryMQ$-%)#GM+PmpES)`H1uRtI&_Ld^vfT
zwerp6Ioh?<BidI}G5+{u7xVK>`Y8)l*3y$qKXx;IH*<&2Ws<K>?~xpX(v#TK>OiGU
zl_jCz;?}RNy)`FLj~n@V%x`2b@PzE-i`m(I7wLP?)1P6S(y6q{FI$!me)>RHM$h+7
XiJwWO)c4-zIDsA<M~V;U7DVtL2(8CP

diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
index e4e1f699..0555a232 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
@@ -24,7 +24,8 @@
 
                                 <f:TextBox runat="server" ID="txtCivil_Structure" Label="Tag.No" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                 <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true" />
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
index eeb23e1f..a827b8bd 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
@@ -63,12 +63,17 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND Test_Package_START <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
-            {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
-            }
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
 
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
+            {
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
+            }
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
             {
                 strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
index 09737e61..3fa9454b 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtCivil_Structure;
 
         /// <summary>
-        /// txtSystem 控件。
+        /// txtSysSubNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
index a81f5f1a..39504c45 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
@@ -12,19 +12,20 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <items>
+            <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
-                    <toolbars>
+                    <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <items>
+                            <Items>
 
                                 <f:TextBox runat="server" ID="txtELECTRICAL" Label="Tag. No" LabelWidth="110px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status">
                                     <f:ListItem Value="" Text="All" Selected="true" />
@@ -55,15 +56,15 @@
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
-                            </items>
+                            </Items>
                         </f:Toolbar>
-                    </toolbars>
-                    <columns>
+                    </Toolbars>
+                    <Columns>
 
                         <f:GroupField HeaderText="ELECTRICAL" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:BoundField MinWidth="220px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
@@ -71,15 +72,15 @@
                         </f:RenderField>
 
                         <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
-                            <columns>
+                            <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 MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/>&Inspection Reocrd" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="150px">
                                 </f:RenderField>
@@ -95,16 +96,16 @@
                                 <f:RenderField ColumnID="LoopTest" DataField="LoopTest" FieldType="String" HeaderText="Loop Test" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="110px">
                                 </f:RenderField>
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:BoundField Width="120px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
 
-                    </columns>
-                    <listeners>
+                    </Columns>
+                    <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </listeners>
-                    <pageitems>
+                    </Listeners>
+                    <PageItems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -114,9 +115,9 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="所有行" Value="100000" />
                         </f:DropDownList>
-                    </pageitems>
+                    </PageItems>
                 </f:Grid>
-            </items>
+            </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"
@@ -128,7 +129,7 @@
             Width="700px" Height="560px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <items>
+            <Items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
 
@@ -137,7 +138,7 @@
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </items>
+            </Items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
index a8224cb9..75554ea0 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
@@ -54,12 +54,17 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND ELECTRICAL like @ELECTRICAL";
                 listStr.Add(new SqlParameter("@ELECTRICAL", "%" + this.txtELECTRICAL.Text.Trim() + "%"));
             }
-            
 
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
 
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
index 3c6bf3e8..9cdef456 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtELECTRICAL;
 
         /// <summary>
-        /// txtSystem 控件。
+        /// txtSysSubNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
index 84ede582..9c38a22e 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
@@ -12,19 +12,20 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <items>
+            <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
-                    <toolbars>
+                    <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <items>
+                            <Items>
 
                                 <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="Tag No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true" />
@@ -55,15 +56,15 @@
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
-                            </items>
+                            </Items>
                         </f:Toolbar>
-                    </toolbars>
-                    <columns>
+                    </Toolbars>
+                    <Columns>
 
                         <f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px">
-                            <columns>
+                            <Columns>
                                 <f:BoundField Width="160px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
@@ -71,15 +72,15 @@
                         </f:RenderField>
 
                         <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
-                            <columns>
+                            <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 MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <%--<f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>--%>
@@ -103,16 +104,16 @@
                                 <f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="90px">
                                 </f:RenderField>
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:BoundField Width="110px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
 
-                    </columns>
-                    <listeners>
+                    </Columns>
+                    <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </listeners>
-                    <pageitems>
+                    </Listeners>
+                    <PageItems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -122,9 +123,9 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="所有行" Value="100000" />
                         </f:DropDownList>
-                    </pageitems>
+                    </PageItems>
                 </f:Grid>
-            </items>
+            </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"
@@ -135,7 +136,7 @@
             Width="700px" Height="560px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <items>
+            <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">
@@ -143,7 +144,7 @@
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </items>
+            </Items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
index 016e59b7..0395381b 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
@@ -70,12 +70,17 @@ namespace FineUIPro.Web.Transfer
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
 
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
-            {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
-            }
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
 
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
+            {
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
+            }
             strSql += " order by INSTRUMENTATION ";
 
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
index 339af77a..83fcc319 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtINSTRUMENTATION;
 
         /// <summary>
-        /// txtSystem 控件。
+        /// txtSysSubNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
index 6f6ceff0..8b4caaf8 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
@@ -65,18 +65,18 @@
 
                         <f:RenderField ColumnID="Commissioningsystemcode" DataField="Commissioningsystemcode"
                             FieldType="String" HeaderText="Commissioning<br/> system code" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="140px">
+                            HeaderTextAlign="Center" MinWidth="160px">
                         </f:RenderField>
 
 
                         <f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription"
                             FieldType="String" HeaderText="Commissioning Code<br/> Description" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="160px">
+                            HeaderTextAlign="Center" MinWidth="300px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="Describe" DataField="Describe"
                             FieldType="String" HeaderText="试车代号描述" TextAlign="Center" Hidden="true"
-                            HeaderTextAlign="Center" MinWidth="120px">
+                            HeaderTextAlign="Center" MinWidth="200px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="SubCommissioningsystem" DataField="SubCommissioningsystem"
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index df9059ec..0bcbfefc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -25,7 +25,7 @@
                                 <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:TextBox runat="server" ID="txtTurnoverSystemCode" Label="Turnover System Code" LabelWidth="140px" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtTurnoverSystemCode" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true" />
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index eb8834ae..697441b4 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -12,17 +12,17 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <items>
+            <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="true">
-                    <toolbars>
+                    <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <items>
+                            <Items>
                                 <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
                                 <f:DropDownList ID="ddlCat" runat="server" Label="Cat." AutoPostBack="true" Width="80px" LabelWidth="40px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="A" Text="A"></f:ListItem>
@@ -32,18 +32,6 @@
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtRaised_By" Label="Raised By" LabelWidth="90px" LabelAlign="Right" Width="150px"></f:TextBox>
                                 <f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
-                                <f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
-                                    <f:ListItem Value="N" Text="N"></f:ListItem>
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="80px" LabelWidth="40px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
-                                    <f:ListItem Value="Y1" Text="Y1"></f:ListItem>
-                                    <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
-                                    <f:ListItem Value="N" Text="N"></f:ListItem>
-                                </f:DropDownList>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
                                 </f:Button>
@@ -54,12 +42,10 @@
                                 </f:Button>
                                 <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="清空数据" OnClick="btnClear_Click" ConfirmText="确定清空所有数据？" Hidden="true">
                                 </f:Button>
-                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
-                                </f:Button>
-                            </items>
+                            </Items>
                         </f:Toolbar>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
-                            <items>
+                            <Items>
                                 <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="180px" LabelWidth="100px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
@@ -74,11 +60,25 @@
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
                                     <f:ListItem Value="In Progress" Text="In Progress"></f:ListItem>
                                 </f:DropDownList>
+                                <f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="100px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
+                                    <f:ListItem Value="Y1" Text="Y1"></f:ListItem>
+                                    <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
-                            </items>
+                            </Items>
                         </f:Toolbar>
                         <%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
@@ -105,8 +105,8 @@
                                 </f:DatePicker>
                             </Items>
                         </f:Toolbar>--%>
-                    </toolbars>
-                    <columns>
+                    </Toolbars>
+                    <Columns>
 
                         <%--<f:GroupField HeaderText="PUNCH LIST FORM" TextAlign="Center">
                             <Columns>
@@ -158,9 +158,9 @@
 
                         <f:TemplateField ColumnID="ImagePhotoes" Width="120px" HeaderText="Photoes" HeaderTextAlign="Center"
                             TextAlign="Left">
-                            <itemtemplate>
+                            <ItemTemplate>
                                 <asp:Label ID="lbPhotoesImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_A") %>'></asp:Label>
-                            </itemtemplate>
+                            </ItemTemplate>
                         </f:TemplateField>
                         <%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Photoes" DataField="Photoes" HeaderText="Photoes" />--%>
 
@@ -190,9 +190,9 @@
 
                         <f:TemplateField ColumnID="ImageCorrected_Photos" Width="150px" HeaderText="Corrected Photos" HeaderTextAlign="Center"
                             TextAlign="Left">
-                            <itemtemplate>
+                            <ItemTemplate>
                                 <asp:Label ID="labCorrected_Photos" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_B") %>'></asp:Label>
-                            </itemtemplate>
+                            </ItemTemplate>
                         </f:TemplateField>
                         <%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Corrected_Photos" DataField="Corrected_Photos" HeaderText="Corrected Photos" />--%>
 
@@ -200,37 +200,37 @@
                         <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:GroupField HeaderText="Cleared(PIC）监理核查" TextAlign="Center" MinWidth="200px">
-                            <columns>
+                            <Columns>
                                 <f:RenderField Width="100px" ColumnID="Cleared_By" DataField="Cleared_By" HeaderText="By" TextAlign="Center" />
                                 <f:RenderField Width="100px" ColumnID="Cleared_Date" DataField="Cleared_Date" HeaderText="Date" TextAlign="Center"
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Confirmed(WUH)确认（五环）" TextAlign="Center" MinWidth="200px">
-                            <columns>
+                            <Columns>
                                 <f:RenderField Width="100px" ColumnID="Confirmed_By" DataField="Confirmed_By" HeaderText="By" TextAlign="Center" />
                                 <f:RenderField Width="100px" ColumnID="Confirmed_Date" DataField="Confirmed_Date" HeaderText="Date" TextAlign="Center"
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:GroupField HeaderText="Verified(BASF)验收" TextAlign="Center" MinWidth="200px">
-                            <columns>
+                            <Columns>
                                 <f:RenderField Width="100px" ColumnID="Verified_By" DataField="Verified_By" HeaderText="By" TextAlign="Center" />
                                 <f:RenderField Width="100px" ColumnID="Verified_Date" DataField="Verified_Date" HeaderText="Date" TextAlign="Center"
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="状态<br>Status" />
 
                         <f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="备注<br>Remark" />
-                    </columns>
-                    <listeners>
+                    </Columns>
+                    <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </listeners>
-                    <pageitems>
+                    </Listeners>
+                    <PageItems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -240,9 +240,9 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="所有行" Value="100000" />
                         </f:DropDownList>
-                    </pageitems>
+                    </PageItems>
                 </f:Grid>
-            </items>
+            </Items>
         </f:Panel>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
@@ -257,7 +257,7 @@
             Height="600px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <items>
+            <Items>
                 <f:MenuButton ID="btnMenuAttachA" runat="server" Icon="FolderUp" Text="Photoes附件" OnClick="btnMenuAttachA_Click" Hidden="true">
                 </f:MenuButton>
                 <f:MenuButton ID="btnMenuAttachB" runat="server" Icon="FolderUp" Text="Corrected_Photos附件" OnClick="btnMenuAttachB_Click" Hidden="true">
@@ -267,7 +267,7 @@
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </items>
+            </Items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index b918de3d..a4598406 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -104,24 +104,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtDisc;
 
-        /// <summary>
-        /// ddlEng 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlEng;
-
-        /// <summary>
-        /// ddlMatI 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlMatI;
-
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -149,15 +131,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnClear;
 
-        /// <summary>
-        /// btnImport 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnImport;
-
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -203,6 +176,33 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlStatus;
 
+        /// <summary>
+        /// ddlEng 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlEng;
+
+        /// <summary>
+        /// ddlMatI 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlMatI;
+
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
index 002665e4..a11a39ba 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -24,7 +24,8 @@
                             <items>
                                 <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Tag. No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                 <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true" />
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
index 9fbe2165..4c6a960b 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
@@ -57,10 +57,15 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND TestPackageSTART <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SYSTEM like @SYSTEM";
+            //    listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SYSTEM like @SYSTEM";
-                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND TestPackage like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
index 594f14c5..609beed2 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtRotatingEquipment;
 
         /// <summary>
-        /// txtSystem 控件。
+        /// txtSysSubNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index 1219b364..50bbb87f 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -12,19 +12,20 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <items>
+            <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="StaticEquipment"
                     SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true">
-                    <toolbars>
+                    <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <items>
+                            <Items>
                                 <f:TextBox runat="server" ID="txtStaticEquipment" Label="Tag No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
@@ -52,10 +53,10 @@
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
-                            </items>
+                            </Items>
                         </f:Toolbar>
-                    </toolbars>
-                    <columns>
+                    </Toolbars>
+                    <Columns>
                         <%-- <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
@@ -63,11 +64,11 @@
                             </ItemTemplate>
                         </f:TemplateField>--%>
                         <f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="220px">
                                 </f:RenderField>
-                            </columns>
+                            </Columns>
                         </f:GroupField>
 
                         <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
@@ -75,7 +76,7 @@
                         </f:RenderField>
 
                         <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="90px">
                                 </f:RenderField>
@@ -85,10 +86,10 @@
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>
-                            </columns>
+                            </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>
@@ -100,20 +101,20 @@
                                 <f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="130px">
                                 </f:RenderField>
-                            </columns>
+                            </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center">
-                            <columns>
+                            <Columns>
                                 <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
                                     HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
-                            </columns>
+                            </Columns>
                         </f:GroupField>
-                    </columns>
-                    <listeners>
+                    </Columns>
+                    <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </listeners>
-                    <pageitems>
+                    </Listeners>
+                    <PageItems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -123,9 +124,9 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="所有行" Value="100000" />
                         </f:DropDownList>
-                    </pageitems>
+                    </PageItems>
                 </f:Grid>
-            </items>
+            </Items>
         </f:Panel>
         <f:Window ID="Window1" Title="设备材料报验" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
@@ -140,14 +141,14 @@
             IsModal="true" Width="700px" Height="500px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <items>
+            <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>
-            </items>
+            </Items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
index d0376113..61ef26c8 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
@@ -51,10 +51,15 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND TestPackageSTART <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SYSTEM like @SYSTEM";
+            //    listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SYSTEM like @SYSTEM";
-                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND TestPackage like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
 
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
index 74b444ad..7a4492e0 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtStaticEquipment;
 
         /// <summary>
-        /// txtSystem 控件。
+        /// txtSysSubNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 控件。
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
index 174b9781..a3d1113c 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
@@ -24,7 +24,8 @@
 
                                 <f:TextBox runat="server" ID="txtTelecom" Label="Tag.No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                 <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
                                     <f:ListItem Value="" Text="All" Selected="true" />
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
index f4b1d74c..c110a2df 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
@@ -64,10 +64,15 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND Test_Package_START <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
             {
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
index 94137797..ee966920 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtTelecom;
 
         /// <summary>
-        /// txtSystem 控件。
+        /// txtSysSubNo 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 控件。