diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index c4633882..9c74892c 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -184,6 +184,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery tn2.ToolTip = "施工单位：" + u.UnitName; tn2.CommandName = "单位工程"; tn2.EnableExpandEvent = true; + tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); if (a > 0) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 8b976e86..79ed650c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -177,6 +177,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) { e.Node.Nodes.Clear(); + if (e.Node.CommandName == "单位工程") { var pipeline = (from x in Funs.DB.HJGL_Pipeline diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index fc95b149..8c6f67b7 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -131,6 +131,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage tn2.ToolTip = "施工单位：" + u.UnitName; tn2.CommandName = "单位工程"; tn2.EnableExpandEvent = true; + tn2.EnableClickEvent= true; rootNode2.Nodes.Add(tn2); if (a > 0) { @@ -206,84 +207,70 @@ namespace FineUIPro.Web.HJGL.WeldingManage { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - - Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); - this.hdUnitWorkId.Text = string.Empty; - if (pipeline != null) - { - this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; - this.BindGrid(); - } - if (PipeArea == PipelineService.PipeArea_SHOP) - { - var list= BLL.HJGL_PipelineComponentService.GetComponentByPipelineId(pipeline.PipelineId); - if (list!=null&&list.Count()>0) - { - - lbPlanStartDate.Text = list.First().PlanStartDate.ToString () ; - } - } - else if (PipeArea == PipelineService.PipeArea_FIELD) - { - lbPlanStartDate.Text = pipeline.PlanStartDate.HasValue ? pipeline.PlanStartDate.Value.ToShortDateString() : ""; - - } - //if (pipeline.PlanStartDate.HasValue && pipeline.ActStartDate.HasValue) - //{ - // if (pipeline.ActStartDate < pipeline.PlanStartDate) - // { - // lbIsFinished.Text = "超前"; - // } - // else if (pipeline.ActStartDate > pipeline.PlanStartDate) - // { - // lbIsFinished.Text = "延误"; - // } - // else - // { - // lbIsFinished.Text = "正常"; - // } - //} - //if (pipeline.PlanStartDate.HasValue && !pipeline.ActStartDate.HasValue) - //{ - // if (pipeline.PlanStartDate >= DateTime.Now) - // { - // lbIsFinished.Text = "正常"; - // } - // else - // { - // lbIsFinished.Text = "延误"; - // } - //} Model.Parameter3D parameter3D = new Model.Parameter3D(); Model.ColorModel colorModel = new Model.ColorModel(); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; parameter3D.TagNum = ""; parameter3D.ButtonType = "0,3"; + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") { parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea + orderby x.PipelineCode + select x).ToList(); + List pipelineList = new List(); + foreach (var item in pipeline) + { + bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(item.PipelineId, this.CurrUser.LoginProjectId); + if (istrue) + { + pipelineList.Add("/" + item.PipelineCode); + } - + } + parameter3D.Line_No = string.Join(",", pipelineList); } else if (this.tvControlItem.SelectedNode.CommandName == "管线") { - var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); - if (model != null && !string.IsNullOrEmpty(model.UnitWorkId)) + Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID); + this.hdUnitWorkId.Text = string.Empty; + if (pipeline != null) + { + this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID; + this.BindGrid(); + } + if (PipeArea == PipelineService.PipeArea_SHOP) + { + var list = BLL.HJGL_PipelineComponentService.GetComponentByPipelineId(pipeline.PipelineId); + if (list != null && list.Count() > 0) + { + + lbPlanStartDate.Text = list.First().PlanStartDate.ToString(); + } + } + else if (PipeArea == PipelineService.PipeArea_FIELD) + { + lbPlanStartDate.Text = pipeline.PlanStartDate.HasValue ? pipeline.PlanStartDate.Value.ToShortDateString() : ""; + + } + if (pipeline != null && !string.IsNullOrEmpty(pipeline.UnitWorkId)) { bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(tvControlItem.SelectedNodeID, this.CurrUser.LoginProjectId); if (istrue) { - Line_No = model.PipelineCode; + Line_No = "/" + pipeline.PipelineCode; } parameter3D.Line_No = Line_No; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId); - var pipecode = "/" + model.PipelineCode; + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(pipeline.UnitWorkId); + var pipecode = "/" + pipeline.PipelineCode; parameter3D.TagNum = pipecode; } - - } + } + ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); @@ -378,7 +365,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(tvControlItem.SelectedNodeID, this.CurrUser.LoginProjectId); if (istrue) { - Line_No = modelpipe.PipelineCode; + Line_No ="/"+ modelpipe.PipelineCode; } parameter3D.Line_No = Line_No; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId); diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx index a25d6b08..192002cd 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx @@ -94,7 +94,7 @@ - + - -