From 6e6d2bd03fc710a3252156c382ba4f01c8a4e374 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 14 Jan 2026 10:47:29 +0800 Subject: [PATCH] =?UTF-8?q?20260114=20=E7=84=8A=E7=BC=9D=E7=A1=AC=E5=BA=A6?= =?UTF-8?q?=E8=AF=95=E9=AA=8C=E5=A7=94=E6=89=98=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HardnessTestOrderPrint.aspx.cs | 26 +- .../File/Fastreport/焊缝硬度试验委托单.frx | 282 ++++++++++++++++++ .../HotHardManage/HotHardManageEdit.aspx.cs | 18 +- 3 files changed, 304 insertions(+), 22 deletions(-) create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/焊缝硬度试验委托单.frx diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs index c104deb..4a19f07 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/HardnessTestOrderPrint.aspx.cs @@ -215,12 +215,12 @@ namespace FineUIPro.Web.ContinuousPrint dt.Columns.Add("ISO_IsoNo"); dt.Columns.Add("ItemName"); dt.Columns.Add("WME_Name"); - dt.Columns.Add("HotProessState"); - dt.Columns.Add("SurfaceState"); - dt.Columns.Add("TestMethod"); - dt.Columns.Add("TestStandard"); + //dt.Columns.Add("HotProessState"); + //dt.Columns.Add("SurfaceState"); + dt.Columns.Add("TestMethod");//检验方法 + dt.Columns.Add("TestStandard");//检验标准 dt.Columns.Add("TestRate"); - dt.Columns.Add("checkCount"); + //dt.Columns.Add("checkCount"); DataRow[] rows = tb.DefaultView.ToTable().Select(); foreach (var row in rows) @@ -236,12 +236,12 @@ namespace FineUIPro.Web.ContinuousPrint newRows["ISO_IsoNo"] = row["ISO_IsoNo"].ToString(); newRows["ItemName"] = row["ItemName"].ToString(); newRows["WME_Name"] = row["WME_Name"].ToString(); - newRows["HotProessState"] = row["HotProessState"].ToString(); - newRows["SurfaceState"] = row["SurfaceState"].ToString(); + //newRows["HotProessState"] = row["HotProessState"].ToString(); + //newRows["SurfaceState"] = row["SurfaceState"].ToString(); newRows["TestMethod"] = row["TestMethod"].ToString(); newRows["TestStandard"] = row["TestStandard"].ToString(); newRows["TestRate"] = row["TestRate"].ToString(); - newRows["checkCount"] = tb2.Rows.Count - 1; //row["checkCount"].ToString(); + //newRows["checkCount"] = tb2.Rows.Count - 1; //row["checkCount"].ToString(); dt.Rows.Add(newRows); } BLL.Common.FastReportService.AddFastreportTable(dt); @@ -250,9 +250,9 @@ namespace FineUIPro.Web.ContinuousPrint dt2.TableName = "Data"; dt2.Columns.Add("Number"); dt2.Columns.Add("JOT_JointNo"); - dt2.Columns.Add("WED_Code"); - dt2.Columns.Add("STE_Code"); dt2.Columns.Add("JOT_JointDesc"); + dt2.Columns.Add("STE_Code"); + //dt2.Columns.Add("WED_Code"); dt2.Columns.Add("HotProessDate"); dt2.Columns.Add("RecordChartNo"); @@ -269,9 +269,9 @@ namespace FineUIPro.Web.ContinuousPrint newRows["Number"] = i + 1; } newRows["JOT_JointNo"] = row["JOT_JointNo"].ToString(); - newRows["WED_Code"] = row["WED_Code"].ToString(); - newRows["STE_Code"] = row["STE_Code"].ToString(); newRows["JOT_JointDesc"] = row["JOT_JointDesc"].ToString(); + newRows["STE_Code"] = row["STE_Code"].ToString(); + //newRows["WED_Code"] = row["WED_Code"].ToString(); newRows["HotProessDate"] = row["HotProessDate"].ToString(); newRows["RecordChartNo"] = row["RecordChartNo"].ToString(); dt2.Rows.Add(newRows); @@ -279,7 +279,7 @@ namespace FineUIPro.Web.ContinuousPrint } BLL.Common.FastReportService.AddFastreportTable(dt2); - initTemplatePath = "File\\Fastreport\\硬度试验委托单.frx"; + initTemplatePath = "File\\Fastreport\\焊缝硬度试验委托单.frx"; if (File.Exists(rootPath + initTemplatePath)) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/焊缝硬度试验委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊缝硬度试验委托单.frx new file mode 100644 index 0000000..bffa0fd --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/焊缝硬度试验委托单.frx @@ -0,0 +1,282 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + private void Table3_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + // print the table body + Table3.PrintRow(0); + Table3.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs index 5c856d2..cb77a62 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs @@ -645,12 +645,12 @@ namespace FineUIPro.Web.HJGL.HotHardManage dt.Columns.Add("ISO_IsoNo"); dt.Columns.Add("ItemName"); dt.Columns.Add("WME_Name"); - dt.Columns.Add("HotProessState"); - dt.Columns.Add("SurfaceState"); + //dt.Columns.Add("HotProessState"); + //dt.Columns.Add("SurfaceState"); dt.Columns.Add("TestMethod"); dt.Columns.Add("TestStandard"); dt.Columns.Add("TestRate"); - dt.Columns.Add("checkCount"); + //dt.Columns.Add("checkCount"); DataRow[] rows = tb.DefaultView.ToTable().Select(); foreach (var row in rows) @@ -666,12 +666,12 @@ namespace FineUIPro.Web.HJGL.HotHardManage newRows["ISO_IsoNo"] = row["ISO_IsoNo"].ToString(); newRows["ItemName"] = row["ItemName"].ToString(); newRows["WME_Name"] = row["WME_Name"].ToString(); - newRows["HotProessState"] = row["HotProessState"].ToString(); - newRows["SurfaceState"] = row["SurfaceState"].ToString(); + //newRows["HotProessState"] = row["HotProessState"].ToString(); + //newRows["SurfaceState"] = row["SurfaceState"].ToString(); newRows["TestMethod"] = row["TestMethod"].ToString(); newRows["TestStandard"] = row["TestStandard"].ToString(); newRows["TestRate"] = row["TestRate"].ToString(); - newRows["checkCount"] = tb2.Rows.Count - 1; //row["checkCount"].ToString(); + //newRows["checkCount"] = tb2.Rows.Count - 1; //row["checkCount"].ToString(); dt.Rows.Add(newRows); } BLL.Common.FastReportService.AddFastreportTable(dt); @@ -681,7 +681,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage dt2.TableName = "Data"; dt2.Columns.Add("Number"); dt2.Columns.Add("JOT_JointNo"); - dt2.Columns.Add("WED_Code"); + //dt2.Columns.Add("WED_Code"); dt2.Columns.Add("STE_Code"); dt2.Columns.Add("JOT_JointDesc"); dt2.Columns.Add("HotProessDate"); @@ -700,7 +700,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage newRows["Number"] = i + 1; } newRows["JOT_JointNo"] = row["JOT_JointNo"].ToString(); - newRows["WED_Code"] = row["WED_Code"].ToString(); + //newRows["WED_Code"] = row["WED_Code"].ToString(); newRows["STE_Code"] = row["STE_Code"].ToString(); newRows["JOT_JointDesc"] = row["JOT_JointDesc"].ToString(); newRows["HotProessDate"] = row["HotProessDate"].ToString(); @@ -710,7 +710,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage } BLL.Common.FastReportService.AddFastreportTable(dt2); - initTemplatePath = "File\\Fastreport\\硬度试验委托单.frx"; + initTemplatePath = "File\\Fastreport\\焊缝硬度试验委托单.frx"; if (File.Exists(rootPath + initTemplatePath)) { PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));