From 499aa7c54c014df99ebdd4039b2cbe80a7bf3bb0 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Fri, 27 Oct 2023 18:07:01 +0800
Subject: [PATCH] 2023-10-27

---
 .../WeldingManage/SelectTaskWeldJoint.aspx    | 17 +++++++++++++---
 .../WeldingManage/SelectTaskWeldJoint.aspx.cs | 20 +++++++++++++++++++
 .../SelectTaskWeldJoint.aspx.designer.cs      | 18 +++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
index eecf129c..cf566ee8 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
@@ -18,21 +18,32 @@
         <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
             <Items>
                 <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
-                    EnableCollapse="true" Width="250px" Title="管线" ShowBorder="true" Layout="VBox"
+                    EnableCollapse="true" Width="280px" Title="管线" ShowBorder="true" Layout="VBox"
                     ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:TextBox ID="txtPipelineCode" runat="server" Label="管线"
                                     EmptyText="输入查询条件" Width="190px" LabelWidth="80px"
-                                    LabelAlign="Right">
+                                    LabelAlign="Left">
                                 </f:TextBox>
+                                
                                 <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
-                                    EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
+                                          EnablePostBack="true" OnClick="btnQuery_Click" runat="server" >
                                 </f:Button>
                             </Items>
                              
                         </f:Toolbar>
+                        <f:Toolbar ID="Toolbar4" 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>
                     </Toolbars>
                     <Items>
                          <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="管线列表"
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
index c73d1a4a..1811890f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
@@ -120,6 +120,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 //this.SelectedList = new List<string>();
                 //this.NoSelectedList = new List<string>();
 
+
                 string strList = Request.Params["strList"];
                 List<string> list = Funs.GetStrListByStr(strList, '|');
                 if (list.Count() == 2)
@@ -127,6 +128,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     this.UnitWorkId = list[0];
                     TaskDate = list[1];
 
+                    InitDropList();
 
                     Model.WBS_UnitWork UnitWork = BLL.UnitWorkService.getUnitWorkByUnitWorkId(this.UnitWorkId);
                     BLL.UnitService.InitUnitDropDownListByUnitIds(this.drpUnit, UnitWork.UnitId, false);//单位 
@@ -208,6 +210,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                        && x.PipeArea == PipeArea 
                        && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) 
                        orderby x.PipelineCode select x).ToList();
+            if (!string .IsNullOrEmpty( drpFlowingSection.SelectedValue))
+            {
+                pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
+            }
+
             var joints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
             int pageindex = int.Parse(node.CommandName.Split('|')[0]); 
             int pageCount = int.Parse(node.CommandName.Split('|')[1]);
@@ -352,6 +359,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             //}
             //Grid1.SelectedRowIDArray = arr;
         }
+
+        private void InitDropList()
+        {
+            var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                where x.ProjectId == this.CurrUser.LoginProjectId
+                      && x.UnitWorkId == this.UnitWorkId  
+                select x.FlowingSection).Distinct().ToList();
+            this.drpFlowingSection.DataTextField = "Value";
+            this.drpFlowingSection.DataValueField = "Value";
+            this.drpFlowingSection.DataSource = pipeline;
+            this.drpFlowingSection.DataBind();
+        }
+
         #endregion
 
         #region 管线查询
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs
index 64d43cb0..711c9172 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.designer.cs
@@ -77,6 +77,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.Button btnQuery;
 
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+
+        /// <summary>
+        /// drpFlowingSection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpFlowingSection;
+
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>