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

2022-11-01 焊接包装管理绑值修改，三维传参修改

Browse Source
This commit is contained in:
李鹏飞
2022-11-01 17:11:30 +08:00
parent 00dcb84b0a
commit eeddc36939
5 changed files with 125 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+25 -27
View File
@@ -10,7 +10,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
{
public partial class PipelineQuery : PageBase
{
public string Completed_pipeline
public string Line_No
{
get
{
@@ -21,17 +21,17 @@ namespace FineUIPro.Web.HJGL.InfoQuery
ViewState["Completed_pipeline"] = value;
}
}
public string Incomplete_pipeline
{
get
{
return (string)ViewState["Incomplete_pipeline"];
}
set
{
ViewState["Incomplete_pipeline"] = value;
}
}
//public string Incomplete_pipeline
//{
// get
// {
// return (string)ViewState["Incomplete_pipeline"];
// }
// set
// {
// ViewState["Incomplete_pipeline"] = value;
// }
//}
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@@ -141,8 +141,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_pipeline = Completed_pipeline;
parameter3D.Incomplete_pipeline = Incomplete_pipeline;
parameter3D.Line_No = Line_No;
parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
@@ -226,19 +225,19 @@ namespace FineUIPro.Web.HJGL.InfoQuery
{
Completed_pipelineList.Add("/" + item.PipelineCode);
}
Completed_pipeline = string.Join(",", Completed_pipelineList);
Line_No = string.Join(",", Completed_pipelineList);
}
var q1 = view_HJGL_Pipelines.Where(x => x.IsFinished != true);//获取未完成管线
if (q1.Any())
{
List<string> Incomplete_pipelineList = new List<string>();
foreach (var item in q1)
{
Incomplete_pipelineList.Add("/" + item.PipelineCode);
}
Incomplete_pipeline = string.Join(",", Incomplete_pipelineList);
}
//var q1 = view_HJGL_Pipelines.Where(x => x.IsFinished != true);//获取未完成管线
//if (q1.Any())
//{
// List<string> Incomplete_pipelineList = new List<string>();
// foreach (var item in q1)
// {
// Incomplete_pipelineList.Add("/" + item.PipelineCode);
// }
// Incomplete_pipeline = string.Join(",", Incomplete_pipelineList);
//}
}
@@ -455,8 +454,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_pipeline = Completed_pipeline;
parameter3D.Incomplete_pipeline = Incomplete_pipeline;
parameter3D.Line_No = Line_No;
parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;