diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index b4dc2591..16e497e0 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
index 8f3de89e..f9c5698c 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
@@ -72,7 +72,10 @@
                                             EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="txtWeldJointCode_TextChanged"
                                             Width="240px" LabelWidth="80px" LabelAlign="Right">
                                         </f:TextBox>--%>
-                                       
+                                       <f:TextBox ID="txtMaterialCode2" runat="server" Label="材料编码"
+                                            EmptyText="输入查询条件"
+                                            Width="240px" LabelWidth="100px" LabelAlign="Right">
+                                        </f:TextBox>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                         </f:ToolbarFill>
                                         <%--<f:Button ID="btnSelectColumn" Text="选择显示列" Icon="ShapesManySelect"
@@ -80,7 +83,7 @@
                                         </f:Button>--%>
                                         <f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
                                         </f:Button>
-                                         <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Hidden="true"
+                                         <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"  Text="查询"
                                             EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
                                         </f:Button>
                                         <f:Button ID="btnPrint" Text="打印" Icon="Printer" runat="server"
@@ -106,7 +109,7 @@
                                             <Items>
                                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工厂预制"  
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipeLineMatId"
-                                                    EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"
+                                                    EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"   EnableCheckBoxSelect="true"
                                                     SortField="PrefabricatedComponents" SortDirection="ASC" OnSort="Grid1_Sort"
                                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                                                     <Columns>
@@ -158,7 +161,7 @@
                                                 <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="现场施工"  
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipeLineMatId"
                                                     EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"
-                                                    SortField="PipeLineMatId" SortDirection="ASC" OnSort="Grid2_Sort"
+                                                    SortField="PipeLineMatId" SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true"
                                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid2_RowDoubleClick">
                                                     <Columns>
                                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
index a16e2b08..e6e2702f 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
@@ -293,11 +293,17 @@ namespace FineUIPro.Web.HJGL.DataImport
             //}
             if (!string.IsNullOrEmpty(pipelineId))
             {
-                strSql += " and pipe.PipelineId=@PipelineId order by PrefabricatedComponents ";
+                strSql += " and pipe.PipelineId=@PipelineId  ";
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
+            if (!string.IsNullOrEmpty(txtMaterialCode2.Text.Trim()))
+            {
+                strSql += " and lib.MaterialCode like @MaterialCode  ";
+                listStr.Add(new SqlParameter("@MaterialCode","%"+ txtMaterialCode2.Text.Trim()+"%"));
 
+            }
+            strSql += "  order by PrefabricatedComponents ";
             listStr.Add(new SqlParameter("@UnitWorkId", unitworkid));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -321,11 +327,13 @@ namespace FineUIPro.Web.HJGL.DataImport
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
-            //if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
-            //{
-            //    strSql += " and lib.MaterialCode like @MaterialCode ";
-            //    listStr.Add(new SqlParameter("@MaterialCode", "%"+txtMaterialCode.Text.Trim() + "%"));
-            //}
+            if (!string.IsNullOrEmpty(txtMaterialCode2.Text.Trim()))
+            {
+                strSql += " and lib.MaterialCode like @MaterialCode  ";
+                listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode2.Text.Trim() + "%"));
+
+            }
+            strSql += "  order by PrefabricatedComponents ";
             listStr.Add(new SqlParameter("@UnitWorkId", unitworkid));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -461,7 +469,8 @@ namespace FineUIPro.Web.HJGL.DataImport
 
                 }
 
-              //  this.BindGrid2(this.Grid1.SelectedRowID);
+                this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
+                this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
             }
             else
             {
@@ -487,7 +496,8 @@ namespace FineUIPro.Web.HJGL.DataImport
 
                 }
 
-                  //this.BindGrid1(this.Grid1.SelectedRowID);
+                this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
+                this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
index 1b351906..5dea38b2 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
 
+        /// <summary>
+        /// txtMaterialCode2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterialCode2;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>