lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-11-25 焊接材料导入审核结果增加过滤

Browse Source
This commit is contained in:
李鹏飞
2022-11-25 17:20:37 +08:00
parent b6f8ef01f1
commit a2d3fd4cb2
4 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+30 -25
View File
@@ -172,33 +172,38 @@ namespace FineUIPro.Web.HJGL.DataImport
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{
e.Node.Nodes.Clear();
if (e.Node.CommandName == "单位工程")
if (e.Node.Nodes[0].NodeID == "加载管线...")
{
var pipeline = (from x in PipelineService.hJGL_Pipelines
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
&& x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
orderby x.PipelineCode
select x).ToList();
foreach (var item in pipeline)
e.Node.Nodes.Clear();
if (e.Node.CommandName == "单位工程")
{
var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
//var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count();
TreeNode newNode = new TreeNode();
//if (jotCount > weldJotCount)
//{
// newNode.Text = "<font color='#EE0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
//}
//else
//{
// newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
//}
newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
newNode.NodeID = item.PipelineId;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
var pipeline = (from x in PipelineService.hJGL_Pipelines
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
&& x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
orderby x.PipelineCode
select x).ToList();
foreach (var item in pipeline)
{
var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
//var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count();
TreeNode newNode = new TreeNode();
//if (jotCount > weldJotCount)
//{
// newNode.Text = "<font color='#EE0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
//}
//else
//{
// newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
//}
newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
newNode.NodeID = item.PipelineId;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
}
}
}
}
@@ -215,8 +220,8 @@ namespace FineUIPro.Web.HJGL.DataImport
if (tvControlItem.SelectedNode.CommandName== "单位工程")
{
this.hdUnitWorkId.Text=tvControlItem.SelectedNode.NodeID.ToString();
this.BindGrid1("", this.hdUnitWorkId.Text);
this.BindGrid2("", this.hdUnitWorkId.Text);
//this.BindGrid1("", this.hdUnitWorkId.Text);
//this.BindGrid2("", this.hdUnitWorkId.Text);
}
else