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

2022-10-31 焊接三维参数修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-31 17:03:08 +08:00
parent 93492e7b02
commit f5334e6ae6
4 changed files with 49 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+1
View File
@@ -184,6 +184,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + u.UnitName;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.EnableClickEvent = true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
if (a > 0) if (a > 0)
{ {
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+1
View File
@@ -177,6 +177,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
{ {
e.Node.Nodes.Clear(); e.Node.Nodes.Clear();
if (e.Node.CommandName == "单位工程") if (e.Node.CommandName == "单位工程")
{ {
var pipeline = (from x in Funs.DB.HJGL_Pipeline var pipeline = (from x in Funs.DB.HJGL_Pipeline
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+44 -57
View File
@@ -131,6 +131,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
tn2.ToolTip = "施工单位：" + u.UnitName; tn2.ToolTip = "施工单位：" + u.UnitName;
tn2.CommandName = "单位工程"; tn2.CommandName = "单位工程";
tn2.EnableExpandEvent = true; tn2.EnableExpandEvent = true;
tn2.EnableClickEvent= true;
rootNode2.Nodes.Add(tn2); rootNode2.Nodes.Add(tn2);
if (a > 0) if (a > 0)
{ {
@@ -206,84 +207,70 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) 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.Parameter3D parameter3D = new Model.Parameter3D();
Model.ColorModel colorModel = new Model.ColorModel(); Model.ColorModel colorModel = new Model.ColorModel();
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = ""; parameter3D.TagNum = "";
parameter3D.ButtonType = "0,3"; parameter3D.ButtonType = "0,3";
if (this.tvControlItem.SelectedNode.CommandName == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{ {
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); 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<string> pipelineList = new List<string>();
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 == "管线") else if (this.tvControlItem.SelectedNode.CommandName == "管线")
{ {
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
if (model != null && !string.IsNullOrEmpty(model.UnitWorkId)) 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); bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(tvControlItem.SelectedNodeID, this.CurrUser.LoginProjectId);
if (istrue) if (istrue)
{ {
Line_No = model.PipelineCode; Line_No = "/" + pipeline.PipelineCode;
} }
parameter3D.Line_No = Line_No; parameter3D.Line_No = Line_No;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(pipeline.UnitWorkId);
var pipecode = "/" + model.PipelineCode; var pipecode = "/" + pipeline.PipelineCode;
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
} }
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData(); ctlAuditFlow.BindData();
@@ -378,7 +365,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(tvControlItem.SelectedNodeID, this.CurrUser.LoginProjectId); bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(tvControlItem.SelectedNodeID, this.CurrUser.LoginProjectId);
if (istrue) if (istrue)
{ {
Line_No = modelpipe.PipelineCode; Line_No ="/"+ modelpipe.PipelineCode;
} }
parameter3D.Line_No = Line_No; parameter3D.Line_No = Line_No;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId);
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
+3 -3
View File
@@ -94,7 +94,7 @@
</f:Form> </f:Form>
</Items> </Items>
</f:GroupPanel> </f:GroupPanel>
<f:GroupPanel ID="GroupPanel3" Layout="Anchor" Title="颜色模型设置" runat="server"> <f:GroupPanel ID="GroupPanel3" Layout="Anchor" Title="模型颜色设置" runat="server">
<Items> <Items>
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true" <f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
Layout="VBox" BodyPadding="10px" runat="server" RedStarPosition="BeforeText" Layout="VBox" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
@@ -102,10 +102,10 @@
<Rows> <Rows>
<f:FormRow runat="server"> <f:FormRow runat="server">
<Items> <Items>
<f:NumberBox ID="txtPipelineNOComplete" Label="未完成(透明显示)" runat="server" MaxValue="100" <f:NumberBox ID="txtPipelineNOComplete" Label="未完成(透明显示)" runat="server" MaxValue="100" Hidden="true"
LabelWidth="180px" NoNegative="true" NoDecimal="true"> LabelWidth="180px" NoNegative="true" NoDecimal="true">
</f:NumberBox> </f:NumberBox>
<f:NumberBox ID="txtPipelineComplete" Label="已完成(透明显示)" runat="server" MaxValue="100" <f:NumberBox ID="txtPipelineComplete" Label="已完成(透明显示)" runat="server" MaxValue="100" Hidden="true"
LabelWidth="180px" NoNegative="true" NoDecimal="true"> LabelWidth="180px" NoNegative="true" NoDecimal="true">
</f:NumberBox> </f:NumberBox>
</Items> </Items>