diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index c2e634a6..0fdfbad7 100644 Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx index 121361b0..53344db4 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx @@ -57,6 +57,16 @@ + + + + + + + + (); HJGL_MaterialService.materialStockItems_SHOP = new List(); dicSeclectPipeLine=new Dictionary(); + 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("|")) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs index da778253..525a976f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs @@ -77,6 +77,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.HiddenField hdUnitWorkId; + /// + /// Toolbar5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar5; + + /// + /// drpFlowingSection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpFlowingSection; + /// /// Toolbar2 控件。 ///