diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 5f74862e..caaef8e7 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + @@ -115,6 +115,13 @@ namespace FastReport + + + + + + + @@ -163,7 +170,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx index f58ed799..8c8e87f0 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx @@ -43,9 +43,9 @@ diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 42ecb6d6..7ca28e91 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -537,7 +537,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.ColorModel = colorModel; parameter3D.TagNum = string.Join(",", weldjointcodes); parameter3D.ButtonType = "2.1"; - parameter3D.Crater_data = "2"; + parameter3D.Crater_data = "1"; if (this.tvControlItem.SelectedNode.CommandName == "单位工程") { parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs index ba2615ce..7585a079 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs @@ -138,10 +138,10 @@ namespace FineUIPro.Web.HJGL.InfoQuery Model.ColorModel colorModel = new Model.ColorModel(); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; - parameter3D.TagNum = ""; + parameter3D.TagNum = Line_No; parameter3D.ButtonType = "2"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - parameter3D.Line_No = Line_No; + // parameter3D.Line_No = Line_No; parameter3D.Transparency = colorModel.PipelineComplete; parameter3D.Finished_color = colorModel.JointCompleteColor; parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; @@ -454,7 +454,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.TagNum = pipecode; parameter3D.ButtonType = "2"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - parameter3D.Line_No = Line_No; + //parameter3D.Line_No = Line_No; parameter3D.Transparency = colorModel.PipelineComplete; parameter3D.Finished_color = colorModel.JointCompleteColor; parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index 335c3da2..795dcd82 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -156,10 +156,10 @@ namespace FineUIPro.Web.HJGL.PreDesign Model.ColorModel colorModel = new Model.ColorModel(); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; - parameter3D.TagNum = ""; + parameter3D.TagNum = Line_No; parameter3D.ButtonType = "1"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - parameter3D.Line_No = Line_No; + // parameter3D.Line_No = Line_No; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); @@ -281,7 +281,7 @@ namespace FineUIPro.Web.HJGL.PreDesign parameter3D.TagNum = pipecode; parameter3D.ButtonType = "1"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - parameter3D.Line_No = Line_No; + // parameter3D.Line_No = Line_No; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs index c0386ee6..ab7bea8c 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs @@ -229,7 +229,7 @@ namespace FineUIPro.Web.HJGL.PreDesign pipelinecode = x.Key.pipelinecode, PipelineComponentCode = x.Key.PipelineComponentCode, // DrawingName = x.Key.DrawingName, - QRCode = String.Join("&", x.Select(z => z.Field("二维码信息"))) + QRCode = String.Join(";", x.Select(z => z.Field("二维码信息"))) }); foreach (var item in dt) { @@ -237,17 +237,18 @@ namespace FineUIPro.Web.HJGL.PreDesign var hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(item.PipelineComponentCode.Replace("\n", "").Replace(" ", "").Replace("\t", "").Replace("\r", ""), pipeline.PipelineId); if (hJGL_Pipeline_Component!=null) { - model.Pipeline_ComponentQRCodeRootName rootName = new model.Pipeline_ComponentQRCodeRootName(); - rootName.QRCode = new List(); - var elementlist = item.QRCode.Split('&'); - foreach (var element in elementlist) - { - model.Pipeline_ComponentQRCodeQRCodeItem qRCodeQRCodeItem = new model.Pipeline_ComponentQRCodeQRCodeItem(); - qRCodeQRCodeItem.element = element; - rootName.QRCode.Add(qRCodeQRCodeItem); - } - hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName); - //hJGL_Pipeline_Component.DrawingName = item.DrawingName; + //model.Pipeline_ComponentQRCodeRootName rootName = new model.Pipeline_ComponentQRCodeRootName(); + //rootName.QRCode = new List(); + //var elementlist = item.QRCode.Split(';'); + //foreach (var element in elementlist) + //{ + // model.Pipeline_ComponentQRCodeQRCodeItem qRCodeQRCodeItem = new model.Pipeline_ComponentQRCodeQRCodeItem(); + // qRCodeQRCodeItem.element = element; + // rootName.QRCode.Add(qRCodeQRCodeItem); + //} + //hJGL_Pipeline_Component.QRCode = JsonConvert.SerializeObject(rootName); + + hJGL_Pipeline_Component.QRCode = item.QRCode; Pipeline_ComponentList.Add(hJGL_Pipeline_Component); } diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs index 0078b5d5..c945a000 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs @@ -235,9 +235,9 @@ namespace FineUIPro.Web.HJGL.TestPackage Model.ColorModel colorModel = new Model.ColorModel(); colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); parameter3D.ColorModel = colorModel; - parameter3D.TagNum = ""; + parameter3D.TagNum = Line_No; parameter3D.ButtonType = "4"; - parameter3D.Line_No = Line_No; + //parameter3D.Line_No = Line_No; if (this.tvControlItem.SelectedNode.CommandName == "单位工程") { @@ -579,7 +579,7 @@ namespace FineUIPro.Web.HJGL.TestPackage parameter3D.ColorModel = colorModel; parameter3D.TagNum = pipecode; parameter3D.ButtonType = "4"; - parameter3D.Line_No = Line_No; + // parameter3D.Line_No = Line_No; if (this.tvControlItem.SelectedNode.CommandName == "单位工程") { parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs index 12cdfe2d..c31a7c71 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs @@ -231,7 +231,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } - parameter3D.Line_No = string.Join(",", pipelineList); + parameter3D.TagNum= string.Join(",", pipelineList); + //parameter3D.Line_No = string.Join(",", pipelineList); } else if (this.tvControlItem.SelectedNode.CommandName == "管线") { @@ -263,7 +264,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { Line_No = "/" + pipeline.PipelineCode; } - parameter3D.Line_No = Line_No; + //parameter3D.Line_No = Line_No; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(pipeline.UnitWorkId); var pipecode = "/" + pipeline.PipelineCode; parameter3D.TagNum = pipecode; @@ -367,7 +368,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { Line_No ="/"+ modelpipe.PipelineCode; } - parameter3D.Line_No = Line_No; + // parameter3D.Line_No = Line_No; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId); var pipecode = "/" + modelpipe.PipelineCode; parameter3D.TagNum = pipecode; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs index 9ac609ba..0fed0e14 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs @@ -126,7 +126,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage parameter3D.TagNum = ""; parameter3D.ButtonType = "0"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - + // PipelineService.GetPipelinesByUnitWordId(tvControlItem.SelectedNodeID); ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData();