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

2022-11-03 焊接修改，二次焊口设计增加新增焊口类型

Browse Source
This commit is contained in:
李鹏飞
2022-11-03 17:39:51 +08:00
parent eeddc36939
commit 31e416c302
25 changed files with 375 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+20 -10
View File
@@ -242,15 +242,16 @@ namespace FineUIPro.Web.HJGL.InfoQuery
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2.1";
parameter3D.ButtonType = "2.1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Crater_data = "0";
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
}
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
@@ -258,6 +259,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (model != null&&!string.IsNullOrEmpty(model.UnitWorkId))
{
parameter3D.Crater_data = "1";
parameter3D.TagNum = "/" + model.PipelineCode;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
}
@@ -518,16 +521,23 @@ namespace FineUIPro.Web.HJGL.InfoQuery
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
var q = WeldJointService.GetViewWeldJointById(Grid1.SelectedRowID).PipelineCode;
var pipecode = "/" + q;
var Id = Grid1.SelectedRowIDArray;
List<string> weldjointcodes = new List<string>();
foreach (var item in Id)
{
var WeldJointCode = WeldJointService.GetViewWeldJointById(item).WeldJointCode;
weldjointcodes.Add("/" + WeldJointCode);
}
//var q = WeldJointService.GetViewWeldJointById(Grid1.SelectedRowID).PipelineCode;
//var pipecode = "/" + q;
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 = pipecode;
parameter3D.ButtonType = "0,2.1";
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction=Incomplete_weldjunction;
parameter3D.TagNum = string.Join(",", weldjointcodes);
parameter3D.ButtonType = "2.1";
parameter3D.Crater_data = "2";
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);