From 48567d9403d091d8f7324c88a979d2bd455b557a Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 27 Jan 2026 17:22:16 +0800
Subject: [PATCH] =?UTF-8?q?20260127=20=E4=BA=A4=E5=B7=A5=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../JGZL/管道材料材质标识检查记录.frx | 175 ++++++++++++++++
.../Fastreport/JGZL/防腐工程质量验收记录.frx | 189 ++++++++++++------
...rrosionEngineeringInspectionRecord.aspx.cs | 29 +++
...rialIdentificationInspectionRecord.aspx.cs | 53 +++--
...ialIdentificationInspectionRecordEdit.aspx | 8 +-
...ationInspectionRecordEdit.aspx.designer.cs | 9 -
6 files changed, 366 insertions(+), 97 deletions(-)
create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx
new file mode 100644
index 0000000..610962b
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道材料材质标识检查记录.frx
@@ -0,0 +1,175 @@
+
+
+ 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/File/Fastreport/JGZL/防腐工程质量验收记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx
index 8a237ed..0476346 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/防腐工程质量验收记录.frx
@@ -1,13 +1,70 @@
-
-
-
-
-
-
+
+ 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();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -15,9 +72,9 @@
-
+
-
+
@@ -31,36 +88,36 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -75,7 +132,7 @@
-
+
@@ -83,7 +140,7 @@
-
+
@@ -91,7 +148,7 @@
-
+
@@ -99,7 +156,7 @@
-
+
@@ -107,7 +164,7 @@
-
+
@@ -115,7 +172,7 @@
-
+
@@ -123,7 +180,7 @@
-
+
@@ -131,7 +188,7 @@
-
+
@@ -144,33 +201,33 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -182,13 +239,13 @@
-
+
-
+
@@ -213,9 +270,9 @@
-
-
-
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs
index b53c36c..d92d1e8 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/AnticorrosionEngineeringInspectionRecord.aspx.cs
@@ -210,6 +210,35 @@ namespace FineUIPro.Web.JGZL
var report = BLL.AnticorrosionEngineeringInspectionRecordService.GetAnticorrosionReportById(this.Grid1.SelectedRowID);
if (report != null)
{
+ string strSql = @"SELECT * from JGZL_AnticorrosionEngineeringInspectionRecordItem where AnticorrosionId = @anticorrosionId ";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@anticorrosionId", this.Grid1.SelectedRowID));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ DataTable dt = new DataTable();
+ dt.TableName = "Data";
+ dt.Columns.Add("Part");
+ dt.Columns.Add("MaterialName");
+ dt.Columns.Add("Grade");
+ dt.Columns.Add("Manufacturer");
+ dt.Columns.Add("PlanFilmThickness");
+ dt.Columns.Add("ActualFilmThickness");
+
+ DataRow[] rows = tb.DefaultView.ToTable().Select();
+ foreach (var row in rows)
+ {
+ var newRow = dt.NewRow();
+ newRow["Part"] = row["Part"].ToString();
+ newRow["MaterialName"] = row["MaterialName"].ToString();
+ newRow["Grade"] = row["Grade"].ToString();
+ newRow["Manufacturer"] = row["Manufacturer"].ToString();
+ newRow["PlanFilmThickness"] = row["PlanFilmThickness"].ToString();
+ newRow["ActualFilmThickness"] = row["ActualFilmThickness"].ToString();
+ dt.Rows.Add(newRow);
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt);
+
Dictionary keyValuePairs = new Dictionary();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("AnticorrosionCurrentStatus", report.AnticorrosionCurrentStatus);
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs
index 3c4ec00..00962cf 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecord.aspx.cs
@@ -205,30 +205,53 @@ namespace FineUIPro.Web.JGZL
if (projectId != null)
{
- if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
- {
string initTemplatePath = "";
string rootPath = Server.MapPath("~/");
BLL.Common.FastReportService.ResetData();
- var report = BLL.MaterialIdentificationInspectionRecordService.GetRecordById(this.Grid1.SelectedRowID);
- if (report != null)
- {
- Dictionary keyValuePairs = new Dictionary();
- keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
- BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
- }
+ string strSql = @"SELECT * from JGZL_MaterialIdentificationInspectionRecord where ProjectId = @projectId order by CompileDate ";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@projectId", projectId));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ DataTable dt = new DataTable();
+ dt.TableName = "Data";
+ dt.Columns.Add("ISO_IsoNo");
+ dt.Columns.Add("STE_Code");
+ dt.Columns.Add("Specifications");
+ dt.Columns.Add("PrescribedColor");
+ dt.Columns.Add("TubeIdentificationStatus");
+ dt.Columns.Add("PipeFittingName");
+ dt.Columns.Add("PipeFittingStatus");
+ dt.Columns.Add("Conclusion");
+
+ DataRow[] rows = tb.DefaultView.ToTable().Select();
+ foreach (var row in rows)
+ {
+ var newRow = dt.NewRow();
+ newRow["ISO_IsoNo"] = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(row["ISO_Id"].ToString()).ISO_IsoNo;
+ newRow["STE_Code"] = BLL.HJGL_MaterialService.GetSteelBySteID(row["STE_ID"].ToString()).STE_Code;
+ newRow["Specifications"] = row["Specifications"].ToString();
+ newRow["PrescribedColor"] = row["PrescribedColor"].ToString();
+ newRow["TubeIdentificationStatus"] = row["TubeIdentificationStatus"].ToString();
+ newRow["PipeFittingName"] = row["PipeFittingName"].ToString();
+ newRow["PipeFittingStatus"] = row["PipeFittingStatus"].ToString();
+ newRow["Conclusion"] = row["Conclusion"].ToString();
+ dt.Rows.Add(newRow);
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt);
+
+
+ Dictionary keyValuePairs = new Dictionary();
+ keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
+ BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
initTemplatePath = "File\\Fastreport\\JGZL\\管道材料材质标识检查记录.frx";
if (File.Exists(rootPath + initTemplatePath))
{
PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
}
- }
- else
- {
- Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
- return;
- }
}
else
{
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx
index 112789b..9d6609f 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx
@@ -56,13 +56,7 @@
-
-
-
-
-
-
-
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx.designer.cs
index 5ba207e..8c847ae 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/MaterialIdentificationInspectionRecordEdit.aspx.designer.cs
@@ -167,15 +167,6 @@ namespace FineUIPro.Web.JGZL
///
protected global::FineUIPro.TextBox txtPipeFittingStatus;
- ///
- /// txtBox1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtBox1;
-
///
/// txtConclusion 控件。
///