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

2022-10-15 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-15 15:40:49 +08:00
parent 9183f74b55
commit 0ec0031e20
26 changed files with 1623 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Controls/_3DLook.ascx
+1 -1
View File
@@ -22,7 +22,7 @@
function BindData(dataList, Url_item,Url) {
receiver.src = Url_item;
// var newdatalist = dataList.split(",");
// console.log(dataList);
console.log(dataList);
receiver.contentWindow.postMessage(dataList, Url);
}
function iFrameHeight() {
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+11 -9
View File
@@ -94,23 +94,25 @@
<asp:Label ID="labNumber" runat="server" Text=' <%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1%>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
<f:RenderField HeaderText="完成状态" ColumnID="UnitWorkCode1" DataField="UnitWorkCode1"
SortField="UnitWorkCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="单位名称" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderTextAlign="Center" Width="180px">
</f:RenderField>
<%--<f:RenderField HeaderText="单位工程" ColumnID="UnitWorkCode" DataField="UnitWorkCode"
SortField="UnitWorkCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>--%>
<f:RenderField HeaderText="完成状态" ColumnID="UnitWorkCode1" DataField="UnitWorkCode1"
SortField="UnitWorkCode" FieldType="String" HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
<%--<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
Width="150px">
</f:RenderField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
Width="100px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+31 -1
View File
@@ -173,7 +173,22 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
}
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
{
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (model != null&&!string.IsNullOrEmpty(model.UnitWorkId))
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -377,7 +392,22 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
}
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
{
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (model != null && !string.IsNullOrEmpty(model.UnitWorkId))
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+6 -6
View File
@@ -370,12 +370,12 @@ namespace FineUIPro.Web.HJGL.PointTrust
}
}
}
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 = "/E-9001,/E-9002";
parameter3D.ButtonType = "0,4";
//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 = "/E-9001,/E-9002";
//parameter3D.ButtonType = "0,4";
//ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
//ctlAuditFlow.data = parameter3D;
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
+6
View File
@@ -61,6 +61,12 @@
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ContactPhone" DataField="ContactPhone" FieldType="String"
HeaderText="联系人电话" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PersonName" DataField="PersonName" FieldType="String"
HeaderText="接收人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="Date"
HeaderText="接收时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:LinkButtonField Width="120px" TextAlign="Center" CommandName="cmd_detail" Text="装箱明细" />
<f:LinkButtonField Width="120px" TextAlign="Center" CommandName="cmd_print" Text="预览打印" />
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx.cs
+5 -2
View File
@@ -42,11 +42,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
pack.StackingPosition,
pack.State,
pack.ContactName,
pack.ContactPhone
pack.ContactPhone,
pack.ReceiveDate,
person.PersonName
from HJGL_PackagingManage as pack
left join HJGL_Pipeline_Component com on com.PipelineComponentId=pack.PipelineComponentId
left join HJGL_Pipeline pipe on pipe.PipelineId =com.PipelineId
left join WBS_UnitWork unit on pipe.UnitWorkId=unit.UnitWorkId
left join Person_Persons person on pack.ReceiveMan=person.PersonId
WHERE pack.ProjectId = @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -306,7 +309,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
var PipelineComponent = model.PipelineComponentId.Split(',');
foreach (var item in PipelineComponent)
{
HJGL_PipelineComponentService.UpdateOutState(item);
HJGL_PipelineComponentService.UpdateOutState(item, model.PackagingCode);
}
HJGL_PackagingmanageService.PutOutOrder(Id);
Pring(Id);
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
+1 -1
View File
@@ -93,7 +93,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true"
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+71 -33
View File
@@ -4,11 +4,35 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.UI.DataVisualization.Charting;
namespace FineUIPro.Web.HJGL.PreDesign
{
public partial class PipelingDivide : PageBase
{
public decimal PipelineComplete
{
get
{
return (decimal)ViewState["PipelineComplete"];
}
set
{
ViewState["PipelineComplete"] = value;
}
}
public decimal PipelineNOComplete
{
get
{
return (decimal)ViewState["PipelineNOComplete"];
}
set
{
ViewState["PipelineNOComplete"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@@ -17,6 +41,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.InitTreeMenu();//加载树
PipelineComplete = 0;
PipelineNOComplete = 0;
}
}
@@ -120,7 +146,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,4";
parameter3D.ButtonType = "0,1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
@@ -168,7 +194,10 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
var q = tb.AsEnumerable().Where(x => x["PipeArea"].ToString() == "工厂预制");
var q2 = tb.AsEnumerable().Where(x => x["PipeArea"].ToString() == "现场施工");
PipelineComplete = q.Count();
PipelineNOComplete = q2.Count();
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1);
Grid1.RecordCount = tb.Rows.Count;
@@ -240,14 +269,20 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
var q = PipelineService.GetPipelineByPipelineId(Grid1.SelectedRowID);
var pipecode = "/" + q.PipelineCode;
var Id =Grid1.SelectedRowIDArray;
List<string > listpipecode=new List<string> () ;
foreach (var item in Id)
{
var q = PipelineService.GetPipelineByPipelineId(item);
listpipecode.Add("/" + q.PipelineCode);
}
var pipecode = string.Join(",", listpipecode);
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,4";
parameter3D.ButtonType = "0,1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
@@ -288,36 +323,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
#endregion
protected string ConvertDetectionType(object detectionType)
{
string detectionName = string.Empty;
if (detectionType != null)
{
string[] types = detectionType.ToString().Split('|');
foreach (string t in types)
{
var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t);
if (type != null)
{
detectionName += type.DetectionTypeCode + ",";
}
}
}
if (detectionName != string.Empty)
{
return detectionName.Substring(0, detectionName.Length - 1);
}
else
{
return "";
}
}
#region 按钮事件
protected void btnGetChart_Click(object sender, EventArgs e)
{
decimal PipelineComplete = 0;
decimal PipelineNoComplete = 0;
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelingDivideChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNoComplete, "编辑 - ")));
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelingDivideChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNOComplete, "编辑 - ")));
}
@@ -351,5 +361,33 @@ namespace FineUIPro.Web.HJGL.PreDesign
txtMaterialCode.Text = String.Empty;
BindGrid();
}
#endregion
protected string ConvertDetectionType(object detectionType)
{
string detectionName = string.Empty;
if (detectionType != null)
{
string[] types = detectionType.ToString().Split('|');
foreach (string t in types)
{
var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t);
if (type != null)
{
detectionName += type.DetectionTypeCode + ",";
}
}
}
if (detectionName != string.Empty)
{
return detectionName.Substring(0, detectionName.Length - 1);
}
else
{
return "";
}
}
}
}
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivideChart.aspx
+2 -2
View File
@@ -53,7 +53,7 @@
var data = [
{
name: '未完成', value: options.n, label: {
name: '现场施工', value: options.n, label: {
rich: {
name: {
fontSize: 10,
@@ -69,7 +69,7 @@
}
},
{
name: '已完成', value: options.y, label: {
name: '工厂预制', value: options.y, label: {
rich: {
name: {
fontSize: 10,
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+7 -1
View File
@@ -79,7 +79,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组件信息" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineComponentId" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineComponentId"
AllowSorting="true" SortField="PipelineComponentCode" SortDirection="ASC" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand"
@@ -124,6 +124,12 @@
FieldType="String" HeaderText="预制图纸名称" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="PersonName" DataField="PersonName" FieldType="String"
HeaderText="接收人" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="Date"
HeaderText="接收时间" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+3 -1
View File
@@ -161,11 +161,13 @@ namespace FineUIPro.Web.HJGL.PreDesign
{
string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,
com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,
com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName
com.QRCode,com.State,pipe.PlanStartDate,com.DrawingName,com.ReceiveDate,
person.PersonName
FROM HJGL_Pipeline_Component com
LEFT JOIN HJGL_Pipeline pipe ON pipe.PipelineId =com.PipelineId
LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit
LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit
LEFT JOIN Person_Persons person on com.ReceiveMan=person.PersonId
WHERE com.PipelineId =@PipelineId ";
List<SqlParameter> listStr = new List<SqlParameter> { };
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+29 -2
View File
@@ -226,8 +226,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,4";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
}
else if (this.tvControlItem.SelectedNode.CommandName == "TestPackage")
{
var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
if (testPackageManage != null && !string.IsNullOrEmpty(testPackageManage.UnitWorkId))
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(testPackageManage.UnitWorkId);
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -542,7 +555,21 @@ namespace FineUIPro.Web.HJGL.TestPackage
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,4";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
}
else if (this.tvControlItem.SelectedNode.CommandName == "TestPackage")
{
var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
if (testPackageManage != null && !string.IsNullOrEmpty(testPackageManage.UnitWorkId))
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(testPackageManage.UnitWorkId);
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+34 -8
View File
@@ -167,7 +167,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
newNode.CssClass = "tn-color-green";
}
newNode.Text = item.PipelineCode+suf; //+ "【" + jotCount.ToString() + " " + "焊口" + "】";
newNode.CommandName = "管线";
newNode.NodeID = item.PipelineId;
newNode.EnableClickEvent = true;
e.Node.Nodes.Add(newNode);
@@ -232,8 +232,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,3";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
}
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
{
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (model != null && !string.IsNullOrEmpty(model.UnitWorkId))
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@@ -309,16 +323,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
{
var model = PipelineMatService.GetPipeLineMat(Grid1.SelectedRowID);
var q = PipelineService.GetPipelineByPipelineId(model.PipelineId);
var pipecode = "/" + q.PipelineCode;
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";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.ButtonType = "0,3";
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
}
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
{
var modelpipe = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (modelpipe != null && !string.IsNullOrEmpty(modelpipe.UnitWorkId))
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId);
var pipecode = "/" + modelpipe.PipelineCode;
parameter3D.TagNum = pipecode;
}
}
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+1 -1
View File
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,4";
parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);