diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs index 215f6bf..a09a319 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs @@ -243,6 +243,14 @@ namespace FineUIPro.Web.ContinuousPrint keyValuePairs.Add("ProjectName", hidProjectName.Value); keyValuePairs.Add("InspectionCount", tb.Rows.Count.ToString()); keyValuePairs.Add("NDTRName", "100%"); + if (hidJOTY_Group.Value=="1") + { + keyValuePairs.Add("NDTType", "RT"); + } + else + { + keyValuePairs.Add("NDTType", "PT"); + } BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx"; diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx index 174dddd..6a0ef4e 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx index 28c3174..840c70b 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -62,8 +62,9 @@ namespace FastReport + - + @@ -135,19 +136,19 @@ namespace FastReport - + - + - + - + @@ -164,7 +165,7 @@ namespace FastReport - + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs index 9c89c3d..2824200 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/WeldInspectionCheckRecordItem.aspx.cs @@ -208,7 +208,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //tb = GetFilteredTable(Grid1.FilteredData, tb); var table = this.GetPagedDataTable(Grid1, tb); Grid1.DataSource = table; - Grid1.DataBind(); + Grid1.DataBind(); } #endregion @@ -364,7 +364,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport row["index"] = 0; } } - tb.Columns.Add("indexS", typeof(System.String)); + tb.Columns.Add("indexS", typeof(System.String)); foreach (DataRow row in tb.Rows) { try @@ -387,7 +387,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport var newRows = dt.NewRow(); //if (i + 1 < rows.Count()) //{ - newRows["Number"] = i + 1; + newRows["Number"] = i + 1; //} newRows["WED_Code"] = row["WED_Code"].ToString(); newRows["ISO_IsoNo"] = row["ISO_IsoNo"].ToString(); @@ -417,7 +417,6 @@ namespace FineUIPro.Web.HJGL.WeldingReport { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); } - } @@ -482,7 +481,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", ProjectId)); - listStr.Add(new SqlParameter("@ISO_ID",this.ISO_ID)); + listStr.Add(new SqlParameter("@ISO_ID", this.ISO_ID)); listStr.Add(new SqlParameter("@VICheckDate", vICheckDate.Replace("/", "-"))); listStr.Add(new SqlParameter("@NDTR_ID", this.NDTR_ID)); listStr.Add(new SqlParameter("@JOTY_Group", JOTY_Group)); @@ -567,8 +566,16 @@ namespace FineUIPro.Web.HJGL.WeldingReport //传参 Dictionary keyValuePairs = new Dictionary(); keyValuePairs.Add("ProjectName", projectName); - keyValuePairs.Add("InspectionCount", tb.Rows.Count.ToString()+"个"); + keyValuePairs.Add("InspectionCount", tb.Rows.Count.ToString() + "个"); keyValuePairs.Add("NDTRName", ndtrName); + if (JOTY_Group == "1") + { + keyValuePairs.Add("NDTType", "RT"); + } + else + { + keyValuePairs.Add("NDTType", "PT"); + } BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊接接头报检检查记录.frx";