This commit is contained in:
2024-05-23 13:58:57 +08:00
parent 8dc175f1e7
commit 257d0cded8
3 changed files with 7 additions and 4 deletions
@@ -128,7 +128,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
rootNode.Expanded = true;
this.tvControlItem.Nodes.Add(rootNode);
var iso = (from x in Funs.DB.Pipeline_Pipeline where x.InstallationId == this.InstallationId && x.UnitId == this.UnitId orderby x.PipelineCode select x).ToList();
var iso = (from x in Funs.DB.Pipeline_Pipeline
join y in Funs.DB.Project_WorkArea on x.WorkAreaId equals y.WorkAreaId
where x.InstallationId == this.InstallationId && x.UnitId == this.UnitId orderby x.PipelineCode
select new {x.PipelineId,x.PipelineCode,y.WorkAreaCode }).ToList();
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
{
iso = (from x in iso where x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList();
@@ -137,7 +140,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
foreach (var item in iso)
{
TreeNode newNode = new TreeNode();
newNode.Text = item.PipelineCode;
newNode.Text = item.PipelineCode + "(" + item.WorkAreaCode + ")";
newNode.NodeID = item.PipelineId;
newNode.ToolTip = item.PipelineCode;
newNode.EnableClickEvent = true;