From 951c54533d67fd0e6257c1cd05b39ee37d62ac7b Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Mon, 19 Sep 2022 09:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=90=E6=96=99=E5=92=8C?=
 =?UTF-8?q?=E7=84=8A=E6=8E=A5=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8F=8A=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SGGLDB_V2022-09-19修改明细.txt        |   3 +
 .../1-5焊接管理（Menu_HJGL）.sql        |  14 +-
 .../FineUIPro.Web/CLGL/ArrivalDetailList.aspx |  14 +-
 .../CLGL/ArrivalDetailList.aspx.cs            |  54 ++++-
 .../CLGL/ArrivalDetailList.aspx.designer.cs   |  85 +++++++-
 .../CLGL/CheckOutDetailList.aspx              |  23 ++-
 .../CLGL/CheckOutDetailList.aspx.cs           |  78 +++++++-
 .../CLGL/CheckOutDetailList.aspx.designer.cs  | 130 ++++++++++++-
 SGGL/FineUIPro.Web/CLGL/ContractList.aspx     |  22 ++-
 SGGL/FineUIPro.Web/CLGL/ContractList.aspx.cs  |  72 ++++++-
 .../CLGL/ContractList.aspx.designer.cs        | 121 +++++++++++-
 SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx  |  17 +-
 .../CLGL/ContractListSum.aspx.cs              |  36 +++-
 .../CLGL/ContractListSum.aspx.designer.cs     |  67 ++++++-
 SGGL/FineUIPro.Web/CLGL/MTODetail.aspx        |  18 +-
 SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs     |  78 +++++++-
 .../CLGL/MTODetail.aspx.designer.cs           | 121 +++++++++++-
 .../CLGL/PipelineMaterialCodeList.aspx        |  28 ++-
 .../CLGL/PipelineMaterialCodeList.aspx.cs     |  90 ++++++++-
 .../PipelineMaterialCodeList.aspx.designer.cs | 148 +++++++++++++-
 .../CLGL/PipelineMaterialList.aspx            |  28 ++-
 .../CLGL/PipelineMaterialList.aspx.cs         | 114 ++++++++++-
 .../PipelineMaterialList.aspx.designer.cs     | 184 +++++++++++++++++-
 .../CLGL/PipelineSupplierList.aspx            |  21 +-
 .../CLGL/PipelineSupplierList.aspx.cs         |  33 +++-
 .../PipelineSupplierList.aspx.designer.cs     |  49 ++++-
 SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx       |  23 ++-
 SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs    |   4 +-
 .../HJGL/FL/PressurePackageList.aspx          |  41 +++-
 .../HJGL/FL/PressurePackageList.aspx.cs       |   7 +-
 SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx      |  34 +++-
 SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs   |   5 +-
 SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx  |  25 +--
 SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx |  16 +-
 .../HJGL/FL/TotalQuantity.aspx.cs             |   3 +-
 .../common/mainMenu_HJGL.aspx.cs              |  12 +-
 36 files changed, 1728 insertions(+), 90 deletions(-)
 create mode 100644 DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-19修改明细.txt

diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-19修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-19修改明细.txt
new file mode 100644
index 00000000..fde21735
--- /dev/null
+++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-19修改明细.txt
@@ -0,0 +1,3 @@
+--ADD BY gaofei  2022-09-19
+1,优化材料和焊接数据页面显示及筛选功能
+--END
diff --git a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
index d963614c..aa445ac9 100644
--- a/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
+++ b/DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
@@ -2,25 +2,25 @@
 --delete from Sys_Menu where MenuType='Menu_HJGL'
  --------------------------------------------�ֳ�����--------------------------------------------------------
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('02296D33-17A9-43FE-B764-AA5A6AF0E85E','�ܵ����ӹ�����','HJGL/FL/TotalQuantity.aspx',10,'0','Menu_HJGL',0,1,1)
+VALUES('02296D33-17A9-43FE-B764-AA5A6AF0E85E','�ܵ����ӹ���������һ��','HJGL/FL/TotalQuantity.aspx',10,'0','Menu_HJGL',0,1,1)
 GO
 
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('BC27FBEC-DA1D-4909-880E-499A294CCB1B','���ӹ�������','HJGL/FL/Quantity.aspx',20,'0','Menu_HJGL',0,1,1)
+VALUES('BC27FBEC-DA1D-4909-880E-499A294CCB1B','�ܵ����ӹ�������������','HJGL/FL/Quantity.aspx',20,'0','Menu_HJGL',0,1,1)
 GO
 
+--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--VALUES('B94CCB2F-58FB-428F-A3CB-68EA712289E1','������һ�κϸ���','HJGL/FL/OneOKRate.aspx',30,'0','Menu_HJGL',0,1,1)
+--GO
+
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('B94CCB2F-58FB-428F-A3CB-68EA712289E1','������һ�κϸ���','HJGL/FL/OneOKRate.aspx',30,'0','Menu_HJGL',0,1,1)
+VALUES('5F999DDA-9C8A-452F-A313-3270BA76C5F8','����������','HJGL/FL/NdtList.aspx',30,'0','Menu_HJGL',0,1,1)
 GO
 
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 VALUES('B1A3F19F-2512-4F71-A2E3-3F1C436CC624','��ѹ������','HJGL/FL/PressurePackageList.aspx',40,'0','Menu_HJGL',0,1,1)
 GO
 
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('5F999DDA-9C8A-452F-A313-3270BA76C5F8','����������','HJGL/FL/NdtList.aspx',50,'0','Menu_HJGL',0,1,1)
-GO
-
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 VALUES('FD7A2F80-329A-4306-9887-712F3CCEA392','β���嵥����','HJGL/FL/TailItemList.aspx',60,'0','Menu_HJGL',0,1,1)
 GO
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx b/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx
index 539cb1ff..52790a71 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx
@@ -30,8 +30,20 @@
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
                      <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtC1" Label="供应商名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC2" Label="合同号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC3" Label="请购单号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC4" Label="箱号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC5" Label="材料编码" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC6" Label="位号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC30" Label="到货批次号" LabelAlign="Right"></f:TextBox>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.cs
index d1ad6698..d85fb309 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.cs
@@ -70,9 +70,45 @@ namespace FineUIPro.Web.CLGL
         {
             string strSql = @"select *
                             from dbo.CLGL_ArrivalDetailList c 
-                            where c.ProjectId=@ProjectId order by c.C3 desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtC1.Text.Trim()))
+            {
+                strSql += " AND c.C1 like @C1";
+                listStr.Add(new SqlParameter("@C1", "%" + txtC1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC2.Text.Trim()))
+            {
+                strSql += " AND c.C2 like @C2";
+                listStr.Add(new SqlParameter("@C2", "%" + txtC2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC3.Text.Trim()))
+            {
+                strSql += " AND c.C3 like @C3";
+                listStr.Add(new SqlParameter("@C3", "%" + txtC3.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC4.Text.Trim()))
+            {
+                strSql += " AND c.C4 like @C4";
+                listStr.Add(new SqlParameter("@C4", "%" + txtC4.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC5.Text.Trim()))
+            {
+                strSql += " AND c.C5 like @C5";
+                listStr.Add(new SqlParameter("@C5", "%" + txtC5.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC6.Text.Trim()))
+            {
+                strSql += " AND c.C6 like @C6";
+                listStr.Add(new SqlParameter("@C6", "%" + txtC6.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC30.Text.Trim()))
+            {
+                strSql += " AND c.C30 like @C30";
+                listStr.Add(new SqlParameter("@C30", "%" + txtC30.Text.Trim() + "%"));
+            }
+            strSql += " order by c.C3 desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +118,22 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtC1.Text = "";
+            txtC2.Text = "";
+            txtC3.Text = "";
+            txtC4.Text = "";
+            txtC5.Text = "";
+            txtC6.Text = "";
+            txtC30.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.designer.cs
index 34a2d4da..edb4c33e 100644
--- a/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ArrivalDetailList.aspx.designer.cs
@@ -49,13 +49,94 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtC1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC1;
+        
+        /// <summary>
+        /// txtC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC2;
+        
+        /// <summary>
+        /// txtC3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC3;
+        
+        /// <summary>
+        /// txtC4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC4;
+        
+        /// <summary>
+        /// txtC5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC5;
+        
+        /// <summary>
+        /// txtC6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC6;
+        
+        /// <summary>
+        /// txtC30 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC30;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx b/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx
index 1523a0ea..82c07d0c 100644
--- a/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx
@@ -30,8 +30,29 @@
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
                      <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtC1" Label="专业" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC2" Label="领料单号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC3" Label="领料时间" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC4" Label="出库原因" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC5" Label="物资类别" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC7" Label="领料单位" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC12" Label="材料名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC13" Label="材料编码" LabelAlign="Right"></f:TextBox>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                               
+                                <f:TextBox runat="server" ID="txtC14" Label="位号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC23" Label="装置号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC24" Label="管线号" LabelAlign="Right"></f:TextBox>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
diff --git a/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.cs b/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.cs
index 01b6e04f..1f4c8a18 100644
--- a/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.cs
@@ -70,9 +70,65 @@ namespace FineUIPro.Web.CLGL
         {
             string strSql = @"select *
                             from dbo.CLGL_CheckOutDetailList c 
-                            where c.ProjectId=@ProjectId order by c.C3 desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtC1.Text.Trim()))
+            {
+                strSql += " AND c.C1 like @C1";
+                listStr.Add(new SqlParameter("@C1", "%" + txtC1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC2.Text.Trim()))
+            {
+                strSql += " AND c.C2 like @C2";
+                listStr.Add(new SqlParameter("@C2", "%" + txtC2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC3.Text.Trim()))
+            {
+                strSql += " AND c.C3 like @C3";
+                listStr.Add(new SqlParameter("@C3", "%" + txtC3.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC4.Text.Trim()))
+            {
+                strSql += " AND c.C4 like @C4";
+                listStr.Add(new SqlParameter("@C4", "%" + txtC4.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC5.Text.Trim()))
+            {
+                strSql += " AND c.C5 like @C5";
+                listStr.Add(new SqlParameter("@C5", "%" + txtC5.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC7.Text.Trim()))
+            {
+                strSql += " AND c.C7 like @C7";
+                listStr.Add(new SqlParameter("@C7", "%" + txtC7.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC12.Text.Trim()))
+            {
+                strSql += " AND c.C12 like @C12";
+                listStr.Add(new SqlParameter("@C12", "%" + txtC12.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC13.Text.Trim()))
+            {
+                strSql += " AND c.C13 like @C13";
+                listStr.Add(new SqlParameter("@C13", "%" + txtC13.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC14.Text.Trim()))
+            {
+                strSql += " AND c.C14 like @C14";
+                listStr.Add(new SqlParameter("@C14", "%" + txtC14.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC23.Text.Trim()))
+            {
+                strSql += " AND c.C23 like @C23";
+                listStr.Add(new SqlParameter("@C23", "%" + txtC23.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC24.Text.Trim()))
+            {
+                strSql += " AND c.C24 like @C24";
+                listStr.Add(new SqlParameter("@C24", "%" + txtC24.Text.Trim() + "%"));
+            }
+            strSql += " order by c.C3 desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +138,26 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtC1.Text = "";
+            txtC2.Text = "";
+            txtC3.Text = "";
+            txtC4.Text = "";
+            txtC5.Text = "";
+            txtC7.Text = "";
+            txtC12.Text = "";
+            txtC13.Text = "";
+            txtC14.Text = "";
+            txtC23.Text = "";
+            txtC24.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.designer.cs
index 551c30f6..f7bdeea4 100644
--- a/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/CheckOutDetailList.aspx.designer.cs
@@ -49,13 +49,139 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtC1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC1;
+        
+        /// <summary>
+        /// txtC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC2;
+        
+        /// <summary>
+        /// txtC3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC3;
+        
+        /// <summary>
+        /// txtC4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC4;
+        
+        /// <summary>
+        /// txtC5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC5;
+        
+        /// <summary>
+        /// txtC7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC7;
+        
+        /// <summary>
+        /// txtC12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC12;
+        
+        /// <summary>
+        /// txtC13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC13;
+        
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+        
+        /// <summary>
+        /// txtC14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC14;
+        
+        /// <summary>
+        /// txtC23 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC23;
+        
+        /// <summary>
+        /// txtC24 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC24;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/CLGL/ContractList.aspx b/SGGL/FineUIPro.Web/CLGL/ContractList.aspx
index 6b67ee84..53aacddb 100644
--- a/SGGL/FineUIPro.Web/CLGL/ContractList.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/ContractList.aspx
@@ -30,8 +30,28 @@
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
                      <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtC1" Label="合同号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC2" Label="合同名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC3" Label="请购单号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC4" Label="专业" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC7" Label="供应商" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC8" Label="材料编码" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC9" Label="位号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC20" Label="装置号" LabelAlign="Right"></f:TextBox>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                               
+                                <f:TextBox runat="server" ID="txtC21" Label="主项号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC22" Label="材料用途" LabelAlign="Right"></f:TextBox>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
diff --git a/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.cs
index 6e5b245d..d2721a0b 100644
--- a/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.cs
@@ -70,9 +70,60 @@ namespace FineUIPro.Web.CLGL
         {
             string strSql = @"select *
                             from dbo.CLGL_ContractList c 
-                            where c.ProjectId=@ProjectId order by c.C5 desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtC1.Text.Trim()))
+            {
+                strSql += " AND c.C1 like @C1";
+                listStr.Add(new SqlParameter("@C1", "%" + txtC1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC2.Text.Trim()))
+            {
+                strSql += " AND c.C2 like @C2";
+                listStr.Add(new SqlParameter("@C2", "%" + txtC2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC3.Text.Trim()))
+            {
+                strSql += " AND c.C3 like @C3";
+                listStr.Add(new SqlParameter("@C3", "%" + txtC3.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC4.Text.Trim()))
+            {
+                strSql += " AND c.C4 like @C4";
+                listStr.Add(new SqlParameter("@C4", "%" + txtC4.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC7.Text.Trim()))
+            {
+                strSql += " AND c.C7 like @C7";
+                listStr.Add(new SqlParameter("@C7", "%" + txtC7.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC8.Text.Trim()))
+            {
+                strSql += " AND c.C8 like @C8";
+                listStr.Add(new SqlParameter("@C8", "%" + txtC8.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC9.Text.Trim()))
+            {
+                strSql += " AND c.C9 like @C9";
+                listStr.Add(new SqlParameter("@C9", "%" + txtC9.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC20.Text.Trim()))
+            {
+                strSql += " AND c.C20 like @C20";
+                listStr.Add(new SqlParameter("@C20", "%" + txtC20.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC21.Text.Trim()))
+            {
+                strSql += " AND c.C21 like @C21";
+                listStr.Add(new SqlParameter("@C21", "%" + txtC21.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC22.Text.Trim()))
+            {
+                strSql += " AND c.C22 like @C22";
+                listStr.Add(new SqlParameter("@C22", "%" + txtC22.Text.Trim() + "%"));
+            }
+            strSql += " order by c.C5 desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +133,25 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtC1.Text = "";
+            txtC2.Text = "";
+            txtC3.Text = "";
+            txtC4.Text = "";
+            txtC7.Text = "";
+            txtC8.Text = "";
+            txtC9.Text = "";
+            txtC20.Text = "";
+            txtC21.Text = "";
+            txtC22.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.designer.cs
index 78320c63..e329282c 100644
--- a/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ContractList.aspx.designer.cs
@@ -49,13 +49,130 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtC1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC1;
+        
+        /// <summary>
+        /// txtC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC2;
+        
+        /// <summary>
+        /// txtC3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC3;
+        
+        /// <summary>
+        /// txtC4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC4;
+        
+        /// <summary>
+        /// txtC7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC7;
+        
+        /// <summary>
+        /// txtC8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC8;
+        
+        /// <summary>
+        /// txtC9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC9;
+        
+        /// <summary>
+        /// txtC20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC20;
+        
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+        
+        /// <summary>
+        /// txtC21 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC21;
+        
+        /// <summary>
+        /// txtC22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC22;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx b/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx
index cf184ef6..c956658e 100644
--- a/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx
@@ -29,9 +29,22 @@
                      DataIDField="Id" AllowSorting="true" SortField="C5" 
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
-                     <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                    <Toolbars>
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtC1" Label="专业" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC2" Label="合同号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC3" Label="合同名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC4" Label="供货商" LabelAlign="Right"></f:TextBox>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
diff --git a/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.cs b/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.cs
index 7102815a..3b7fe9c1 100644
--- a/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.cs
@@ -70,9 +70,30 @@ namespace FineUIPro.Web.CLGL
         {
             string strSql = @"select *
                             from dbo.CLGL_ContractListSum c 
-                            where c.ProjectId=@ProjectId order by c.C5 desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtC1.Text.Trim()))
+            {
+                strSql += " AND c.C1 like @C1";
+                listStr.Add(new SqlParameter("@C1", "%" + txtC1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC2.Text.Trim()))
+            {
+                strSql += " AND c.C2 like @C2";
+                listStr.Add(new SqlParameter("@C2", "%" + txtC2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC3.Text.Trim()))
+            {
+                strSql += " AND c.C3 like @C3";
+                listStr.Add(new SqlParameter("@C3", "%" + txtC3.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC4.Text.Trim()))
+            {
+                strSql += " AND c.C4 like @C4";
+                listStr.Add(new SqlParameter("@C4", "%" + txtC4.Text.Trim() + "%"));
+            }
+            strSql += " order by c.C5 desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +103,19 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtC1.Text = "";
+            txtC2.Text = "";
+            txtC3.Text = "";
+            txtC4.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.designer.cs
index 7189e211..cab1c49b 100644
--- a/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/ContractListSum.aspx.designer.cs
@@ -49,13 +49,76 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtC1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC1;
+        
+        /// <summary>
+        /// txtC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC2;
+        
+        /// <summary>
+        /// txtC3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC3;
+        
+        /// <summary>
+        /// txtC4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC4;
+        
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx
index ef21187c..6f5cbf41 100644
--- a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx
@@ -30,8 +30,24 @@
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
                      <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtDeviceNo" Label="装置号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtIsoNo" Label="区域管线号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtMaterialCode" Label="材料编码" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSIZE1" Label="SIZE1" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSIZE2" Label="SIZE2" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSCH1" Label="SCH1" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSCH2" Label="SCH2" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPressClass" Label="压力等级" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtEndFace" Label="端面" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtStandard" Label="标准" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtMaterial" Label="材质" LabelAlign="Right"></f:TextBox>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
diff --git a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs
index 98b36f6e..37ba21c6 100644
--- a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.cs
@@ -70,9 +70,65 @@ namespace FineUIPro.Web.CLGL
         {
             string strSql = @"select *
                             from dbo.CLGL_MTODetail c 
-                            where c.ProjectId=@ProjectId order by c.MaterialCode desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtDeviceNo.Text.Trim()))
+            {
+                strSql += " AND c.DeviceNo like @DeviceNo";
+                listStr.Add(new SqlParameter("@DeviceNo", "%" + txtDeviceNo.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtIsoNo.Text.Trim()))
+            {
+                strSql += " AND c.IsoNo like @IsoNo";
+                listStr.Add(new SqlParameter("@IsoNo", "%" + txtIsoNo.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
+            {
+                strSql += " AND c.MaterialCode like @MaterialCode";
+                listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtSIZE1.Text.Trim()))
+            {
+                strSql += " AND c.SIZE1 like @SIZE1";
+                listStr.Add(new SqlParameter("@SIZE1", "%" + txtSIZE1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtSIZE2.Text.Trim()))
+            {
+                strSql += " AND c.SIZE2 like @SIZE2";
+                listStr.Add(new SqlParameter("@SIZE2", "%" + txtSIZE2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtSCH1.Text.Trim()))
+            {
+                strSql += " AND c.SCH1 like @SCH1";
+                listStr.Add(new SqlParameter("@SCH1", "%" + txtSCH1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtSCH2.Text.Trim()))
+            {
+                strSql += " AND c.SCH2 like @SCH2";
+                listStr.Add(new SqlParameter("@SCH2", "%" + txtSCH2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtPressClass.Text.Trim()))
+            {
+                strSql += " AND c.PressClass like @PressClass";
+                listStr.Add(new SqlParameter("@PressClass", "%" + txtPressClass.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtEndFace.Text.Trim()))
+            {
+                strSql += " AND c.EndFace like @EndFace";
+                listStr.Add(new SqlParameter("@EndFace", "%" + txtEndFace.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtStandard.Text.Trim()))
+            {
+                strSql += " AND c.Standard like @Standard";
+                listStr.Add(new SqlParameter("@Standard", "%" + txtStandard.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtMaterial.Text.Trim()))
+            {
+                strSql += " AND c.Material like @Material";
+                listStr.Add(new SqlParameter("@Material", "%" + txtMaterial.Text.Trim() + "%"));
+            }
+            strSql += " order by c.MaterialCode desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +138,26 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtDeviceNo.Text = "";
+            txtIsoNo.Text = "";
+            txtMaterialCode.Text = "";
+            txtSIZE1.Text = "";
+            txtSIZE2.Text = "";
+            txtSCH1.Text = "";
+            txtSCH2.Text = "";
+            txtPressClass.Text = "";
+            txtEndFace.Text = "";
+            txtStandard.Text = "";
+            txtMaterial.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.designer.cs
index 45d8a3eb..1d3a7c8a 100644
--- a/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/MTODetail.aspx.designer.cs
@@ -49,13 +49,130 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtDeviceNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDeviceNo;
+        
+        /// <summary>
+        /// txtIsoNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIsoNo;
+        
+        /// <summary>
+        /// txtMaterialCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterialCode;
+        
+        /// <summary>
+        /// txtSIZE1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSIZE1;
+        
+        /// <summary>
+        /// txtSIZE2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSIZE2;
+        
+        /// <summary>
+        /// txtSCH1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSCH1;
+        
+        /// <summary>
+        /// txtSCH2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSCH2;
+        
+        /// <summary>
+        /// txtPressClass 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPressClass;
+        
+        /// <summary>
+        /// txtEndFace 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEndFace;
+        
+        /// <summary>
+        /// txtStandard 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtStandard;
+        
+        /// <summary>
+        /// txtMaterial 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterial;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx
index 2facf3e2..cfd481cc 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx
@@ -29,9 +29,33 @@
                      DataIDField="Id" AllowSorting="true" SortField="C1" 
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
-                     <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                    <Toolbars>
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtC1" Label="材料编码" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC2" Label="位号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC3" Label="材料名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC4" Label="SIZE1" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC5" Label="SIZE2" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC6" Label="SCH1" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC7" Label="SCH2" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC8" Label="压力等级" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC9" Label="端面" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC10" Label="螺栓长度" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC11" Label="标准" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC12" Label="材质" LabelAlign="Right"></f:TextBox>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                               
+                                
+                                <f:TextBox runat="server" ID="txtC13" Label="装置号" LabelAlign="Right"></f:TextBox>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.cs b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.cs
index dba49b84..4c6a024e 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.cs
@@ -70,9 +70,75 @@ namespace FineUIPro.Web.CLGL
         {
             string strSql = @"select *
                             from dbo.CLGL_PipelineMaterialCodeList c 
-                            where c.ProjectId=@ProjectId order by c.C1 desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtC1.Text.Trim()))
+            {
+                strSql += " AND c.C1 like @C1";
+                listStr.Add(new SqlParameter("@C1", "%" + txtC1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC2.Text.Trim()))
+            {
+                strSql += " AND c.C2 like @C2";
+                listStr.Add(new SqlParameter("@C2", "%" + txtC2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC3.Text.Trim()))
+            {
+                strSql += " AND c.C3 like @C3";
+                listStr.Add(new SqlParameter("@C3", "%" + txtC3.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC4.Text.Trim()))
+            {
+                strSql += " AND c.C4 like @C4";
+                listStr.Add(new SqlParameter("@C4", "%" + txtC4.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC5.Text.Trim()))
+            {
+                strSql += " AND c.C5 like @C5";
+                listStr.Add(new SqlParameter("@C5", "%" + txtC5.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC6.Text.Trim()))
+            {
+                strSql += " AND c.C6 like @C6";
+                listStr.Add(new SqlParameter("@C6", "%" + txtC6.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC7.Text.Trim()))
+            {
+                strSql += " AND c.C7 like @C7";
+                listStr.Add(new SqlParameter("@C7", "%" + txtC7.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC8.Text.Trim()))
+            {
+                strSql += " AND c.C8 like @C8";
+                listStr.Add(new SqlParameter("@C8", "%" + txtC8.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC9.Text.Trim()))
+            {
+                strSql += " AND c.C9 like @C9";
+                listStr.Add(new SqlParameter("@C9", "%" + txtC9.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC10.Text.Trim()))
+            {
+                strSql += " AND c.C10 like @C10";
+                listStr.Add(new SqlParameter("@C10", "%" + txtC10.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC11.Text.Trim()))
+            {
+                strSql += " AND c.C11 like @C11";
+                listStr.Add(new SqlParameter("@C11", "%" + txtC11.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC12.Text.Trim()))
+            {
+                strSql += " AND c.C12 like @C12";
+                listStr.Add(new SqlParameter("@C12", "%" + txtC12.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC13.Text.Trim()))
+            {
+                strSql += " AND c.C13 like @C13";
+                listStr.Add(new SqlParameter("@C13", "%" + txtC13.Text.Trim() + "%"));
+            }
+            strSql += " order by c.C1 desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +148,28 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtC1.Text = "";
+            txtC2.Text = "";
+            txtC3.Text = "";
+            txtC4.Text = "";
+            txtC5.Text = "";
+            txtC6.Text = "";
+            txtC7.Text = "";
+            txtC8.Text = "";
+            txtC9.Text = "";
+            txtC10.Text = "";
+            txtC11.Text = "";
+            txtC12.Text = "";
+            txtC13.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.designer.cs
index fa1588c8..4bcbd194 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialCodeList.aspx.designer.cs
@@ -49,13 +49,157 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtC1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC1;
+        
+        /// <summary>
+        /// txtC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC2;
+        
+        /// <summary>
+        /// txtC3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC3;
+        
+        /// <summary>
+        /// txtC4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC4;
+        
+        /// <summary>
+        /// txtC5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC5;
+        
+        /// <summary>
+        /// txtC6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC6;
+        
+        /// <summary>
+        /// txtC7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC7;
+        
+        /// <summary>
+        /// txtC8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC8;
+        
+        /// <summary>
+        /// txtC9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC9;
+        
+        /// <summary>
+        /// txtC10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC10;
+        
+        /// <summary>
+        /// txtC11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC11;
+        
+        /// <summary>
+        /// txtC12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC12;
+        
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+        
+        /// <summary>
+        /// txtC13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC13;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx
index 08a93a87..75905650 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx
@@ -30,8 +30,34 @@
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
                      <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtC1" Label="主项号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC2" Label="材料编码" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC3" Label="材料名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC4" Label="位号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC6" Label="SIZE1" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC7" Label="SIZE2" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC8" Label="SCH1" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC9" Label="SCH2" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC13" Label="材质" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC14" Label="标准" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC15" Label="材料用途" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC21" Label="采购包编号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC22" Label="采购包名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC23" Label="合同号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC24" Label="请购单号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC26" Label="专业名称" LabelAlign="Right"></f:TextBox>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox runat="server" ID="txtC29" Label="供货商" LabelAlign="Right"></f:TextBox>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.cs b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.cs
index 31890a23..9da161ef 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.cs
@@ -70,9 +70,95 @@ namespace FineUIPro.Web.CLGL
         {
             string strSql = @"select *
                             from dbo.CLGL_PipelineMaterialList c 
-                            where c.ProjectId=@ProjectId order by c.C28 desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtC1.Text.Trim()))
+            {
+                strSql += " AND c.C1 like @C1";
+                listStr.Add(new SqlParameter("@C1", "%" + txtC1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC2.Text.Trim()))
+            {
+                strSql += " AND c.C2 like @C2";
+                listStr.Add(new SqlParameter("@C2", "%" + txtC2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC3.Text.Trim()))
+            {
+                strSql += " AND c.C3 like @C3";
+                listStr.Add(new SqlParameter("@C3", "%" + txtC3.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC4.Text.Trim()))
+            {
+                strSql += " AND c.C4 like @C4";
+                listStr.Add(new SqlParameter("@C4", "%" + txtC4.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC6.Text.Trim()))
+            {
+                strSql += " AND c.C6 like @C6";
+                listStr.Add(new SqlParameter("@C6", "%" + txtC6.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC7.Text.Trim()))
+            {
+                strSql += " AND c.C7 like @C7";
+                listStr.Add(new SqlParameter("@C7", "%" + txtC7.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC8.Text.Trim()))
+            {
+                strSql += " AND c.C8 like @C8";
+                listStr.Add(new SqlParameter("@C8", "%" + txtC8.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC9.Text.Trim()))
+            {
+                strSql += " AND c.C9 like @C9";
+                listStr.Add(new SqlParameter("@C9", "%" + txtC9.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC13.Text.Trim()))
+            {
+                strSql += " AND c.C13 like @C13";
+                listStr.Add(new SqlParameter("@C13", "%" + txtC13.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC14.Text.Trim()))
+            {
+                strSql += " AND c.C14 like @C14";
+                listStr.Add(new SqlParameter("@C14", "%" + txtC14.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC15.Text.Trim()))
+            {
+                strSql += " AND c.C15 like @C15";
+                listStr.Add(new SqlParameter("@C15", "%" + txtC15.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC21.Text.Trim()))
+            {
+                strSql += " AND c.C21 like @C21";
+                listStr.Add(new SqlParameter("@C21", "%" + txtC21.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC22.Text.Trim()))
+            {
+                strSql += " AND c.C22 like @C22";
+                listStr.Add(new SqlParameter("@C22", "%" + txtC22.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC23.Text.Trim()))
+            {
+                strSql += " AND c.C23 like @C23";
+                listStr.Add(new SqlParameter("@C23", "%" + txtC23.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC24.Text.Trim()))
+            {
+                strSql += " AND c.C24 like @C24";
+                listStr.Add(new SqlParameter("@C24", "%" + txtC24.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC26.Text.Trim()))
+            {
+                strSql += " AND c.C26 like @C26";
+                listStr.Add(new SqlParameter("@C26", "%" + txtC26.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC29.Text.Trim()))
+            {
+                strSql += " AND c.C29 like @C29";
+                listStr.Add(new SqlParameter("@C29", "%" + txtC29.Text.Trim() + "%"));
+            }
+            strSql += " order by c.C28 desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +168,32 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtC1.Text = "";
+            txtC2.Text = "";
+            txtC3.Text = "";
+            txtC4.Text = "";
+            txtC6.Text = "";
+            txtC7.Text = "";
+            txtC8.Text = "";
+            txtC9.Text = "";
+            txtC13.Text = "";
+            txtC14.Text = "";
+            txtC15.Text = "";
+            txtC21.Text = "";
+            txtC22.Text = "";
+            txtC23.Text = "";
+            txtC24.Text = "";
+            txtC26.Text = "";
+            txtC29.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.designer.cs
index 951f1646..fe8ce84a 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineMaterialList.aspx.designer.cs
@@ -49,13 +49,193 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtC1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC1;
+        
+        /// <summary>
+        /// txtC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC2;
+        
+        /// <summary>
+        /// txtC3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC3;
+        
+        /// <summary>
+        /// txtC4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC4;
+        
+        /// <summary>
+        /// txtC6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC6;
+        
+        /// <summary>
+        /// txtC7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC7;
+        
+        /// <summary>
+        /// txtC8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC8;
+        
+        /// <summary>
+        /// txtC9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC9;
+        
+        /// <summary>
+        /// txtC13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC13;
+        
+        /// <summary>
+        /// txtC14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC14;
+        
+        /// <summary>
+        /// txtC15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC15;
+        
+        /// <summary>
+        /// txtC21 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC21;
+        
+        /// <summary>
+        /// txtC22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC22;
+        
+        /// <summary>
+        /// txtC23 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC23;
+        
+        /// <summary>
+        /// txtC24 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC24;
+        
+        /// <summary>
+        /// txtC26 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC26;
+        
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+        
+        /// <summary>
+        /// txtC29 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC29;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx b/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx
index f603f819..758b1599 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx
@@ -30,8 +30,16 @@
                     SortDirection="desc" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
                     PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"  EnableTextSelection="True">
                      <Toolbars>
-                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
+                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtC1" Label="供货商" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC2" Label="合同号" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtC3" Label="合同名称" LabelAlign="Right"></f:TextBox>
+                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                 <f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="查询"  Icon="SystemSearch" EnablePostBack="true" runat="server" >
+                                </f:Button>
+                                 <f:Button ID="btnRset"  OnClick="btnRset_Click" ToolTip="重置" Text="重置"   Icon="ArrowUndo" EnablePostBack="true" runat="server" >
+                                </f:Button>
                                 <f:Button ID="btnUrl" Text="进入软件" ToolTip="进入材料软件" Icon="FolderPage" runat="server" OnClick="btnUrl_Click">
                                 </f:Button>
                                 <f:Button ID="btnGetAll" Text="获取全部" ToolTip="从材料系统中获取数据" Icon="FolderPage" Hidden="true" runat="server" OnClick="btnGetAll_Click">
@@ -62,6 +70,9 @@
                         <f:RenderField Width="100px" ColumnID="C6" DataField="C6" SortField="C6"
                             FieldType="String" HeaderText="到货量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Rate" DataField="Rate" SortField="Rate" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="到货百分比" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                     </Columns>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -84,6 +95,14 @@
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
+
+         function renderGender(value) {
+            var returnValue = null;
+            if (value != null) {
+                returnValue = (value * 1).toFixed(2).toString() + "%";
+            }
+            return returnValue;
+        }
     </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.cs b/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.cs
index 19085ff4..bb3d6423 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.cs
@@ -68,11 +68,28 @@ namespace FineUIPro.Web.CLGL
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select *
+            string strSql = @"select *,
+                            cast((case when c.C5='0' or c.C5='' then 0 when c.C6='0' or c.C6='' then 0 else 100.0 * cast(c.C6 as DECIMAL(9,2))/(1.0 * cast(c.C5 as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate
                             from dbo.CLGL_PipelineSupplierList c 
-                            where c.ProjectId=@ProjectId order by c.C4 desc";
+                            where c.ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", BLL.ProjectService.GetCLProjectCodeByProjectId(this.CurrUser.LoginProjectId)));
+            if (!string.IsNullOrEmpty(txtC1.Text.Trim()))
+            {
+                strSql += " AND c.C1 like @C1";
+                listStr.Add(new SqlParameter("@C1", "%" + txtC1.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC2.Text.Trim()))
+            {
+                strSql += " AND c.C2 like @C2";
+                listStr.Add(new SqlParameter("@C2", "%" + txtC2.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtC3.Text.Trim()))
+            {
+                strSql += " AND c.C3 like @C3";
+                listStr.Add(new SqlParameter("@C3", "%" + txtC3.Text.Trim() + "%"));
+            }
+            strSql += " order by c.C4 desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -82,6 +99,18 @@ namespace FineUIPro.Web.CLGL
             Grid1.DataBind();
         }
 
+        protected void btnQuery_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        protected void btnRset_Click(object sender, EventArgs e)
+        {
+            txtC1.Text = "";
+            txtC2.Text = "";
+            txtC3.Text = "";
+            BindGrid();
+        }
+
         #region 分页
         /// <summary>
         /// 分页
diff --git a/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.designer.cs b/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.designer.cs
index 4a922bea..52788349 100644
--- a/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CLGL/PipelineSupplierList.aspx.designer.cs
@@ -49,13 +49,58 @@ namespace FineUIPro.Web.CLGL {
         protected global::FineUIPro.Grid Grid1;
         
         /// <summary>
-        /// Toolbar2 控件。
+        /// Toolbar1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar2;
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtC1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC1;
+        
+        /// <summary>
+        /// txtC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC2;
+        
+        /// <summary>
+        /// txtC3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtC3;
+        
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+        
+        /// <summary>
+        /// btnRset 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRset;
         
         /// <summary>
         /// btnUrl 控件。
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx
index c1125d16..9a684b29 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx
@@ -45,6 +45,9 @@
                     <Columns>
                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
                             TextAlign="Center" />
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
+                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName" 
                             FieldType="String" HeaderText="装置名称" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
@@ -52,11 +55,9 @@
                             FieldType="String" HeaderText="装置号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="ZoneCode" DataField="ZoneCode" SortField="ZoneCode" 
-                            FieldType="String" HeaderText="单元号" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
-                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="工序号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        
                         <f:RenderField Width="100px" ColumnID="TheoreticalWeldedJointsTotal" DataField="TheoreticalWeldedJointsTotal" SortField="TheoreticalWeldedJointsTotal" 
                             FieldType="String" HeaderText="理论检测焊口总量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
@@ -66,12 +67,18 @@
                         <f:RenderField Width="100px" ColumnID="OnceQualifiedQuantity" DataField="OnceQualifiedQuantity" SortField="OnceQualifiedQuantity"
                             FieldType="String" HeaderText="一次合格数量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="OneOKRate" DataField="OneOKRate" SortField="OneOKRate" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="一次检测合格率" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="OneTimeFilmAmount" DataField="OneTimeFilmAmount" SortField="OneTimeFilmAmount"
                             FieldType="String" HeaderText="一次拍片总量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="OneTimeFilmQualifiedAmount" DataField="OneTimeFilmQualifiedAmount" SortField="OneTimeFilmQualifiedAmount"
                             FieldType="String" HeaderText="一次拍片合格量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="OneOKFilmRate" DataField="OneOKFilmRate" SortField="OneOKFilmRate" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="一次拍片合格率" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                     </Columns>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -94,6 +101,14 @@
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
+
+         function renderGender(value) {
+            var returnValue = null;
+            if (value != null) {
+                returnValue = (value * 1).toFixed(2).toString() + "%";
+            }
+            return returnValue;
+        }
     </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs
index 062b0c37..ba1e0129 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/NdtList.aspx.cs
@@ -103,7 +103,9 @@ namespace FineUIPro.Web.HJGL.FL
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select *
+            string strSql = @"select *,
+                            cast((case when c.TestWeldAmount='0' or c.TestWeldAmount='' then 0 when c.OnceQualifiedQuantity='0' or c.OnceQualifiedQuantity='' then 0 else 100.0 * cast(c.OnceQualifiedQuantity as DECIMAL(9,2))/(1.0 * cast(c.TestWeldAmount as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as OneOKRate,
+                            cast((case when c.OneTimeFilmAmount='0' or c.OneTimeFilmAmount='' then 0 when c.OneTimeFilmQualifiedAmount='0' or c.OneTimeFilmQualifiedAmount='' then 0 else 100.0 * cast(c.OneTimeFilmQualifiedAmount as DECIMAL(9,2))/(1.0 * cast(c.OneTimeFilmAmount as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as OneOKFilmRate
                             from dbo.HJGL_FL_NdtList c 
                             where c.ProjectId=@ProjectId order by c.DeviceName,DeviceNumber,ZoneCode";
             List<SqlParameter> listStr = new List<SqlParameter>();
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx
index 6deb48d8..97f243c1 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx
@@ -45,32 +45,33 @@
                     <Columns>
                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
                             TextAlign="Center" />
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
+                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName" 
                             FieldType="String" HeaderText="装置名称" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DeviceNumber" DataField="DeviceNumber" SortField="DeviceNumber" 
                             FieldType="String" HeaderText="装置号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
-                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
+                        
                         <f:RenderField Width="100px" ColumnID="PressurePackageTotalNum" DataField="PressurePackageTotalNum" SortField="PressurePackageTotalNum" 
                             FieldType="String" HeaderText="试压包总量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="CompletePressurePackageNum" DataField="CompletePressurePackageNum" SortField="CompletePressurePackageNum"
                             FieldType="String" HeaderText="试压包完成量" HeaderTextAlign="Center" TextAlign="Left"  >
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Rate1" DataField="Rate1" SortField="Rate1" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="试压包完成率" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="WaterPressurePackageTotalNum" DataField="WaterPressurePackageTotalNum" SortField="WaterPressurePackageTotalNum"
                             FieldType="String" HeaderText="水压包总量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="CompleteWaterPressurePackageCompleteNum" DataField="CompleteWaterPressurePackageCompleteNum" SortField="CompleteWaterPressurePackageCompleteNum"
                             FieldType="String" HeaderText="水压包完成量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="ObservePackageTotalNum" DataField="ObservePackageTotalNum" SortField="ObservePackageTotalNum"
-                            FieldType="String" HeaderText="观察包总量" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="CompleteObservePackageNum" DataField="CompleteObservePackageNum" SortField="CompleteObservePackageNum"
-                            FieldType="String" HeaderText="观察包完成量" HeaderTextAlign="Center" TextAlign="Left">
+                        <f:RenderField Width="100px" ColumnID="Rate2" DataField="Rate2" SortField="Rate2" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="水压包完成率" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="RunPackageTotalNum" DataField="RunPackageTotalNum" SortField="RunPackageTotalNum"
                             FieldType="String" HeaderText="运行包总量" HeaderTextAlign="Center" TextAlign="Left">
@@ -78,12 +79,28 @@
                         <f:RenderField Width="100px" ColumnID="CompleteRunPackageNum" DataField="CompleteRunPackageNum" SortField="CompleteRunPackageNum"
                             FieldType="String" HeaderText="运行包完成量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Rate3" DataField="Rate3" SortField="Rate3" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="运行包完成率" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="AlternativePackageTotalNum" DataField="AlternativePackageTotalNum" SortField="AlternativePackageTotalNum"
                             FieldType="String" HeaderText="替代包总量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="CompleteAlternativePackageNum" DataField="CompleteAlternativePackageNum" SortField="CompleteAlternativePackageNum"
                             FieldType="String" HeaderText="替代包完成量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Rate4" DataField="Rate4" SortField="Rate4" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="替代包完成率" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="ObservePackageTotalNum" DataField="ObservePackageTotalNum" SortField="ObservePackageTotalNum"
+                            FieldType="String" HeaderText="观察包总量" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="CompleteObservePackageNum" DataField="CompleteObservePackageNum" SortField="CompleteObservePackageNum"
+                            FieldType="String" HeaderText="观察包完成量" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Rate5" DataField="Rate5" SortField="Rate5" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="观察包完成率" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        
                     </Columns>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -106,6 +123,14 @@
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
+
+         function renderGender(value) {
+            var returnValue = null;
+            if (value != null) {
+                returnValue = (value * 1).toFixed(2).toString() + "%";
+            }
+            return returnValue;
+        }
     </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs
index 3fdd7b10..bc2c89a5 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/PressurePackageList.aspx.cs
@@ -107,7 +107,12 @@ namespace FineUIPro.Web.HJGL.FL
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select *
+            string strSql = @"select *,
+                            cast((case when c.PressurePackageTotalNum='0' or c.PressurePackageTotalNum='' then 0 when c.CompletePressurePackageNum='0' or c.CompletePressurePackageNum='' then 0 else 100.0 * cast(c.CompletePressurePackageNum as DECIMAL(9,2))/(1.0 * cast(c.PressurePackageTotalNum as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate1,
+                            cast((case when c.WaterPressurePackageTotalNum='0' or c.WaterPressurePackageTotalNum='' then 0 when c.CompleteWaterPressurePackageCompleteNum='0' or c.CompleteWaterPressurePackageCompleteNum='' then 0 else 100.0 * cast(c.CompleteWaterPressurePackageCompleteNum as DECIMAL(9,2))/(1.0 * cast(c.WaterPressurePackageTotalNum as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate2,
+                            cast((case when c.RunPackageTotalNum='0' or c.RunPackageTotalNum='' then 0 when c.CompleteRunPackageNum='0' or c.CompleteRunPackageNum='' then 0 else 100.0 * cast(c.CompleteRunPackageNum as DECIMAL(9,2))/(1.0 * cast(c.RunPackageTotalNum as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate3,
+                            cast((case when c.AlternativePackageTotalNum='0' or c.AlternativePackageTotalNum='' then 0 when c.CompleteAlternativePackageNum='0' or c.CompleteAlternativePackageNum='' then 0 else 100.0 * cast(c.CompleteAlternativePackageNum as DECIMAL(9,2))/(1.0 * cast(c.AlternativePackageTotalNum as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate4,
+                            cast((case when c.ObservePackageTotalNum='0' or c.ObservePackageTotalNum='' then 0 when c.CompleteObservePackageNum='0' or c.CompleteObservePackageNum='' then 0 else 100.0 * cast(c.CompleteObservePackageNum as DECIMAL(9,2))/(1.0 * cast(c.ObservePackageTotalNum as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate5
                             from dbo.HJGL_FL_PressurePackageList c 
                             where c.ProjectId=@ProjectId order by c.DeviceName,DeviceNumber";
             List<SqlParameter> listStr = new List<SqlParameter>();
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx
index de451dd5..31a0dbcc 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx
@@ -51,23 +51,24 @@
                     <Columns>
                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
                             TextAlign="Center" />
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
+                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName" 
                             FieldType="String" HeaderText="装置名称" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DeviceNumber" DataField="DeviceNumber" SortField="DeviceNumber" 
                             FieldType="String" HeaderText="装置号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
-                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="ZoneNumber" DataField="ZoneNumber" SortField="ZoneNumber" 
-                            FieldType="String" HeaderText="区域号" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="工序号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="InchesDiameterTotal" DataField="InchesDiameterTotal" SortField="InchesDiameterTotal"
+                        <%--<f:RenderField Width="100px" ColumnID="InchesDiameterTotal" DataField="InchesDiameterTotal" SortField="InchesDiameterTotal"
                             FieldType="String" HeaderText="焊接完成量" HeaderTextAlign="Center" TextAlign="Left"  >
-                        </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="InchesDiameterFinish" DataField="InchesDiameterFinish" SortField="InchesDiameterFinish"
-                            FieldType="String" HeaderText="已完成量" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>--%>
+                        
+                        <f:RenderField Width="150px" ColumnID="TotalWeldQuantity" DataField="TotalWeldQuantity" SortField="TotalWeldQuantity"
+                            FieldType="String" HeaderText="焊接总量" HeaderTextAlign="Center" TextAlign="Left"  >
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="YesterdayFinish" DataField="YesterdayFinish" SortField="YesterdayFinish"
                             FieldType="String" HeaderText="昨日完成量" HeaderTextAlign="Center" TextAlign="Left">
@@ -78,6 +79,15 @@
                         <f:RenderField Width="100px" ColumnID="WeekInchesDiameterFinish" DataField="WeekInchesDiameterFinish" SortField="WeekInchesDiameterFinish"
                             FieldType="String" HeaderText="周完成量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="WeekRate" DataField="WeekRate" SortField="WeekRate" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="周完成比例" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="InchesDiameterFinish" DataField="InchesDiameterFinish" SortField="InchesDiameterFinish"
+                            FieldType="String" HeaderText="已完成总量" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="Rate" DataField="Rate" SortField="Rate" RendererFunction="renderGender"
+                            FieldType="String" HeaderText="完成比例" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                     </Columns>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -100,6 +110,14 @@
         function reloadGrid() {
             __doPostBack(null, 'reloadGrid');
         }
+
+         function renderGender(value) {
+            var returnValue = null;
+            if (value != null) {
+                returnValue = (value * 1).toFixed(2).toString() + "%";
+            }
+            return returnValue;
+        }
     </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs
index b06c054a..f6263ace 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/Quantity.aspx.cs
@@ -115,7 +115,10 @@ namespace FineUIPro.Web.HJGL.FL
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select *
+            string strSql = @"select *,
+                            (select top 1 TotalWeldQuantity from HJGL_FL_TotalQuantity q where q.ProjectId=@ProjectId and q.DeviceCode=c.ZoneNumber) as TotalWeldQuantity,
+                            cast((case when c.WeekInchesDiameterPlan='0' or c.WeekInchesDiameterPlan='' then 0 when c.WeekInchesDiameterFinish='0' or c.WeekInchesDiameterFinish='' then 0 else 100.0 * cast(c.WeekInchesDiameterFinish as DECIMAL(9,2))/(1.0 * cast(c.WeekInchesDiameterPlan as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as WeekRate,
+                            cast((case when (select top 1 TotalWeldQuantity from HJGL_FL_TotalQuantity q where q.ProjectId=@ProjectId and q.DeviceCode=c.ZoneNumber)='0' or (select top 1 TotalWeldQuantity from HJGL_FL_TotalQuantity q where q.ProjectId=@ProjectId and q.DeviceCode=c.ZoneNumber)='' then 0 when c.InchesDiameterFinish='0' or c.InchesDiameterFinish='' then 0 else 100.0 * cast(c.InchesDiameterFinish as DECIMAL(9,2))/(1.0 * cast((select top 1 TotalWeldQuantity from HJGL_FL_TotalQuantity q where q.ProjectId=@ProjectId and q.DeviceCode=c.ZoneNumber) as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate
                             from dbo.HJGL_FL_Quantity c 
                             where c.ProjectId=@ProjectId order by c.DeviceName,DeviceNumber,ZoneNumber ";
             List<SqlParameter> listStr = new List<SqlParameter>();
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx
index 2603bf8d..868e2c1f 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TailItemList.aspx
@@ -45,38 +45,39 @@
                     <Columns>
                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
                             TextAlign="Center" />
+                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
+                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName" 
                             FieldType="String" HeaderText="装置名称" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="DeviceNumber" DataField="DeviceNumber" SortField="DeviceNumber" 
                             FieldType="String" HeaderText="装置号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="250px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName" 
-                            FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
+                        
                         <f:RenderField Width="100px" ColumnID="RemainingWeldsNumber" DataField="RemainingWeldsNumber" SortField="RemainingWeldsNumber" 
-                            FieldType="String" HeaderText="剩余焊接焊口数" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="剩余焊口数" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="HeatTreatmentsNumber" DataField="HeatTreatmentsNumber" SortField="HeatTreatmentsNumber"
-                            FieldType="String" HeaderText="热处理数" HeaderTextAlign="Center" TextAlign="Left"  >
+                            FieldType="String" HeaderText="剩余热处理数" HeaderTextAlign="Center" TextAlign="Left"  >
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="HardnessTestsNumber" DataField="HardnessTestsNumber" SortField="HardnessTestsNumber"
-                            FieldType="String" HeaderText="硬度检测数" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="剩余硬度检测数" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="UnfinishedButtNumber" DataField="UnfinishedButtNumber" SortField="UnfinishedButtNumber"
-                            FieldType="String" HeaderText="无损检测对接未完数" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="无损检测未完数(对接)" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="UnfinishedCornerJointNumber" DataField="UnfinishedCornerJointNumber" SortField="UnfinishedCornerJointNumber"
-                            FieldType="String" HeaderText="无损检测角接未完数" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="无损检测未完数(角接)" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="UnfinishedBranchPipeNumber" DataField="UnfinishedBranchPipeNumber" SortField="UnfinishedBranchPipeNumber"
-                            FieldType="String" HeaderText="无损检测支管未完数" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="无损检测未完数(支管)" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="ClassAQuantity" DataField="ClassAQuantity" SortField="ClassAQuantity"
-                            FieldType="String" HeaderText="现场检查A类" HeaderTextAlign="Center" TextAlign="Left">
+                        <f:RenderField Width="110px" ColumnID="ClassAQuantity" DataField="ClassAQuantity" SortField="ClassAQuantity"
+                            FieldType="String" HeaderText="A类尾项未完量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="ClassBQuantity" DataField="ClassBQuantity" SortField="ClassBQuantity"
-                            FieldType="String" HeaderText="现场检查B类" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="B类尾项未完量" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                     </Columns>
                     <PageItems>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx
index 3169c819..c4557cf7 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx
@@ -43,15 +43,19 @@
                     <Columns>
                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center"
                             TextAlign="Center" />
-                        <f:RenderField Width="150px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName" 
-                            FieldType="String" HeaderText="装置名称" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
-                        <f:RenderField Width="150px" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode" 
-                            FieldType="String" HeaderText="单元号" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
                         <f:RenderField Width="300px" ColumnID="Unit" DataField="Unit" SortField="Unit" 
                             FieldType="String" HeaderText="施工单位" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="DeviceName" DataField="DeviceName" SortField="DeviceName" 
+                            FieldType="String" HeaderText="装置名称" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="DeviceNo" DataField="DeviceNo" SortField="DeviceNo" 
+                            FieldType="String" HeaderText="装置号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="DeviceCode" DataField="DeviceCode" SortField="DeviceCode" 
+                            FieldType="String" HeaderText="工序号" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        
                         <f:RenderField Width="150px" ColumnID="TotalWeldQuantity" DataField="TotalWeldQuantity" SortField="TotalWeldQuantity"
                             FieldType="String" HeaderText="焊接总量" HeaderTextAlign="Center" TextAlign="Left"  >
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs
index 50ef47cb..1d07d5eb 100644
--- a/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/FL/TotalQuantity.aspx.cs
@@ -100,7 +100,8 @@ namespace FineUIPro.Web.HJGL.FL
         {
             string strSql = @"select TotalQuantityId,ProjectId,DeviceName,DeviceCode,Unit,(case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 else cast(c.TotalWeldQuantity as DECIMAL(9,2)) end) as TotalWeldQuantity,
                            (case when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else cast(c.TotalCompleted as DECIMAL(9,2)) end) as TotalCompleted,
-                           cast((case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else 100.0 * cast(c.TotalCompleted as DECIMAL(9,2))/(1.0 * cast(c.TotalWeldQuantity as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate
+                           cast((case when c.TotalWeldQuantity='0' or c.TotalWeldQuantity='' then 0 when c.TotalCompleted='0' or c.TotalCompleted='' then 0 else 100.0 * cast(c.TotalCompleted as DECIMAL(9,2))/(1.0 * cast(c.TotalWeldQuantity as DECIMAL(9,2))) end) AS DECIMAL(9,2)) as Rate,
+                           (select top 1 DeviceNumber from HJGL_FL_Quantity q where q.ProjectId=@ProjectId and q.ZoneNumber=c.DeviceCode) as DeviceNo
                             from dbo.HJGL_FL_TotalQuantity c 
                             where c.ProjectId=@ProjectId order by c.DeviceName,DeviceCode ";
             List<SqlParameter> listStr = new List<SqlParameter>();
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
index 364d8ae0..8d7b4002 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs
@@ -21,8 +21,8 @@ namespace FineUIPro.Web
                     int totalNum = 0, oKNum = 0;
                     foreach (var item in oneOKRates)
                     {
-                        totalNum += !string.IsNullOrEmpty(item.TestWeldAmount) ? Convert.ToInt32(item.TestWeldAmount) : 0;
-                        oKNum += !string.IsNullOrEmpty(item.OnceQualifiedQuantity) ? Convert.ToInt32(item.OnceQualifiedQuantity) : 0;
+                        totalNum += !string.IsNullOrEmpty(item.OneTimeFilmAmount) ? Convert.ToInt32(item.OneTimeFilmAmount) : 0;
+                        oKNum += !string.IsNullOrEmpty(item.OneTimeFilmQualifiedAmount) ? Convert.ToInt32(item.OneTimeFilmQualifiedAmount) : 0;
                     }
                     if (totalNum > 0)
                     {
@@ -87,8 +87,8 @@ namespace FineUIPro.Web
                     oKNum = 0;
                     foreach (var item in items)
                     {
-                        totalNum += !string.IsNullOrEmpty(item.TestWeldAmount) ? Convert.ToInt32(item.TestWeldAmount) : 0;
-                        oKNum += !string.IsNullOrEmpty(item.OnceQualifiedQuantity) ? Convert.ToInt32(item.OnceQualifiedQuantity) : 0;
+                        totalNum += !string.IsNullOrEmpty(item.OneTimeFilmAmount) ? Convert.ToInt32(item.OneTimeFilmAmount) : 0;
+                        oKNum += !string.IsNullOrEmpty(item.OneTimeFilmQualifiedAmount) ? Convert.ToInt32(item.OneTimeFilmQualifiedAmount) : 0;
                     }
                     if (totalNum > 0)
                     {
@@ -135,8 +135,8 @@ namespace FineUIPro.Web
                     oKNum = 0;
                     foreach (var item in items)
                     {
-                        totalNum += !string.IsNullOrEmpty(item.TestWeldAmount) ? Convert.ToInt32(item.TestWeldAmount) : 0;
-                        oKNum += !string.IsNullOrEmpty(item.OnceQualifiedQuantity) ? Convert.ToInt32(item.OnceQualifiedQuantity) : 0;
+                        totalNum += !string.IsNullOrEmpty(item.OneTimeFilmAmount) ? Convert.ToInt32(item.OneTimeFilmAmount) : 0;
+                        oKNum += !string.IsNullOrEmpty(item.OneTimeFilmQualifiedAmount) ? Convert.ToInt32(item.OneTimeFilmQualifiedAmount) : 0;
                     }
                     if (totalNum > 0)
                     {