材料匹配增加流水段筛选

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx

@@ -57,6 +57,16 @@
                                 <f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
                             </Items>
                         </f:Toolbar>
+                        <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left" >
+                            <Items >
+           
+                                <f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
+                                                runat="server"    LabelWidth="80px" 
+                                                Width="180px" LabelAlign="Left">
+                                </f:DropDownList>
+                            </Items>
+      
+                        </f:Toolbar>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs

@@ -63,6 +63,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
                 HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
                 dicSeclectPipeLine=new Dictionary<string, string>();
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                    where x.ProjectId == this.CurrUser.LoginProjectId 
+                    select x.FlowingSection).Distinct().ToList();
+                this.drpFlowingSection.DataTextField = "Value";
+                this.drpFlowingSection.DataValueField = "Value";
+                this.drpFlowingSection.DataSource = pipeline;
+                this.drpFlowingSection.DataBind();
+                Funs.FineUIPleaseSelect(drpFlowingSection);
                 this.InitTreeMenu();//加载树
             }
         }
@@ -192,6 +200,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) 
                             orderby x.PipelineCode
                             select x).ToList();
+            if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
+            {
+                pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
+            }
             //pipeline= pipeline.Where(x => NowComPipelineCode.Contains(x.PipelineCode)).ToList();
             if (!node.Text.Contains("|"))
             {

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs

@@ -77,6 +77,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.HiddenField hdUnitWorkId;
 
+        /// <summary>
+        /// Toolbar5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar5;
+
+        /// <summary>
+        /// drpFlowingSection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpFlowingSection;
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>