From 854a126ab8c716119f0dc2f7ba69b72829db42f4 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Thu, 29 Jan 2026 09:31:34 +0800
Subject: [PATCH] =?UTF-8?q?20260129=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
---
.../File/Fastreport/JGZL/钢管检查验收记录.frx | 318 ++++++++++++++++++
.../FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +-
.../JGZL/SteelPipeCheckRecord.aspx.cs | 85 ++++-
HJGL_DS/FineUIPro.Web/Web.config | 2 +-
HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +-
5 files changed, 405 insertions(+), 4 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..5a34ee4
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/钢管检查验收记录.frx
@@ -0,0 +1,318 @@
+
+
+ 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 Table2_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+ Table2.PrintRow(0);
+ Table2.PrintColumns();
+
+ int x=0;
+ // 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
+ x++;
+ Table2.PrintRow(1);
+ Table2.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+
+ private void Table4_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("ItemData");
+ // init the data source
+ rowData.Init();
+ Table4.PrintRow(0);
+ Table4.PrintColumns();
+ Table4.PrintRow(1);
+ Table4.PrintColumns();
+ int x=0;
+ // 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
+ x++;
+ Table4.PrintRow(2);
+ Table4.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 6e29203..abef49a 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,4 +1,4 @@
-
+
true
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs
index 4a29609..ea4c0d4 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/SteelPipeCheckRecord.aspx.cs
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.JGZL
Dictionary keyValuePairs = new Dictionary();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("ContractCode", report.ContractCode);
- keyValuePairs.Add("ArrivalDate", string.Format("{0:yyyy年MM月dd日}", report.ArrivalDate));
+ keyValuePairs.Add("ArrivalDate", string.Format("{0:yyyy.MM.dd}", report.ArrivalDate));
keyValuePairs.Add("ExecutionStandard", report.ExecutionStandard);
keyValuePairs.Add("Crack", report.Crack);
keyValuePairs.Add("SlagInclusion", report.SlagInclusion);
@@ -221,6 +221,89 @@ namespace FineUIPro.Web.JGZL
keyValuePairs.Add("Other", report.Other);
keyValuePairs.Add("Remark", report.Remark);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+ //加载图片
+ var imageUrl = (from x in Funs.DB.AttachFile where x.ToKeyId == report.RecordId && x.MenuId == BLL.Const.JGZL_SteelPipeCheckRecordMenuId select x).FirstOrDefault();
+ if (imageUrl != null)
+ {
+ DataTable imagedt = new DataTable();
+ imagedt.TableName = "ImageData";
+ imagedt.Columns.Add("ImageUrl");
+ var newRowsImage = imagedt.NewRow();
+ newRowsImage["ImageUrl"] = Funs.RootPath + imageUrl.AttachUrl;
+ imagedt.Rows.Add(newRowsImage);
+ BLL.Common.FastReportService.AddFastreportTable(imagedt);
+ }
+
+ //明细表1
+ string strSql = @"SELECT * from JGZL_SteelPipeCheckRecordItem1 where RecordId=@recordId ";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@recordId", this.Grid1.SelectedRowID));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ DataTable dt = new DataTable();
+ dt.TableName = "Data";
+ dt.Columns.Add("Name");
+ dt.Columns.Add("Material");
+ dt.Columns.Add("Specifications");
+ dt.Columns.Add("Quantity");
+ dt.Columns.Add("MaterialCertificateCode");
+ dt.Columns.Add("HeatCode");
+ dt.Columns.Add("MaterialCertificateSelfNumber");
+
+ DataRow[] rows = tb.DefaultView.ToTable().Select();
+ foreach (var row in rows)
+ {
+ var newRows = dt.NewRow();
+ newRows["Name"] = row["Name"].ToString();
+ newRows["Material"] = row["Material"].ToString();
+ newRows["Specifications"] = row["Specifications"].ToString();
+ newRows["Quantity"] = row["Quantity"].ToString();
+ newRows["MaterialCertificateCode"] = row["MaterialCertificateCode"].ToString();
+ newRows["HeatCode"] = row["HeatCode"].ToString();
+ newRows["MaterialCertificateSelfNumber"] = row["MaterialCertificateSelfNumber"].ToString();
+
+ dt.Rows.Add(newRows);
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt);
+
+ //明细表2
+ string strSql2 = @"SELECT * from JGZL_SteelPipeCheckRecordItem2 where RecordId=@recordId ";
+ List listStr2 = new List();
+ listStr2.Add(new SqlParameter("@recordId", this.Grid1.SelectedRowID));
+ SqlParameter[] parameter2 = listStr2.ToArray();
+ DataTable tb2 = SQLHelper.GetDataTableRunText(strSql2, parameter2);
+
+ DataTable dt2 = new DataTable();
+ dt2.TableName = "ItemData";
+ dt2.Columns.Add("Num");
+ dt2.Columns.Add("Part1");
+ dt2.Columns.Add("Part2");
+ dt2.Columns.Add("Part3");
+ dt2.Columns.Add("Part4");
+ dt2.Columns.Add("InnerDiameter");
+ dt2.Columns.Add("OuterDiameter");
+ dt2.Columns.Add("Lengths");
+
+ DataRow[] rows2 = tb2.DefaultView.ToTable().Select();
+ int i = 0;
+ foreach (var row in rows2)
+ {
+ var newRows = dt2.NewRow();
+ newRows["Num"] = (i + 1).ToString();
+ newRows["Part1"] = row["Part1"].ToString();
+ newRows["Part2"] = row["Part2"].ToString();
+ newRows["Part3"] = row["Part3"].ToString();
+ newRows["Part4"] = row["Part4"].ToString();
+ newRows["InnerDiameter"] = row["InnerDiameter"].ToString();
+ newRows["OuterDiameter"] = row["OuterDiameter"].ToString();
+ newRows["Lengths"] = row["Lengths"].ToString();
+
+ dt2.Rows.Add(newRows);
+ i++;
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt2);
}
initTemplatePath = "File\\Fastreport\\JGZL\\钢管检查验收记录.frx";
if (File.Exists(rootPath + initTemplatePath))
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 30834b7..6bfb6c8 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -67,7 +67,7 @@
-
+
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index ef14066..a48b337 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,4 +1,4 @@
-
+
Debug|Any CPU