diff --git a/DataBase/版本日志/HJGLDB_DS_2026-01-26_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-01-26_bwj.sql
new file mode 100644
index 0000000..81534b1
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2026-01-26_bwj.sql
@@ -0,0 +1,12 @@
+update Sys_Menu set MenuName='ѹܵװ֤' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='ѹܵװܱ' where MenuId='C527812C-0FF8-4EAC-B1FD-3B561DBE46ED'
+go
+alter table JGZL_IndustrialPipelineInstallationQualityCertificate add DesignLicenseCode nvarchar(50)
+alter table JGZL_IndustrialPipelineInstallationQualityCertificate add QualificationCertificateCode nvarchar(50)
+alter table JGZL_IndustrialPipelineInstallationQualityCertificate add InstitutionalApprovalCertificate nvarchar(50)
+alter table JGZL_IndustrialPipelineInstallationQualityCertificate add InstallationInspection nvarchar(50)
+go
+alter table JGZL_IndustrialPipelineInstallationSummary add OperatingTemperature nvarchar(50)
+alter table JGZL_IndustrialPipelineInstallationSummary add VoltageResistantTestDate datetime
+alter table JGZL_IndustrialPipelineInstallationSummary add LeakageTestDate datetime
+go
diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs
index 6a198c3..48f85b4 100644
--- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs
+++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_IsoInfoService.cs
@@ -279,5 +279,15 @@ namespace BLL
{
return Funs.DB.HJGL_PW_IsoInfo.FirstOrDefault(e => e.ISO_IsoNo == isoNo && e.ProjectId == projectId);
}
+
+ ///
+ /// 根据项目id获取管线信息
+ ///
+ ///
+ ///
+ public static List GetIsoInfoByProjectId(string projectId)
+ {
+ return (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == projectId select x).ToList();
+ }
}
}
diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
index f08e410..b763fe1 100644
--- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
+++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs
@@ -1335,9 +1335,9 @@ namespace BLL
///
///
///
- public static int GetJointCountByIsoId(string iso_id,string joty_id)
+ public static int GetJointCountByIsoId(string iso_id)
{
- return (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == iso_id && x.JOTY_ID == joty_id select x).Count();
+ return (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == iso_id select x).Count();
}
}
}
diff --git a/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationQualityCertificateService.cs b/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationQualityCertificateService.cs
index 74efa26..175e910 100644
--- a/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationQualityCertificateService.cs
+++ b/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationQualityCertificateService.cs
@@ -1,6 +1,7 @@
using Model;
using System.Linq;
using System.Collections.Generic;
+using System.Runtime.CompilerServices;
namespace BLL
{
@@ -48,6 +49,10 @@ namespace BLL
newModel.CompileDate = model.CompileDate;
newModel.Reviewer = model.Reviewer;
newModel.RevieweDate = model.RevieweDate;
+ newModel.DesignLicenseCode = model.DesignLicenseCode;
+ newModel.QualificationCertificateCode = model.QualificationCertificateCode;
+ newModel.InstitutionalApprovalCertificate = model.InstitutionalApprovalCertificate;
+ newModel.InstallationInspection = model.InstallationInspection;
db.JGZL_IndustrialPipelineInstallationQualityCertificate.InsertOnSubmit(newModel);
db.SubmitChanges();
}
@@ -77,6 +82,10 @@ namespace BLL
newModel.ConstructionUnit = model.ConstructionUnit;
newModel.SpecialEquipmentProductionLicenseCode = model.SpecialEquipmentProductionLicenseCode;
newModel.Remark = model.Remark;
+ newModel.DesignLicenseCode = model.DesignLicenseCode;
+ newModel.QualificationCertificateCode = model.QualificationCertificateCode;
+ newModel.InstitutionalApprovalCertificate = model.InstitutionalApprovalCertificate;
+ newModel.InstallationInspection = model.InstallationInspection;
db.SubmitChanges();
}
}
diff --git a/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationSummaryService.cs b/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationSummaryService.cs
index 4a84850..7de9137 100644
--- a/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationSummaryService.cs
+++ b/HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationSummaryService.cs
@@ -55,6 +55,9 @@ namespace BLL
newModel.CompileDate = model.CompileDate;
newModel.Reviewer = model.Reviewer;
newModel.RevieweDate = model.RevieweDate;
+ newModel.OperatingTemperature = model.OperatingTemperature;
+ newModel.VoltageResistantTestDate = model.VoltageResistantTestDate;
+ newModel.LeakageTestDate = model.LeakageTestDate;
db.JGZL_IndustrialPipelineInstallationSummary.InsertOnSubmit(newModel);
db.SubmitChanges();
}
@@ -69,6 +72,7 @@ namespace BLL
Model.JGZL_IndustrialPipelineInstallationSummary newModel = db.JGZL_IndustrialPipelineInstallationSummary.FirstOrDefault(e => e.SummaryId == model.SummaryId);
if (newModel != null)
{
+ newModel.CertificateId = model.CertificateId;
newModel.PipelineCode = model.PipelineCode;
newModel.PipelineLevel = model.PipelineLevel;
newModel.PipelineStartPoint = model.PipelineStartPoint;
@@ -91,6 +95,9 @@ namespace BLL
newModel.CorrosionControlMethod = model.CorrosionControlMethod;
newModel.InsulationMethod = model.InsulationMethod;
newModel.Remark = model.Remark;
+ newModel.OperatingTemperature = model.OperatingTemperature;
+ newModel.VoltageResistantTestDate = model.VoltageResistantTestDate;
+ newModel.LeakageTestDate = model.LeakageTestDate;
db.SubmitChanges();
}
}
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..4f41169
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx
@@ -0,0 +1,295 @@
+
+
+ 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();
+
+ // 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
+ Table2.PrintRow(0);
+ Table2.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
new file mode 100644
index 0000000..2e29984
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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..eebb62c
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/材料质量证明文件一览表.frx
@@ -0,0 +1,212 @@
+
+
+ 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 string header="";
+ private string h="";
+
+ private void Cell4_BeforePrint(object sender, EventArgs e)
+ {
+ if (Report.Engine.PageNo>1)
+ {
+ header="(续)";
+ }
+ }
+
+ private void Cell1_BeforePrint(object sender, EventArgs e)
+ {
+ if (Report.Engine.PageNo>1)
+ {
+ h="2";
+ }
+ else
+ {
+ h="1";
+ }
+ }
+
+ private void Table2_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
+ Table2.PrintRow(0);
+ Table2.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
new file mode 100644
index 0000000..a914ae2
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道安装检查记录.frx
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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..49c4ef2
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/隐蔽工程验收记录.frx
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs
index 66edbad..e2f51aa 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecord.aspx.cs
@@ -195,40 +195,26 @@ namespace FineUIPro.Web.JGZL
string rootPath = Server.MapPath("~/");
BLL.Common.FastReportService.ResetData();
- string strSql = @"SELECT * from JGZL_ConcealedWorksInspectionRecord where ProjectId = @ProjectId order by DrawingNumber desc";
- 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("Num");
- dt.Columns.Add("ConcealedWorks");
- dt.Columns.Add("DrawingNumber");
- dt.Columns.Add("ConcealedContentAndDiagram");
- dt.Columns.Add("InspectionResults");
- dt.Columns.Add("Remark");
-
- DataRow[] rows = tb.DefaultView.ToTable().Select();
- int i = 0;
- foreach (var row in rows)
- {
- var newRow = dt.NewRow();
- newRow["Num"] = (i + 1).ToString();
- newRow["ConcealedWorks"] = row["ConcealedWorks"].ToString();
- newRow["DrawingNumber"] = row["DrawingNumber"].ToString();
- newRow["ConcealedContentAndDiagram"] = row["ConcealedContentAndDiagram"].ToString();
- newRow["Remark"] = row["Remark"].ToString();
- dt.Rows.Add(newRow);
- i++;
- }
- BLL.Common.FastReportService.AddFastreportTable(dt);
-
Dictionary keyValuePairs = new Dictionary();
- keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
- BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+ if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID))
+ {
+ var report = BLL.ConcealedWorksInspectionRecordService.GetConcealedWorksInspectionRecordById(this.Grid1.SelectedRowID);
+ if (report != null)
+ {
+ keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
+ keyValuePairs.Add("ConcealedWorks", report.ConcealedWorks);
+ keyValuePairs.Add("DrawingNumber", report.DrawingNumber);
+ keyValuePairs.Add("ConcealedContentAndDiagram", report.ConcealedContentAndDiagram);
+ keyValuePairs.Add("InspectionResults", report.InspectionResults);
+ }
+ }
+ else
+ {
+ Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
+ return;
+ }
+ BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\隐蔽工程验收记录.frx";
if (File.Exists(rootPath + initTemplatePath))
{
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecordEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecordEdit.aspx.cs
index 9986065..58ca640 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecordEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/ConcealedWorksInspectionRecordEdit.aspx.cs
@@ -1,5 +1,7 @@
using BLL;
+using FastReport;
using System;
+using System.Windows.Forms.VisualStyles;
namespace FineUIPro.Web.JGZL
{
@@ -61,6 +63,13 @@ namespace FineUIPro.Web.JGZL
this.txtRemark.Text = report.Remark;
}
}
+ else
+ {
+ if (!string.IsNullOrEmpty(this.ProjectId))
+ {
+ this.txtDrawingNumber.Text = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectCode;
+ }
+ }
}
}
#endregion
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx
index b04635f..eb4857e 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx
@@ -5,7 +5,7 @@
- 工业管道安装质量证明书
+ 压力管道安装质量证明书