提交代码

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

@@ -1161,6 +1161,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     BLL.WeldTaskService.UpdateWelderTask(weldTaskId, drpCanWelder.SelectedValue);
                 }
                 this.BindGrid(null);
+                this.Grid1.SelectedRowIDArray = selectedRowId;
                 drpCanWelder.Items.Clear();
             }
         }

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

@@ -32,6 +32,17 @@
                                 </f:DatePicker>
                             </Items>
                         </f:Toolbar>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtWeldJointCode" runat="server" Label="焊口号" LabelAlign="Right"
+                                    EmptyText="输入查询条件" Width="180px" LabelWidth="70px">
+                                </f:TextBox>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
+                                    EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
                     </Toolbars>
                     <Items>
                         <f:Tree ID="tvControlItem" ShowHeader="false" Height="700px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"

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

@@ -65,6 +65,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         }
         #endregion
 
+        /// <summary>
+        /// 树查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnTreeFind_Click(object sender, EventArgs e)
+        {
+            this.InitTreeMenu();
+        }
+
         #region 加载树装置-单位
         /// <summary>
         /// 加载树
@@ -151,6 +161,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 foreach (var q in unitWork2)
                 {
                     var unitNamesUnitIds = BLL.UnitService.getUnitNamesUnitIds(q.UnitId);
+                    if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
+                    {
                         var a = (from x in Funs.DB.HJGL_WeldTask
                                  where x.UnitWorkId == q.UnitWorkId
                                       && x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
@@ -173,6 +185,35 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             tn2.Nodes.Add(newNode);
                         }
                     }
+                    else
+                    {
+                        var a = (from x in Funs.DB.HJGL_WeldTask
+                                 join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
+                                 where x.UnitWorkId == q.UnitWorkId && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
+                                 select x.TaskDate.Value.Date).Distinct().Count();
+                        TreeNode tn2 = new TreeNode();
+                        tn2.NodeID = q.UnitWorkId;
+                        tn2.Text = q.UnitWorkName;
+                        tn2.CommandName = "单位工程";
+                        tn2.ToolTip = "施工单位：" + unitNamesUnitIds;
+                        tn2.EnableClickEvent = true;
+                        tn2.EnableExpandEvent = true;
+                        rootNode2.Nodes.Add(tn2);
+                        if (a > 0)
+                        {
+                            var date = (from x in Funs.DB.HJGL_WeldTask
+                                        join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
+                                        where x.UnitWorkId == q.UnitWorkId && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
+                                        select x.TaskDate.Value.Date).First();
+                            this.txtTaskDateMonth.Text = string.Format("{0:yyyy-MM}", date);
+                            // BindNodes(tn1);
+                            TreeNode newNode = new TreeNode();
+                            newNode.Text = "加载管线...";
+                            newNode.NodeID = "加载管线...";
+                            tn2.Nodes.Add(newNode);
+                        }
+                    }
+                }
             }
 
         }
@@ -186,24 +227,46 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
         }
         private void BindNodes(TreeNode node)
+        {
+            if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
             {
                 var p = (from x in Funs.DB.HJGL_WeldTask
                          where x.UnitWorkId == node.NodeID
                               && x.TaskDate < Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01").AddMonths(1)
                               && x.TaskDate >= Convert.ToDateTime(this.txtTaskDateMonth.Text.Trim() + "-01")
-                     select new { x.TaskDate.Value.Date ,x.UnitId}).Distinct();
+                         select new { x.TaskDate.Value.Date, x.UnitId }).Distinct();
                 if (p.Count() > 0)
                 {
                     foreach (var item in p)
                     {
                         TreeNode newNode = new TreeNode();
                         newNode.CommandName = "Date";
-                    newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date)+"("+BLL.UnitService.getUnitNamesUnitIds(item.UnitId)+")";
+                        newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")";
                         newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
                         newNode.EnableClickEvent = true;
                         node.Nodes.Add(newNode);
                     }
                 }
+            }
+            else
+            {
+                var p = (from x in Funs.DB.HJGL_WeldTask
+                         join y in Funs.DB.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
+                         where x.UnitWorkId == node.NodeID && y.WeldJointCode.Contains(this.txtWeldJointCode.Text.Trim())
+                         select new { x.TaskDate.Value.Date, x.UnitId }).Distinct();
+                if (p.Count() > 0)
+                {
+                    foreach (var item in p)
+                    {
+                        TreeNode newNode = new TreeNode();
+                        newNode.CommandName = "Date";
+                        newNode.Text = string.Format("{0:yyyy-MM-dd}", item.Date) + "(" + BLL.UnitService.getUnitNamesUnitIds(item.UnitId) + ")";
+                        newNode.NodeID = node.NodeID + "|" + string.Format("{0:yyyy-MM-dd}", item.Date);
+                        newNode.EnableClickEvent = true;
+                        node.Nodes.Add(newNode);
+                    }
+                }
+            }
 
         }
 
@@ -823,7 +886,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     NewItem.WeldingWireCode = values.Value<string>("WeldingWireCode").ToString();
                 }
 
-                if (!string.IsNullOrEmpty(values.Value<string>("Size"))&&!string.IsNullOrEmpty(values.Value<int>("Size").ToString()))
+                if (!string.IsNullOrEmpty(values.Value<string>("Size")) && !string.IsNullOrEmpty(values.Value<int>("Size").ToString()))
                 {
                     NewItem.Size = values.Value<int>("Size");
                 }
@@ -1122,16 +1185,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             DateTime? taskTime = Funs.GetNewDateTime(tvControlItem.SelectedNodeID.Split('|')[1]);
             if (taskTime != null)
             {
-               var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime)).Select(x=>x.PipelineId).Distinct().ToList();
+                var pipelines = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, tvControlItem.SelectedNode.ParentNode.NodeID, Convert.ToDateTime(taskTime)).Select(x => x.PipelineId).Distinct().ToList();
 
                 if (pipelines.Any())
                 {
                     BLL.FastReportService.ResetData();
 
-                   var result = HJGL_PipelineComponentService.GetPrintModelByPipelineComponentIds(null, pipelines.ToArray(),true);
+                    var result = HJGL_PipelineComponentService.GetPrintModelByPipelineComponentIds(null, pipelines.ToArray(), true);
                     var PipelineComponentIds = result.Select(x => x.PipelineComponentId).ToArray();
                     var tb = LINQToDataTable(result);
-                   if (tb != null && tb.Rows.Count>0)
+                    if (tb != null && tb.Rows.Count > 0)
                     {
                         tb.TableName = "Table1";
                     }
@@ -1163,7 +1226,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
             else
             {
-                ShowNotify("请选择任务单",MessageBoxIcon.Question);
+                ShowNotify("请选择任务单", MessageBoxIcon.Question);
             }
         }
     }

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

@@ -7,12 +7,10 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage
+namespace FineUIPro.Web.HJGL.WeldingManage {
-{
     
     
-    public partial class WeldTask
+    public partial class WeldTask {
-    {
         
         /// <summary>
         /// form1 控件。
@@ -68,6 +66,33 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.DatePicker txtTaskDateMonth;
         
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtWeldJointCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWeldJointCode;
+        
+        /// <summary>
+        /// btnTreeFind 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnTreeFind;
+        
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>