diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 4781fef6..4775c270 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 9874c64c..3acacc87 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
@@ -98,7 +98,7 @@
                                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工厂预制"  
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipeLineMatId"
                                                     EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"
-                                                    SortField="PipeLineMatId" SortDirection="ASC" OnSort="Grid1_Sort"
+                                                    SortField="PrefabricatedComponents" SortDirection="ASC" OnSort="Grid1_Sort"
                                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                                                     <Columns>
                                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
@@ -218,7 +218,12 @@
             EnableMaximize="true" Target="Top" EnableResize="false" runat="server" OnClose="Window5_Close"
             IsModal="true" Width="800px" Height="560px">
         </f:Window>
-
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnDelMatGrid1"  OnClick="btnDelMatGrid1_Click" EnablePostBack="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
+                Text="删除" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
         <f:Menu ID="Menu2" runat="server">
             <f:MenuButton ID="btnDelMat" OnClick="btnDelMat_Click" EnablePostBack="true"
                 ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
@@ -228,6 +233,7 @@
  
     </form>
     <script type="text/javascript">
+        var menuID1 = '<%= Menu1.ClientID %>';
         var menuID2 = '<%= Menu2.ClientID %>';
         // 返回false，来阻止浏览器右键菜单
 
@@ -236,7 +242,7 @@
             return false;
         }
         function onRowContextMenu1(event, rowId) {
-            F(menuID2).show();  //showAt(event.pageX, event.pageY);
+            F(menuID1).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
         function onGridDataLoad(event) {
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
index d1f23245..9b81de27 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.HJGL.WeldingManage;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -87,7 +88,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -110,7 +111,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -261,7 +262,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(pipelineId))
             {
-                strSql += " and pipe.PipelineId=@PipelineId ";
+                strSql += " and pipe.PipelineId=@PipelineId order by PrefabricatedComponents";
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
@@ -430,6 +431,32 @@ namespace FineUIPro.Web.HJGL.DataImport
                 ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
             }
         }
+        protected void btnDelMatGrid1_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnDelete))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                foreach (string rowID in Grid1.SelectedRowIDArray)
+                {
+
+                    BLL.PipelineMatService.DeletePipeLineMat(rowID);
+
+                    ShowNotify("删除成功！", MessageBoxIcon.Success);
+
+                }
+
+                  //this.BindGrid1(this.Grid1.SelectedRowID);
+            }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+            }
+        }
         #endregion
 
         #endregion
@@ -860,5 +887,7 @@ namespace FineUIPro.Web.HJGL.DataImport
         {
         }
         #endregion
+
+        
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
index b5befc6c..c9e129f5 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
@@ -284,6 +284,24 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Window Window5;
 
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnDelMatGrid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnDelMatGrid1;
+
         /// <summary>
         /// Menu2 控件。
         /// </summary>