1

DataBase/版本日志/HJGLDB_DS_2026-09-04_bwj.sql

@@ -0,0 +1,26 @@
+
+ALTER view [dbo].[View_PrintJointInfo]
+as
+select joint.JOT_ID,
+joint.ProjectId,
+joint.ISO_ID,
+unit.UnitName,
+installation.InstallationName,
+iso.ISO_IsoNo,
+joint.JOT_JointNo,
+joint.JOT_JointDesc,
+Steel.STE_Code,
+joint.QRCodeAttachUrl,
+welder.WED_Code,
+report.JOT_WeldDate,
+joint.IS_Proess
+from HJGL_PW_JointInfo as joint 
+left join HJGL_PW_IsoInfo as iso on iso.ISO_ID =  joint.ISO_ID
+left join Project_Installation as installation on installation.InstallationId = joint.InstallationId
+left join Base_Unit as unit on unit.UnitId = iso.BSU_ID
+LEFT JOIN HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
+left join HJGL_BS_Welder as welder on welder.WED_ID = joint.JOT_CellWelder
+left join HJGL_BO_WeldReportMain as report on report.DReportID = joint.DReportID
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2026-09-08_bwj.sql

@@ -0,0 +1,29 @@
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('1B71BBF6-2686-458F-B6F9-639A5B71AE86','箕제밗돛갛陋醴좆聯츠2020','JGZL/IndustrialPipelineQualityCertificate2020.aspx',52,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3')
+go
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('4755C1B5-6710-4FD7-95B4-A860F8A5CEF8','1B71BBF6-2686-458F-B6F9-639A5B71AE86','藤속',1)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('B2D52C14-3D1E-494D-A5DD-BF254167AC86','1B71BBF6-2686-458F-B6F9-639A5B71AE86','錦맣',2)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('43F539FB-F030-4583-ABE8-09518BE7C135','1B71BBF6-2686-458F-B6F9-639A5B71AE86','�뇜',3)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('6D9D7F04-3114-4557-BA53-AACE99CE43ED','1B71BBF6-2686-458F-B6F9-639A5B71AE86','괏닸',4)
+go
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('151BA8BA-E6A8-4941-AEAB-1D32AD6BAC31','箕제밗돛갛陋삠悧깊2020','JGZL/IndustrialPipelineInstallationSummary2020.aspx',58,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3')
+go
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('C8DEDC8D-E7FC-4F2C-937F-9BD2466BB261','151BA8BA-E6A8-4941-AEAB-1D32AD6BAC31','藤속',1)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('8F4290DB-397F-42A1-87EE-2E6C2A33D6AC','151BA8BA-E6A8-4941-AEAB-1D32AD6BAC31','錦맣',2)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('D9FF8EE0-949D-4936-A7D0-10EDDFB909B4','151BA8BA-E6A8-4941-AEAB-1D32AD6BAC31','�뇜',3)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('6B2BB635-B5B8-4E6C-B17E-6C925E64C211','151BA8BA-E6A8-4941-AEAB-1D32AD6BAC31','괏닸',4)
+go
+
+
+alter table JGZL_IndustrialPipelineInstallationQualityCertificate add FromType char(1)
+go

DataBase/版本日志/HJGLDB_DS_2026-09-09_bwj.sql

@@ -0,0 +1,7 @@
+
+alter table JGZL_IndustrialPipelineInstallationSummary add FromType char(1)
+go
+
+update JGZL_IndustrialPipelineInstallationSummary set FromType='1'
+go
+

DataBase/版本日志/HJGLDB_DS_2026-09-10_bwj.sql

@@ -0,0 +1,5 @@
+
+update Sys_Menu set MenuName='工业管道安装质量证明书（安装）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='工业管道安装质量证明书（2020版）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='工业管道安装汇总表（安装）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='工业管道安装汇总表（2020版）' where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'

DataBase/版本日志/HJGLDB_DS_2026-09-11_bwj.sql

@@ -0,0 +1,134 @@
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('087420E0-A459-4CD7-A1B6-A7A5E001ABF8','工业管道安装质量证明书（改造、修理）','JGZL/ModRepairQualityCertificate.aspx',51,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3')
+go
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('A353742E-6493-406E-9B64-79EE7017FD2B','087420E0-A459-4CD7-A1B6-A7A5E001ABF8','增加',1)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('E8B0D71E-D59E-4245-B8F9-5364AC4F157A','087420E0-A459-4CD7-A1B6-A7A5E001ABF8','修改',2)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('4716B9AF-E7A3-44EF-95AA-E16257D7FF3B','087420E0-A459-4CD7-A1B6-A7A5E001ABF8','删除',3)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('2F03A48C-4F5C-409D-BADD-8B2EC8346C0D','087420E0-A459-4CD7-A1B6-A7A5E001ABF8','保存',4)
+
+go
+
+CREATE TABLE [dbo].[JGZL_ModRepairQualityCertificate](
+	[QualityCertificateId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NOT NULL,
+	[QualityCertificateCode] [nvarchar](50) NULL,
+	[ConUnit] [nvarchar](50) NULL,
+	[ConUnitUSCC] [nvarchar](50) NULL,
+	[LicenseCode] [nvarchar](100) NULL,
+	[LicenseScope] [nvarchar](100) NULL,
+	[NotificationCode] [nvarchar](50) NULL,
+	[ISO_ID] [nvarchar](2000) NULL,
+	[PipelineCode] [nvarchar](2000) NULL,
+	[PipeLength] [nvarchar](50) NULL,
+	[PipeCategory] [nvarchar](50) NULL,
+	[ConCategory] [nvarchar](50) NULL,
+	[UseUnit] [nvarchar](50) NULL,
+	[UseUSCC] [nvarchar](50) NULL,
+	[UseAddress] [nvarchar](100) NULL,
+	[DesignUnit] [nvarchar](50) NULL,
+	[DesignDate] [datetime] NULL,
+	[DesignLicenseCode] [nvarchar](50) NULL,
+	[ModRepairProject] [nvarchar](500) NULL,
+	[Remark] [nvarchar](500) NULL,
+	[CompletionDate] [datetime] NULL,
+	[QC_Inspector] [nvarchar](50) NULL,
+	[QA_Engineer] [nvarchar](50) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JGZL_ModRepairQualityCertificate] PRIMARY KEY CLUSTERED 
+(
+	[QualityCertificateId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[JGZL_ModRepairQualityCertificate]  WITH CHECK ADD  CONSTRAINT [FK_JGZL_ModRepairQualityCertificate_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JGZL_ModRepairQualityCertificate] CHECK CONSTRAINT [FK_JGZL_ModRepairQualityCertificate_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'QualityCertificateId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'QualityCertificateCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'施工单位' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'ConUnit'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'统一社会信用代码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'ConUnitUSCC'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'压力管道安装许可证编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'LicenseCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'许可范围' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'LicenseScope'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'告知单编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'NotificationCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管线号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'PipelineCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道长度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'PipeLength'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道类别' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'PipeCategory'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'施工类别（□改造 □重大维修 □维修）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'ConCategory'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'使用单位' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'UseUnit'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'统一社会信用代码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'UseUSCC'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'使用地点' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'UseAddress'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设计单位' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'DesignUnit'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设计日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'DesignDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设计许可证编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'DesignLicenseCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'改造与重大维修项目' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'ModRepairProject'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'说明' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'Remark'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'竣工日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'CompletionDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'质检员' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'QC_Inspector'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'质量保证工程师' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'QA_Engineer'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'压力管道改造维修质量证明书' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_ModRepairQualityCertificate'
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2026-09-14_bwj.sql

@@ -0,0 +1,74 @@
+
+CREATE TABLE [dbo].[JGZL_LeakageVacuum](
+	[LeakageVacuumId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NOT NULL,
+	[SystemName] [nvarchar](50) NULL,
+	[SystemCode] [nvarchar](50) NULL,
+	[CheckItemResult1] [nvarchar](50) NULL,
+	[CheckItemResult2] [nvarchar](50) NULL,
+	[CheckItemResult3] [nvarchar](50) NULL,
+	[CheckItemResult4] [nvarchar](50) NULL,
+	[CheckItemResult5] [nvarchar](50) NULL,
+	[Conclusion] [nvarchar](500) NULL,
+ CONSTRAINT [PK_JGZL_LeakageVacuum] PRIMARY KEY CLUSTERED 
+(
+	[LeakageVacuumId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[JGZL_LeakageVacuum]  WITH CHECK ADD  CONSTRAINT [FK_JGZL_LeakageVacuum_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JGZL_LeakageVacuum] CHECK CONSTRAINT [FK_JGZL_LeakageVacuum_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_LeakageVacuum', @level2type=N'COLUMN',@level2name=N'LeakageVacuumId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_LeakageVacuum', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'系统名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_LeakageVacuum', @level2type=N'COLUMN',@level2name=N'SystemName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'系统编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_LeakageVacuum', @level2type=N'COLUMN',@level2name=N'SystemCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'试验结论' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_LeakageVacuum', @level2type=N'COLUMN',@level2name=N'Conclusion'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道系统泄漏性/真空试验条件确认与试验记录' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_LeakageVacuum'
+GO
+
+
+CREATE TABLE [dbo].[JGZL_LeakageVacuumTestRecord](
+	[LeakageVacuumTestRecordId] [nvarchar](50) NOT NULL,
+	[LeakageVacuumId] [nvarchar](50) NULL,
+	[PipelineId] [nvarchar](50) NULL,
+	[PipelineCode] [nvarchar](50) NULL,
+	[DesignPressure] [nvarchar](50) NULL,
+	[DesignTem] [nvarchar](50) NULL,
+	[TestAmbientTemp] [nvarchar](50) NULL,
+	[TestMediumTemp] [nvarchar](50) NULL,
+	[LeakPressure] [nvarchar](50) NULL,
+	[LeakMedium] [nvarchar](50) NULL,
+	[VacuumPressure] [nvarchar](50) NULL,
+	[VacuumMedium] [nvarchar](50) NULL,
+ CONSTRAINT [PK_JGZL_LeakageVacuumTestRecord] PRIMARY KEY CLUSTERED 
+(
+	[LeakageVacuumTestRecordId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[JGZL_LeakageVacuumTestRecord]  WITH CHECK ADD  CONSTRAINT [FK_JGZL_LeakageVacuumTestRecord_JGZL_LeakageVacuum] FOREIGN KEY([LeakageVacuumId])
+REFERENCES [dbo].[JGZL_LeakageVacuum] ([LeakageVacuumId])
+GO
+
+ALTER TABLE [dbo].[JGZL_LeakageVacuumTestRecord] CHECK CONSTRAINT [FK_JGZL_LeakageVacuumTestRecord_JGZL_LeakageVacuum]
+GO
+
+update Sys_Menu set MenuName='管道系统泄漏性/真空试验条件确认与试验记录',Url='JGZL/LeakageVacuum.aspx' where MenuId='FF56CCBE-0B8C-4AF6-832E-EC6ED1584C94'
+go

DataBase/版本日志/HJGLDB_DS_2026-09-16_bwj.sql

@@ -0,0 +1,7 @@
+
+update Sys_Menu set MenuName='工业管道安装质量证明书（安装2025版）',SortIndex=50 where MenuId='F5833B38-65DF-4236-A676-EE75F9487061'
+update Sys_Menu set MenuName='工业管道安装汇总表（安装2025版）',SortIndex=51 where MenuId='C527812C-0FF8-4EAC-B1FD-3B561DBE46ED'
+update Sys_Menu set MenuName='工业管道安装质量证明书（安装2020版）',SortIndex=53 where MenuId='1B71BBF6-2686-458F-B6F9-639A5B71AE86'
+update Sys_Menu set MenuName='工业管道安装汇总表（安装2020版）',SortIndex=54 where MenuId='151BA8BA-E6A8-4941-AEAB-1D32AD6BAC31'
+update Sys_Menu set MenuName='压力管道改造维修质量证明书（改造、重大修理、维修）',SortIndex=55 where MenuId='087420E0-A459-4CD7-A1B6-A7A5E001ABF8'
+go

DataBase/版本日志/HJGLDB_DS_2026-09-18_bwj.sql

@@ -0,0 +1,126 @@
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule)
+values('BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','工业管道安装汇总表（舟山特检院要求表）','JGZL/IndustrialInstallationSummaryZhoushan.aspx',52,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3')
+go
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('7D9788EA-5015-4C75-9345-6413C5CE31B7','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','增加',1)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('4F1EFB19-F2B0-45FA-A23D-E099B0F349C6','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','修改',2)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('987AB25A-D7ED-4955-B871-21CD85B75282','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','删除',3)
+insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('868F695F-2963-49AE-A479-4E6BCB90B061','BC7616E5-E6B2-4C32-A3C4-8B2877B73DD0','提交',4)
+go
+
+
+CREATE TABLE [dbo].[JGZL_IndustrialInstallationSummaryZhoushan](
+	[SummaryId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[InstallationName] [nvarchar](50) NULL,
+	[TestPackageCode] [nvarchar](50) NULL,
+	[PipelineName] [nvarchar](50) NULL,
+	[PipelineCode] [nvarchar](50) NULL,
+	[PipelineLevel] [nvarchar](50) NULL,
+	[Material] [nvarchar](50) NULL,
+	[Medium] [nvarchar](50) NULL,
+	[Diameter] [decimal](18, 2) NULL,
+	[WallThickness] [decimal](18, 2) NULL,
+	[PipelineLength] [decimal](18, 2) NULL,
+	[WeldJointsCount] [int] NULL,
+	[PipeFittings] [int] NULL,
+	[StartPoint] [nvarchar](50) NULL,
+	[EndPoint] [nvarchar](50) NULL,
+	[DesignTemperature] [decimal](18, 2) NULL,
+	[DesignPressure] [decimal](18, 2) NULL,
+	[OperatingTemperature] [decimal](18, 2) NULL,
+	[OperatingPressure] [decimal](18, 2) NULL,
+	[PressureTestMedium] [nvarchar](50) NULL,
+	[PressureTestPressure] [decimal](18, 2) NULL,
+	[TestDate] [datetime] NULL,
+ CONSTRAINT [PK_JGZL_IndustrialInstallationSummaryZhoushan] PRIMARY KEY CLUSTERED 
+(
+	[SummaryId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[JGZL_IndustrialInstallationSummaryZhoushan]  WITH CHECK ADD  CONSTRAINT [FK_JGZL_IndustrialInstallationSummaryZhoushan_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JGZL_IndustrialInstallationSummaryZhoushan] CHECK CONSTRAINT [FK_JGZL_IndustrialInstallationSummaryZhoushan_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'SummaryId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'装置（管道）名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'InstallationName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'试压包编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'TestPackageCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道级别' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineLevel'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'材质' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'Material'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'介质' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'Medium'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'公称直径（mm）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'Diameter'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'公称壁厚（mm）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'WallThickness'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道长度（m）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipelineLength'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'焊口总数（个）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'WeldJointsCount'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管件数量（个）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PipeFittings'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'起点' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'StartPoint'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'终点' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'EndPoint'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设计温度(℃)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'DesignTemperature'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设计压力(MPa)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'DesignPressure'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作温度℃' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'OperatingTemperature'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'操作压力Mpa' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'OperatingPressure'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'压力试验介质' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PressureTestMedium'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'压力试验压力Mpa' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'PressureTestPressure'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'试压时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan', @level2type=N'COLUMN',@level2name=N'TestDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'压力管道安装汇总表（舟山特检院要求表）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_IndustrialInstallationSummaryZhoushan'
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2026-09-21_gf.sql

@@ -0,0 +1,2 @@
+alter table [dbo].[OAM_User] add IsSelfCreate bit null
+GO

DataBase/版本日志/HJGLDB_DS_2026-09-22_gf.sql

@@ -0,0 +1,2 @@
+alter table HJGL_BS_Welder add IsSelfCreate bit null
+GO

DataBase/版本日志/HJGLDB_DS_2026-09-23_gf.sql

@@ -0,0 +1,67 @@
+
+CREATE VIEW [dbo].[View_UnitWeldPerformance]
+AS
+SELECT 
+    NEWID() AS Id,
+	'' as ProjectCode,
+	total.WED_Unit,
+	un.UnitCode,-- 单位代码
+	un.UnitName,--单位名称
+	-------------本期start
+    ISNULL(MRPerson.MRPersonNum,0) AS MRPersonNum, --维保在岗人数
+    ISNULL(TTPerson.TTPersonNum,0) AS TTPersonNum, --技改在岗人数
+    ISNULL(WeldJoint.totalSize,0) AS TotalSize, --当日焊接量
+    ISNULL(WorkProject.WorkProjectNum,0) AS WorkProjectNum --维保工作项数
+FROM 
+ --总达因值 --总焊口
+  (SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint
+			,joint.WED_Unit
+			FROM View_JointWelder joint
+				LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID 	 
+			WHERE  joint.DReportID IS NOT NULL and report.JOT_WeldDate >= '2026-01-01'
+			GROUP  BY joint.WED_Unit) AS total 
+			
+
+--维保在岗人数，有几个人领用了焊材就是几个人
+ LEFT JOIN (SELECT COUNT(usingMat.UsingMatId) AS MRPersonNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) 
+			GROUP BY welder.WED_Unit) AS MRPerson 
+			ON MRPerson.WED_Unit = total.WED_Unit 
+			   
+--技改在岗人数，当焊材领用时选择了管道焊接的人数
+ LEFT JOIN (SELECT COUNT(distinct usingMat.UsingMan) AS TTPersonNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			left join dbo.Weld_UsingPlan usingPlan on usingPlan.UsingPlanId=usingMat.UsingPlanId
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) and usingPlan.IsSteelStru=0
+			GROUP BY welder.WED_Unit) AS TTPerson 
+			ON TTPerson.WED_Unit = total.WED_Unit         
+  --当日焊接量，只统计自建焊工的总工作量
+  LEFT JOIN (SELECT SUM(joint.JOT_Size) AS totalSize
+			,joint.WED_Unit
+			FROM View_JointWelder joint
+			LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID 	 
+			LEFT JOIN HJGL_BS_Welder wed on wed.WED_ID=joint.Welder
+			WHERE  joint.DReportID IS NOT NULL and report.JOT_WeldDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and report.JOT_WeldDate<CAST(GETDATE() AS date) 
+			and wed.IsSelfCreate=1
+			GROUP  BY joint.WED_Unit) AS WeldJoint
+			ON WeldJoint.WED_Unit = total.WED_Unit        
+ --维保工作项数，自建焊工领用的项目数量
+ LEFT JOIN (SELECT COUNT(distinct usingMat.ProjectId) AS WorkProjectNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) 
+			and welder.IsSelfCreate=1
+			GROUP BY welder.WED_Unit) AS WorkProject
+			ON WorkProject.WED_Unit = total.WED_Unit              
+LEFT JOIN dbo.Base_Unit un ON un.UnitId=total.WED_Unit
+
+
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2026-09-24_gf.sql

@@ -0,0 +1,68 @@
+
+ALTER VIEW [dbo].[View_UnitWeldPerformance]
+AS
+SELECT 
+    NEWID() AS Id,
+	'' as ProjectCode,
+	total.WED_Unit,
+	un.UnitCode,-- 单位代码
+	un.UnitName,--单位名称
+	-------------本期start
+	DATEADD(day, -1, CAST(GETDATE() AS date)) as ReportDate,  --统计日期
+    ISNULL(MRPerson.MRPersonNum,0) AS MRPersonNum, --维保在岗人数
+    ISNULL(TTPerson.TTPersonNum,0) AS TTPersonNum, --技改在岗人数
+    ISNULL(WeldJoint.totalSize,0) AS TotalSize, --当日焊接量
+    ISNULL(WorkProject.WorkProjectNum,0) AS WorkProjectNum --维保工作项数
+FROM 
+ --总达因值 --总焊口
+  (SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint
+			,joint.WED_Unit
+			FROM View_JointWelder joint
+				LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID 	 
+			WHERE  joint.DReportID IS NOT NULL and report.JOT_WeldDate >= '2026-01-01'
+			GROUP  BY joint.WED_Unit) AS total 
+			
+
+--维保在岗人数，有几个人领用了焊材就是几个人
+ LEFT JOIN (SELECT COUNT(usingMat.UsingMatId) AS MRPersonNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) 
+			GROUP BY welder.WED_Unit) AS MRPerson 
+			ON MRPerson.WED_Unit = total.WED_Unit 
+			   
+--技改在岗人数，当焊材领用时选择了管道焊接的人数
+ LEFT JOIN (SELECT COUNT(distinct usingMat.UsingMan) AS TTPersonNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			left join dbo.Weld_UsingPlan usingPlan on usingPlan.UsingPlanId=usingMat.UsingPlanId
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) and usingPlan.IsSteelStru=0
+			GROUP BY welder.WED_Unit) AS TTPerson 
+			ON TTPerson.WED_Unit = total.WED_Unit         
+  --当日焊接量，只统计自建焊工的总工作量
+  LEFT JOIN (SELECT SUM(joint.JOT_Size) AS totalSize
+			,joint.WED_Unit
+			FROM View_JointWelder joint
+			LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID 	 
+			LEFT JOIN HJGL_BS_Welder wed on wed.WED_ID=joint.Welder
+			WHERE  joint.DReportID IS NOT NULL and report.JOT_WeldDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and report.JOT_WeldDate<CAST(GETDATE() AS date) 
+			and wed.IsSelfCreate=1
+			GROUP  BY joint.WED_Unit) AS WeldJoint
+			ON WeldJoint.WED_Unit = total.WED_Unit        
+ --维保工作项数，自建焊工领用的项目数量
+ LEFT JOIN (SELECT COUNT(distinct usingMat.ProjectId) AS WorkProjectNum,
+            welder.WED_Unit
+            FROM dbo.HJGL_BS_Welder welder
+			left join dbo.Weld_UsingMat usingMat on usingMat.UsingMan=welder.WED_ID
+			WHERE usingMat.UsingDate>= DATEADD(day, -1, CAST(GETDATE() AS date)) and usingMat.UsingDate<CAST(GETDATE() AS date) 
+			and welder.IsSelfCreate=1
+			GROUP BY welder.WED_Unit) AS WorkProject
+			ON WorkProject.WED_Unit = total.WED_Unit              
+LEFT JOIN dbo.Base_Unit un ON un.UnitId=total.WED_Unit
+
+
+GO
+
+

DataBase/版本日志/HJGLDB_DS_2026-10-09_gf.sql

@@ -0,0 +1,4 @@
+update Sys_Menu set MenuName='工艺管线数据表识别',SortIndex=5,SuperMenu='8IDKGJE2-09B1-4607-6666-DCC3O48F080F' where MenuId='EFD1E914-E79C-4F5E-A2F7-CFF4F7821284'
+update Sys_Menu set SortIndex=15,SuperMenu='8IDKGJE2-09B1-4607-6666-DCC3O48F080F' where MenuId='34BAD63E-EF7C-4D7E-8641-C706BBFCD85F'
+update Sys_Menu set SortIndex=21,SuperMenu='8IDKGJE2-09B1-4607-6666-DCC3O48F080F' where MenuId='6B16D1D4-FBDA-4B2B-AE0A-B465C686C27D'
+GO

HJGL_DS/BLL/BLL.csproj

@@ -264,9 +264,13 @@
     <Compile Include="JGZL\ArchivalTransferService.cs" />
     <Compile Include="JGZL\DocumentDescriptionService.cs" />
     <Compile Include="JGZL\FileDirectoryService.cs" />
+    <Compile Include="JGZL\IndustrialInstallationSummaryZhoushanService.cs" />
     <Compile Include="JGZL\InsulationAcceptanceRecordItemService.cs" />
     <Compile Include="JGZL\InsulationAcceptanceRecordService.cs" />
+    <Compile Include="JGZL\LeakageVacuumService.cs" />
+    <Compile Include="JGZL\LeakageVacuumTestRecordServic.cs" />
     <Compile Include="JGZL\LeakTestOfPipelineSystemRecordItemService.cs" />
+    <Compile Include="JGZL\ModRepairQualityCertificateService.cs" />
     <Compile Include="JGZL\PressureTestOfPipelineSystemRecordItemService.cs" />
     <Compile Include="JGZL\AnticorrosionEngineeringInspectionRecordItemService.cs" />
     <Compile Include="JGZL\LeakTestOfPipelineSystemRecordService.cs" />
@@ -359,4 +363,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

HJGL_DS/BLL/Common/Const.cs

@@ -1831,6 +1831,11 @@ namespace BLL
         /// </summary>
         public const string JGZL_BlowingCleaningMenuId = "E64FC226-8164-43F7-AA4D-6E268EDEC5BC";
 
+        /// <summary>
+        /// 管道系统泄漏性/真空试验条件确认与试验记录
+        /// </summary>
+        public const string JGZL_LeakageVacuumMenuId = "FF56CCBE-0B8C-4AF6-832E-EC6ED1584C94";
+
 
         /// <summary>
         /// 防腐工程质量验收记录
@@ -1890,11 +1895,21 @@ namespace BLL
         /// </summary>
         public const string JGZL_IndustrialPipelineInstallationQualityCertificateMenuId = "F5833B38-65DF-4236-A676-EE75F9487061";
 
+        /// <summary>
+        /// 工业管道安装质量证明书（改造、修理）
+        /// </summary>
+        public const string JGZL_ModRepairQualityCertificateMenuId = "087420E0-A459-4CD7-A1B6-A7A5E001ABF8";
+
         /// <summary>
         /// 工业管道安装汇总表
         /// </summary>
         public const string JGZL_IndustrialPipelineInstallationSummaryMenuId = "C527812C-0FF8-4EAC-B1FD-3B561DBE46ED";
 
+        /// <summary>
+        /// 工业管道安装质量证明书2020版
+        /// </summary>
+        public const string JGZL_IndustrialPipelineQualityCertificate2020MenuId = "1B71BBF6-2686-458F-B6F9-639A5B71AE86";
+
         /// <summary>
         /// 材料质量证明文件一览表
         /// </summary>
@@ -2519,11 +2534,26 @@ namespace BLL
         /// </summary>
         public const string JGZL_IndustrialPipelineInstallationQualityCertificateUrl = "File\\Word\\JGZL\\工业管道安装质量证明书导出模板.docx";
 
+        /// <summary>
+        /// 工业管道安装质量证明书（改造、修理）导出模板
+        /// </summary>
+        public const string JGZL_ModRepairQualityCertificateUrl = "File\\Word\\JGZL\\工业管道安装质量证明书（改造、修理）导出模板.docx";
+
+        /// <summary>
+        /// 压力管道安装质量证明2020导出模板
+        /// </summary>
+        public const string JGZL_IndustrialPipelineQualityCertificate2020Url = "File\\Word\\JGZL\\压力管道安装质量证明2020导出模板.docx";
+
         /// <summary>
         /// 工业管道安装汇总表导出模板
         /// </summary>
         public const string JGZL_IndustrialPipelineInstallationSummaryUrl = "File\\Word\\JGZL\\工业管道安装汇总表导出模板.docx";
 
+        /// <summary>
+        /// 工业管道安装汇总表2020导出模板
+        /// </summary>
+        public const string JGZL_IndustrialPipelineInstallationSummary2020Url = "File\\Word\\JGZL\\工业管道安装汇总表2020导出模板.docx";
+
         /// <summary>
         /// 工程施工开工报告导出模板
         /// </summary>
@@ -2600,6 +2630,11 @@ namespace BLL
         /// </summary>
         public const string JGZL_ArchivalTransferUrl = "File\\Word\\JGZL\\档案资料移交表导出模板.docx";
 
+        /// <summary>
+        /// 管道系统泄漏性/真空试验条件确认与试验记录
+        /// </summary>
+        public const string JGZL_LeakageVacuumUrl = "File\\Word\\JGZL\\管道系统泄漏性试验记录导出模板.docx";
+
         #endregion
 
         /// <summary>
@@ -2611,5 +2646,7 @@ namespace BLL
         /// 焊缝返修台账导出模板
         /// </summary>
         public const string HJGL_WeldRepairListsUrl = "File\\Excel\\焊缝返修台账导出模板.xlsx";
+
+       
     }
 }

HJGL_DS/BLL/HJGL/JoinMarking/DrawingInfoService.cs

@@ -1,5 +1,10 @@
 using System;
+using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BLL
 {
@@ -8,6 +13,10 @@ namespace BLL
     /// </summary>
     public static class DrawingInfoService
     {
+        private static readonly Regex JointNoRegex = new Regex(
+            @"^(?<prefix>[^0-9]*)(?<number>[0-9]+(?:\.[0-9]+)?)(?<suffix>.*)$",
+            RegexOptions.Compiled);
+
         /// <summary>
         /// 根据附件文件标识获取图纸 JSON。
         /// </summary>
@@ -24,6 +33,136 @@ namespace BLL
                 .FirstOrDefault();
         }
 
+        /// <summary>
+        /// 同步管线图纸中的焊口标注，数据由调用方统一提交。
+        /// </summary>
+        public static void UpdateJointAnnotation(Model.SGGLDB db, string isoId, string oldJointNo, string newJointNo)
+        {
+            if (db == null || string.IsNullOrWhiteSpace(isoId)
+                || string.IsNullOrWhiteSpace(oldJointNo) || string.IsNullOrWhiteSpace(newJointNo)
+                || string.Equals(oldJointNo, newJointNo, StringComparison.Ordinal))
+            {
+                return;
+            }
+
+            Model.AttachFile attachFile = db.AttachFile.FirstOrDefault(x =>
+                x.ToKeyId == isoId && x.MenuId == Const.HJGL_PipelineManageMenuId);
+            if (attachFile == null || string.IsNullOrWhiteSpace(attachFile.AttachSource))
+            {
+                return;
+            }
+
+            List<string> attachFileIds;
+            try
+            {
+                attachFileIds = JArray.Parse(attachFile.AttachSource)
+                    .OfType<JObject>()
+                    .Select(x => x.Value<string>("id"))
+                    .Where(x => !string.IsNullOrWhiteSpace(x))
+                    .Distinct()
+                    .ToList();
+            }
+            catch (JsonException)
+            {
+                return;
+            }
+
+            var drawingInfos = db.HJGL_DrawingInfo
+                .Where(x => attachFileIds.Contains(x.AttachFileId))
+                .ToList();
+
+            foreach (Model.HJGL_DrawingInfo drawingInfo in drawingInfos)
+            {
+                if (string.IsNullOrWhiteSpace(drawingInfo.DrawingJson))
+                {
+                    continue;
+                }
+
+                try
+                {
+                    string drawingJson = UpdateDrawingJson(drawingInfo.DrawingJson, oldJointNo, newJointNo);
+                    if (drawingJson != null)
+                    {
+                        drawingInfo.DrawingJson = drawingJson;
+                    }
+                }
+                catch (JsonException)
+                {
+                    // 单张图纸 JSON 异常时跳过，不影响焊口信息更新。
+                }
+            }
+        }
+
+        private static string UpdateDrawingJson(string drawingJson, string oldJointNo, string newJointNo)
+        {
+            JObject drawing = JsonConvert.DeserializeObject<JObject>(drawingJson);
+            JObject annotations = drawing == null ? null : drawing["annotations"] as JObject;
+            if (annotations == null)
+            {
+                return null;
+            }
+
+            JointNoParts jointNoParts = JointNoParts.Parse(newJointNo);
+            List<JObject> matchedAnnotations = annotations.Properties()
+                .SelectMany(x => x.Value.OfType<JObject>())
+                .Where(x => string.Equals(x.Value<string>("label"), oldJointNo, StringComparison.Ordinal))
+                .ToList();
+
+            foreach (JObject annotation in matchedAnnotations)
+            {
+                annotation["label"] = newJointNo;
+                annotation["displayValue"] = JToken.FromObject(jointNoParts.DisplayValue);
+
+                JObject settings = annotation["settings"] as JObject ?? new JObject();
+                settings["prefix"] = jointNoParts.Prefix;
+                settings["suffix"] = jointNoParts.Suffix;
+                annotation["settings"] = settings;
+            }
+
+            return matchedAnnotations.Count > 0 ? JsonConvert.SerializeObject(drawing) : null;
+        }
+
+        private sealed class JointNoParts
+        {
+            public string Prefix { get; private set; }
+
+            public object DisplayValue { get; private set; }
+
+            public string Suffix { get; private set; }
+
+            public static JointNoParts Parse(string jointNo)
+            {
+                Match match = JointNoRegex.Match(jointNo);
+                if (!match.Success)
+                {
+                    return new JointNoParts { Prefix = string.Empty, DisplayValue = jointNo, Suffix = string.Empty };
+                }
+
+                string number = match.Groups["number"].Value;
+                string integerPart = number.Split('.')[0];
+                long numberValue;
+                decimal decimalValue;
+                bool hasLeadingZero = integerPart.Length > 1 && integerPart.StartsWith("0");
+                object displayValue = number;
+                if (!hasLeadingZero && long.TryParse(number, out numberValue))
+                {
+                    displayValue = numberValue;
+                }
+                else if (!hasLeadingZero && decimal.TryParse(number, NumberStyles.AllowDecimalPoint,
+                    CultureInfo.InvariantCulture, out decimalValue))
+                {
+                    displayValue = decimalValue;
+                }
+
+                return new JointNoParts
+                {
+                    Prefix = match.Groups["prefix"].Value,
+                    DisplayValue = displayValue,
+                    Suffix = match.Groups["suffix"].Value
+                };
+            }
+        }
+
         /// <summary>
         /// 新增或更新图纸标注信息，同一 AttachFileId 只保留一条记录。
         /// </summary>

HJGL_DS/BLL/HJGL/PersonManage/HJGL_PersonManageService.cs

@@ -52,7 +52,7 @@ namespace BLL
             newWelder.ProjectId = welder.ProjectId;
             newWelder.IdentityCard = welder.IdentityCard;
             newWelder.SignatureUrl = welder.SignatureUrl;
-
+            newWelder.IsSelfCreate = welder.IsSelfCreate;
             newWelder.MaxHanTiao = welder.MaxHanTiao;
             newWelder.MaxWeldingWire = welder.MaxWeldingWire;
 
@@ -95,6 +95,7 @@ namespace BLL
                 newWelder.MaxHanTiao = welder.MaxHanTiao;
                 newWelder.MaxWeldingWire = welder.MaxWeldingWire;
                 newWelder.IsOAM = welder.IsOAM;
+                newWelder.IsSelfCreate = welder.IsSelfCreate;
                 if (!string.IsNullOrEmpty(welder.PhotoUrl) && newWelder.PhotoUrl != welder.PhotoUrl)
                 {
                     newWelder.PhotoUrl = welder.PhotoUrl;

HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs

@@ -96,6 +96,9 @@ namespace BLL
             Model.HJGL_PW_JointInfo newJointInfo = db.HJGL_PW_JointInfo.FirstOrDefault(e => e.JOT_ID == jointInfo.JOT_ID);
             if (newJointInfo != null)
             {
+                Model.HJGL_PW_JointInfo originalJointInfo = db.HJGL_PW_JointInfo.GetOriginalEntityState(newJointInfo);
+                string oldJointNo = originalJointInfo == null ? newJointInfo.JOT_JointNo : originalJointInfo.JOT_JointNo;
+                string drawingIsoId = originalJointInfo == null ? newJointInfo.ISO_ID : originalJointInfo.ISO_ID;
                 newJointInfo.JOT_JointNo = jointInfo.JOT_JointNo;
                 newJointInfo.DReportID = jointInfo.DReportID;
                 newJointInfo.ISO_ID = jointInfo.ISO_ID;
@@ -138,6 +141,7 @@ namespace BLL
                 newJointInfo.PressureTestPackageNo = jointInfo.PressureTestPackageNo;
                 newJointInfo.IsGold = jointInfo.IsGold;
 
+                DrawingInfoService.UpdateJointAnnotation(db, drawingIsoId, oldJointNo, newJointInfo.JOT_JointNo);
                 db.SubmitChanges();
             }
         }
@@ -501,15 +505,24 @@ namespace BLL
             if (operateState == Const.Delete || jointAttribute != "固定")
             {
                 Model.HJGL_PW_JointInfo deleteJointInfo = db.HJGL_PW_JointInfo.FirstOrDefault(e => e.JOT_ID == jotId);
-                if (deleteJointInfo.JOT_JointNo.Last() == 'G')
+                if (deleteJointInfo != null && !string.IsNullOrEmpty(deleteJointInfo.JOT_JointNo)
+                    && deleteJointInfo.JOT_JointNo.Last() == 'G')
                 {
+                    string oldJointNo = deleteJointInfo.JOT_JointNo;
                     deleteJointInfo.JOT_JointNo = deleteJointInfo.JOT_JointNo.Substring(0, deleteJointInfo.JOT_JointNo.Length - 1);
+                    DrawingInfoService.UpdateJointAnnotation(db, deleteJointInfo.ISO_ID, oldJointNo, deleteJointInfo.JOT_JointNo);
                     db.SubmitChanges();
                 }
             }
             else
             {
                 Model.HJGL_PW_JointInfo addJointInfo = db.HJGL_PW_JointInfo.FirstOrDefault(e => e.JOT_ID == jotId);
+                if (addJointInfo == null || string.IsNullOrEmpty(addJointInfo.JOT_JointNo))
+                {
+                    return;
+                }
+
+                string oldJointNo = addJointInfo.JOT_JointNo;
                 if (addJointInfo.JOT_JointNo.Last() != 'G')
                 {
                     addJointInfo.JOT_JointNo += "G";
@@ -518,6 +531,7 @@ namespace BLL
                 {
                     addJointInfo.JOT_JointNo += "H";
                 }
+                DrawingInfoService.UpdateJointAnnotation(db, addJointInfo.ISO_ID, oldJointNo, addJointInfo.JOT_JointNo);
                 db.SubmitChanges();
             }
         }

HJGL_DS/BLL/JGZL/IndustrialInstallationSummaryZhoushanService.cs

@@ -0,0 +1,76 @@
+using Model;
+using Org.BouncyCastle.Bcpg.OpenPgp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 压力管道安装汇总表（舟山特检院要求表）
+    /// </summary>
+    public class IndustrialInstallationSummaryZhoushanService
+    {
+        /// <summary>
+        /// 根据项目Id获取压力管道安装汇总表（舟山特检院要求表）
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Model.JGZL_IndustrialInstallationSummaryZhoushan> GetInstallationSummaryZhoushanByProjectId(string projectId)
+        {
+            return (from x in Funs.DB.JGZL_IndustrialInstallationSummaryZhoushan where x.ProjectId == projectId select x).ToList();
+        }
+
+        /// <summary>
+        /// 增加
+        /// </summary>
+        /// <param name="zs"></param>
+        public static void AddIndustrialInstallationSummaryZhoushan(Model.JGZL_IndustrialInstallationSummaryZhoushan zs)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_IndustrialInstallationSummaryZhoushan newZS = new JGZL_IndustrialInstallationSummaryZhoushan();
+            newZS.SummaryId = zs.SummaryId;
+            newZS.ProjectId= zs.ProjectId;
+            newZS.InstallationName= zs.InstallationName;
+            newZS.TestPackageCode = zs.TestPackageCode;
+            newZS.PipelineName = zs.PipelineName;
+            newZS.PipelineCode = zs.PipelineCode;
+            newZS.PipelineLevel = zs.PipelineLevel;
+            newZS.Material = zs.Material;
+            newZS.Medium= zs.Medium;
+            newZS.Diameter= zs.Diameter;
+            newZS.WallThickness= zs.WallThickness;
+            newZS.PipelineLength = zs.PipelineLength;
+            newZS.WeldJointsCount= zs.WeldJointsCount;
+            newZS.PipeFittings= zs.PipeFittings;
+            newZS.StartPoint= zs.StartPoint;
+            newZS.EndPoint= zs.EndPoint;
+            newZS.DesignTemperature= zs.DesignTemperature;
+            newZS.DesignPressure= zs.DesignPressure;
+            newZS.OperatingTemperature= zs.OperatingTemperature;
+            newZS.OperatingPressure = zs.OperatingPressure;
+            newZS.PressureTestPressure= zs.PressureTestPressure;
+            newZS.PressureTestMedium = zs.PressureTestMedium;
+            newZS.TestDate= zs.TestDate;
+            db.JGZL_IndustrialInstallationSummaryZhoushan.InsertOnSubmit(newZS);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 根据项目Id删除压力管道安装汇总表（舟山特检院要求表）
+        /// </summary>
+        /// <param name="projectId"></param>
+        public static void DeleteIndustrialInstallationSummaryZhoushanByProjectId(string projectId)
+        {
+            SGGLDB db = Funs.DB;
+            var q = (from x in db.JGZL_IndustrialInstallationSummaryZhoushan where x.ProjectId == projectId select x).ToList();
+            if (q.Count>0)
+            {
+                db.JGZL_IndustrialInstallationSummaryZhoushan.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationQualityCertificateService.cs

@@ -20,9 +20,9 @@ namespace BLL
             return Funs.DB.JGZL_IndustrialPipelineInstallationQualityCertificate.FirstOrDefault(e => e.CertificateId == Id);
         }
 
-        public static Model.JGZL_IndustrialPipelineInstallationQualityCertificate GetIndustrialPipelineInstallationQualityCertificateByProjectId(string projectId)
+        public static Model.JGZL_IndustrialPipelineInstallationQualityCertificate GetIndustrialPipelineInstallationQualityCertificateByProjectId(string projectId,string fromType)
         {
-            return Funs.DB.JGZL_IndustrialPipelineInstallationQualityCertificate.FirstOrDefault(e => e.ProjectId == projectId);
+            return Funs.DB.JGZL_IndustrialPipelineInstallationQualityCertificate.FirstOrDefault(e => e.ProjectId == projectId && e.FromType == fromType);
         }
 
         /// <summary>
@@ -58,6 +58,7 @@ namespace BLL
             newModel.QualificationCertificateCode = model.QualificationCertificateCode;
             newModel.InstitutionalApprovalCertificate = model.InstitutionalApprovalCertificate;
             newModel.InstallationInspection = model.InstallationInspection;
+            newModel.FromType = model.FromType;
             db.JGZL_IndustrialPipelineInstallationQualityCertificate.InsertOnSubmit(newModel);
             db.SubmitChanges();
         }
@@ -116,11 +117,11 @@ namespace BLL
         /// <param name="dropName"></param>
         /// <param name="projectId"></param>
         /// <param name="isShowPlease"></param>
-        public static void InitIndustrialPipelineInstallationQualityCertificateDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        public static void InitIndustrialPipelineInstallationQualityCertificateDownList(FineUIPro.DropDownList dropName, string projectId,string fromType, bool isShowPlease)
         {
             dropName.DataValueField = "CertificateId";
             dropName.DataTextField = "CertificateCode";
-            dropName.DataSource = GetIndustrialPipelineInstallationQualityCertificateList(projectId);
+            dropName.DataSource = GetIndustrialPipelineInstallationQualityCertificateList(projectId,fromType);
             dropName.DataBind();
             if (isShowPlease)
             {
@@ -133,11 +134,11 @@ namespace BLL
         /// </summary>
         /// <param name="projectId">项目Id</param>
         /// <returns></returns>
-        public static List<Model.JGZL_IndustrialPipelineInstallationQualityCertificate> GetIndustrialPipelineInstallationQualityCertificateList(string projectId)
+        public static List<Model.JGZL_IndustrialPipelineInstallationQualityCertificate> GetIndustrialPipelineInstallationQualityCertificateList(string projectId, string fromType)
         {
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
-                var q = (from x in db.JGZL_IndustrialPipelineInstallationQualityCertificate orderby x.CertificateCode descending select x).ToList();
+                var q = (from x in db.JGZL_IndustrialPipelineInstallationQualityCertificate where x.FromType == fromType orderby x.CertificateCode descending select x).ToList();
                 if (!string.IsNullOrWhiteSpace(projectId))
                 {
                     q = q.Where(x => x.ProjectId == projectId).ToList();

HJGL_DS/BLL/JGZL/IndustrialPipelineInstallationSummaryService.cs

@@ -19,9 +19,9 @@ namespace BLL
             return Funs.DB.JGZL_IndustrialPipelineInstallationSummary.FirstOrDefault(e => e.SummaryId == Id);
         }
 
-        public static Model.JGZL_IndustrialPipelineInstallationSummary GetIndustrialPipelineInstallationSummaryByPipelineCode(string pipelineCode)
+        public static Model.JGZL_IndustrialPipelineInstallationSummary GetIndustrialPipelineInstallationSummaryByPipelineCode(string pipelineCode,string fromType)
         {
-            return Funs.DB.JGZL_IndustrialPipelineInstallationSummary.FirstOrDefault(e => e.PipelineCode == pipelineCode);
+            return Funs.DB.JGZL_IndustrialPipelineInstallationSummary.FirstOrDefault(e => e.PipelineCode == pipelineCode && e.FromType == fromType);
         }
 
         public static List<Model.JGZL_IndustrialPipelineInstallationSummary> GetIndustrialPipelineInstallationSummaryByProjectId(string projectId)
@@ -69,6 +69,7 @@ namespace BLL
             newModel.OperatingTemperature = model.OperatingTemperature;
             newModel.VoltageResistantTestDate = model.VoltageResistantTestDate;
             newModel.LeakageTestDate = model.LeakageTestDate;
+            newModel.FromType = model.FromType;
             db.JGZL_IndustrialPipelineInstallationSummary.InsertOnSubmit(newModel);
             db.SubmitChanges();
         }
@@ -117,11 +118,11 @@ namespace BLL
         /// 根据项目Id删除工业管道安装汇总表
         /// </summary>
         /// <param name="Id"></param>
-        public static void DeleteIndustrialPipelineInstallationSummaryByProjectId(string projectId)
+        public static void DeleteIndustrialPipelineInstallationSummaryByProjectId(string projectId,string fromType)
         {
             SGGLDB db = Funs.DB;
-            var q = (from x in db.JGZL_IndustrialPipelineInstallationSummary where x.ProjectId == projectId select x).ToList();
-            if (q.Count>0)
+            var q = (from x in db.JGZL_IndustrialPipelineInstallationSummary where x.ProjectId == projectId && x.FromType==fromType select x).ToList();
+            if (q.Count > 0)
             {
                 db.JGZL_IndustrialPipelineInstallationSummary.DeleteAllOnSubmit(q);
                 db.SubmitChanges();

HJGL_DS/BLL/JGZL/LeakageVacuumService.cs

@@ -0,0 +1,85 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Eventing.Reader;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 管道系统泄漏性/真空试验条件确认与试验记录
+    /// </summary>
+    public class LeakageVacuumService
+    {
+        /// <summary>
+        /// 根据项目Id获取管道系统泄漏性/真空试验条件确认与试验记录
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static Model.JGZL_LeakageVacuum GetLeakageVacuumByProjectId(string projectId)
+        {
+            return Funs.DB.JGZL_LeakageVacuum.FirstOrDefault(e => e.ProjectId == projectId);
+        }
+
+        /// <summary>
+        /// 添加获取管道系统泄漏性/真空试验条件确认与试验记录
+        /// </summary>
+        /// <param name="leakageVacuum"></param>
+        public static void AddLeakageVacuum(Model.JGZL_LeakageVacuum leakageVacuum)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JGZL_LeakageVacuum newLeakageVacuum = new Model.JGZL_LeakageVacuum();
+            newLeakageVacuum.LeakageVacuumId = leakageVacuum.LeakageVacuumId;
+            newLeakageVacuum.ProjectId = leakageVacuum.ProjectId;
+            newLeakageVacuum.SystemName = leakageVacuum.SystemName;
+            newLeakageVacuum.SystemCode = leakageVacuum.SystemCode;
+            newLeakageVacuum.CheckItemResult1 = leakageVacuum.CheckItemResult1;
+            newLeakageVacuum.CheckItemResult2 = leakageVacuum.CheckItemResult2;
+            newLeakageVacuum.CheckItemResult3 = leakageVacuum.CheckItemResult3;
+            newLeakageVacuum.CheckItemResult4 = leakageVacuum.CheckItemResult4;
+            newLeakageVacuum.CheckItemResult5 = leakageVacuum.CheckItemResult5;
+            newLeakageVacuum.Conclusion = leakageVacuum.Conclusion;
+            db.JGZL_LeakageVacuum.InsertOnSubmit(newLeakageVacuum);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改管道系统泄漏性/真空试验条件确认与试验记录
+        /// </summary>
+        /// <param name="leakageVacuum"></param>
+        public static void UpdateLeakageVacuum(Model.JGZL_LeakageVacuum leakageVacuum)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JGZL_LeakageVacuum newLeakageVacuum = db.JGZL_LeakageVacuum.FirstOrDefault(e => e.LeakageVacuumId == leakageVacuum.LeakageVacuumId);
+            if (newLeakageVacuum != null)
+            {
+                newLeakageVacuum.SystemName = leakageVacuum.SystemName;
+                newLeakageVacuum.SystemCode = leakageVacuum.SystemCode;
+                newLeakageVacuum.CheckItemResult1 = leakageVacuum.CheckItemResult1;
+                newLeakageVacuum.CheckItemResult2 = leakageVacuum.CheckItemResult2;
+                newLeakageVacuum.CheckItemResult3 = leakageVacuum.CheckItemResult3;
+                newLeakageVacuum.CheckItemResult4 = leakageVacuum.CheckItemResult4;
+                newLeakageVacuum.CheckItemResult5 = leakageVacuum.CheckItemResult5;
+                newLeakageVacuum.Conclusion = leakageVacuum.Conclusion;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除管道系统泄漏性/真空试验条件确认与试验记录
+        /// </summary>
+        /// <param name="leakageVacuumId"></param>
+        public static void DeleteLeakageVacuumById(string leakageVacuumId)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_LeakageVacuum leakageVacuum = db.JGZL_LeakageVacuum.FirstOrDefault(e => e.LeakageVacuumId == leakageVacuumId);
+            if (leakageVacuum != null)
+            {
+                db.JGZL_LeakageVacuum.DeleteOnSubmit(leakageVacuum);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

HJGL_DS/BLL/JGZL/LeakageVacuumTestRecordServic.cs

@@ -0,0 +1,72 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 管道系统泄漏性/真空试验条件确认与试验记录
+    /// </summary>
+    public class LeakageVacuumTestRecordServic
+    {
+        /// <summary>
+        /// 根据主键获取明细信息
+        /// </summary>
+        /// <param name="leakageVacuumId"></param>
+        /// <returns></returns>
+        public static List<Model.JGZL_LeakageVacuumTestRecord> GetLeakageVacuumTestRecordByLeakageVacuumId(string leakageVacuumId)
+        {
+            return (from x in Funs.DB.JGZL_LeakageVacuumTestRecord where x.LeakageVacuumId == leakageVacuumId select x).ToList();
+        }
+
+        /// <summary>
+        /// 添加试验记录
+        /// </summary>
+        /// <param name="record"></param>
+        public static void AddLeakageVacuumTestRecord(Model.JGZL_LeakageVacuumTestRecord record)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_LeakageVacuumTestRecord newRecord = new JGZL_LeakageVacuumTestRecord();
+            newRecord.LeakageVacuumTestRecordId = record.LeakageVacuumTestRecordId;
+            newRecord.LeakageVacuumId = record.LeakageVacuumId;
+            newRecord.PipelineId = record.PipelineId;
+            newRecord.PipelineCode = record.PipelineCode;
+            newRecord.DesignPressure = record.DesignPressure;
+            newRecord.DesignTem = record.DesignTem;
+            newRecord.TestAmbientTemp = record.TestAmbientTemp;
+            newRecord.TestMediumTemp = record.TestMediumTemp;
+            newRecord.LeakPressure = record.LeakPressure;
+            newRecord.LeakMedium = record.LeakMedium;
+            newRecord.VacuumPressure = record.VacuumPressure;
+            newRecord.VacuumMedium = record.VacuumMedium;
+            db.JGZL_LeakageVacuumTestRecord.InsertOnSubmit(newRecord);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 根据主键Id删除试验记录
+        /// </summary>
+        /// <param name="leakageVacuumId"></param>
+        public static void DeleteLeakageVacuumTestRecordByLeakageVacuumId(string leakageVacuumId)
+        {
+            SGGLDB db = Funs.DB;
+            var q = (from x in db.JGZL_LeakageVacuumTestRecord where x.LeakageVacuumId == leakageVacuumId select x).ToList();
+            if (q.Count > 0)
+            {
+                db.JGZL_LeakageVacuumTestRecord.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
+        }
+
+        public static Model.JGZL_LeakageVacuumTestRecord GetItemByIsoNo(string projectId, string isoNo)
+        {
+            return (from x in Funs.DB.JGZL_LeakageVacuumTestRecord
+                    join y in Funs.DB.JGZL_LeakageVacuum on x.LeakageVacuumId equals y.LeakageVacuumId
+                    where y.ProjectId == projectId && x.PipelineCode == isoNo
+                    select x).FirstOrDefault();
+        }
+    }
+}

HJGL_DS/BLL/JGZL/ModRepairQualityCertificateService.cs

@@ -0,0 +1,121 @@
+using FastReport.DevComponents.DotNetBar;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 压力管道改造维修质量证明书
+    /// </summary>
+    public class ModRepairQualityCertificateService
+    {
+        /// <summary>
+        /// 根据项目Id、编号获取压力管道改造维修质量证明书
+        /// </summary>
+        /// <param name="projectId">项目Id</param>
+        /// <param name="qualityCertificateCode">编号</param>
+        /// <returns></returns>
+        public static Model.JGZL_ModRepairQualityCertificate GetModRepairQualityCertificateByProjectId(string projectId,string qualityCertificateId)
+        {
+            return Funs.DB.JGZL_ModRepairQualityCertificate.FirstOrDefault(e => e.ProjectId == projectId && e.QualityCertificateId == qualityCertificateId);
+        }
+
+        /// <summary>
+        /// 添加压力管道改造维修质量证明书
+        /// </summary>
+        /// <param name="modRepairQualityCertificate"></param>
+        public static void AddModRepairQualityCertificate(Model.JGZL_ModRepairQualityCertificate modRepairQualityCertificate)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_ModRepairQualityCertificate newModRepairQualityCertificate = new JGZL_ModRepairQualityCertificate();
+            newModRepairQualityCertificate.QualityCertificateId = modRepairQualityCertificate.QualityCertificateId;
+            newModRepairQualityCertificate.ProjectId = modRepairQualityCertificate.ProjectId;
+            newModRepairQualityCertificate.QualityCertificateCode = modRepairQualityCertificate.QualityCertificateCode;
+            newModRepairQualityCertificate.ConUnit = modRepairQualityCertificate.ConUnit;
+            newModRepairQualityCertificate.ConUnitUSCC = modRepairQualityCertificate.ConUnitUSCC;
+            newModRepairQualityCertificate.LicenseCode = modRepairQualityCertificate.LicenseCode;
+            newModRepairQualityCertificate.LicenseScope = modRepairQualityCertificate.LicenseScope;
+            newModRepairQualityCertificate.NotificationCode = modRepairQualityCertificate.NotificationCode;
+            newModRepairQualityCertificate.ISO_ID= modRepairQualityCertificate.ISO_ID;
+            newModRepairQualityCertificate.PipelineCode = modRepairQualityCertificate.PipelineCode;
+            newModRepairQualityCertificate.PipeLength = modRepairQualityCertificate.PipeLength;
+            newModRepairQualityCertificate.PipeCategory = modRepairQualityCertificate.PipeCategory;
+            newModRepairQualityCertificate.ConCategory = modRepairQualityCertificate.ConCategory;
+            newModRepairQualityCertificate.UseUnit = modRepairQualityCertificate.UseUnit;
+            newModRepairQualityCertificate.UseUSCC = modRepairQualityCertificate.UseUSCC;
+            newModRepairQualityCertificate.UseAddress = modRepairQualityCertificate.UseAddress;
+            newModRepairQualityCertificate.DesignUnit = modRepairQualityCertificate.DesignUnit;
+            newModRepairQualityCertificate.DesignDate = modRepairQualityCertificate.DesignDate;
+            newModRepairQualityCertificate.DesignLicenseCode = modRepairQualityCertificate.DesignLicenseCode;
+            newModRepairQualityCertificate.ModRepairProject = modRepairQualityCertificate.ModRepairProject;
+            newModRepairQualityCertificate.Remark = modRepairQualityCertificate.Remark;
+            newModRepairQualityCertificate.CompletionDate = modRepairQualityCertificate.CompletionDate;
+            newModRepairQualityCertificate.QC_Inspector = modRepairQualityCertificate.QC_Inspector;
+            newModRepairQualityCertificate.QA_Engineer = modRepairQualityCertificate.QA_Engineer;
+            newModRepairQualityCertificate.CompileMan = modRepairQualityCertificate.CompileMan;
+            newModRepairQualityCertificate.CompileDate = modRepairQualityCertificate.CompileDate;
+            db.JGZL_ModRepairQualityCertificate.InsertOnSubmit(newModRepairQualityCertificate);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改压力管道改造维修质量证明书
+        /// </summary>
+        /// <param name="modRepairQualityCertificate"></param>
+        public static void UpdateModRepairQualityCertificate(Model.JGZL_ModRepairQualityCertificate modRepairQualityCertificate)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_ModRepairQualityCertificate newModRepairQualityCertificate = db.JGZL_ModRepairQualityCertificate.FirstOrDefault(e => e.QualityCertificateId == modRepairQualityCertificate.QualityCertificateId);
+            if (newModRepairQualityCertificate != null)
+            {
+                newModRepairQualityCertificate.QualityCertificateCode = modRepairQualityCertificate.QualityCertificateCode;
+                newModRepairQualityCertificate.ConUnit = modRepairQualityCertificate.ConUnit;
+                newModRepairQualityCertificate.ConUnitUSCC = modRepairQualityCertificate.ConUnitUSCC;
+                newModRepairQualityCertificate.LicenseCode = modRepairQualityCertificate.LicenseCode;
+                newModRepairQualityCertificate.LicenseScope = modRepairQualityCertificate.LicenseScope;
+                newModRepairQualityCertificate.NotificationCode = modRepairQualityCertificate.NotificationCode;
+                newModRepairQualityCertificate.ISO_ID = modRepairQualityCertificate.ISO_ID;
+                newModRepairQualityCertificate.PipelineCode = modRepairQualityCertificate.PipelineCode;
+                newModRepairQualityCertificate.PipeLength = modRepairQualityCertificate.PipeLength;
+                newModRepairQualityCertificate.PipeCategory = modRepairQualityCertificate.PipeCategory;
+                newModRepairQualityCertificate.ConCategory = modRepairQualityCertificate.ConCategory;
+                newModRepairQualityCertificate.UseUnit = modRepairQualityCertificate.UseUnit;
+                newModRepairQualityCertificate.UseUSCC = modRepairQualityCertificate.UseUSCC;
+                newModRepairQualityCertificate.UseAddress = modRepairQualityCertificate.UseAddress;
+                newModRepairQualityCertificate.DesignUnit = modRepairQualityCertificate.DesignUnit;
+                newModRepairQualityCertificate.DesignDate = modRepairQualityCertificate.DesignDate;
+                newModRepairQualityCertificate.DesignLicenseCode = modRepairQualityCertificate.DesignLicenseCode;
+                newModRepairQualityCertificate.ModRepairProject = modRepairQualityCertificate.ModRepairProject;
+                newModRepairQualityCertificate.Remark = modRepairQualityCertificate.Remark;
+                newModRepairQualityCertificate.CompletionDate = modRepairQualityCertificate.CompletionDate;
+                newModRepairQualityCertificate.QC_Inspector = modRepairQualityCertificate.QC_Inspector;
+                newModRepairQualityCertificate.QA_Engineer = modRepairQualityCertificate.QA_Engineer;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除压力管道改造维修质量证明书
+        /// </summary>
+        /// <param name="qualityCertificateId"></param>
+        public static void DeleteModRepairQualityCertificateById(string qualityCertificateId)
+        {
+            SGGLDB db = Funs.DB;
+            Model.JGZL_ModRepairQualityCertificate qualityCertificate = db.JGZL_ModRepairQualityCertificate.FirstOrDefault(e => e.QualityCertificateId == qualityCertificateId);
+            if (qualityCertificate != null)
+            {
+                db.JGZL_ModRepairQualityCertificate.DeleteOnSubmit(qualityCertificate);
+                db.SubmitChanges();
+            }
+        }
+
+        public static List<Model.JGZL_ModRepairQualityCertificate> GetLists(string projectId)
+        {
+            return (from x in Funs.DB.JGZL_ModRepairQualityCertificate where x.ProjectId == projectId orderby x.QualityCertificateCode select x).ToList();
+        }
+    }
+}

HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs

@@ -337,7 +337,7 @@ namespace FineUIPro.Web.ContinuousPrint
                         {
                             keyValuePairs.Add("NDTType", "PT");
                         }
-                        string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(this.hidJOT_WeldDate.Value));
+                        string weldingDate = string.Format("{0:yyyy年MM月dd日}", Convert.ToDateTime(hidJOT_WeldDate.Value));
                         keyValuePairs.Add("WeldingDate", weldingDate);
                         BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="04/22/2026 16:44:43" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="10/09/2026 09:24:39" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFjORJ/7AZWL6xVmftOQvHFg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFzsQOzZJGNfutOS1d36ZVeQ==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="Num" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="PipelineCode" DataType="System.String" PropName="image_series"/>
@@ -66,9 +66,9 @@ namespace FastReport
         <Column Name="CleaningMethod" DataType="System.String" PropName="Column"/>
         <Column Name="CorrosionControlMethod" DataType="System.String" PropName="Column"/>
         <Column Name="InsulationMethod" DataType="System.String" PropName="Column"/>
-        <Column Name="PipelineStartPoint" DataType="System.String" PropName="Column"/>
-        <Column Name="PipelineEndPoint" DataType="System.String" PropName="Column1"/>
         <Column Name="Remark" DataType="System.String" PropName="Column"/>
+        <Column Name="PipelineStartPoint" DataType="System.String"/>
+        <Column Name="PipelineEndPoint" DataType="System.String"/>
       </TableDataSource>
     </MsSqlDataConnection>
     <Parameter Name="CertificateCode" DataType="System.String"/>
@@ -79,8 +79,8 @@ namespace FastReport
     <PageHeaderBand Name="PageHeader1" Width="1012.28" Height="236.25" Guides="0,18.9,56.7,85.05,236.25,37.8,151.2,94.5">
       <TextObject Name="Text1" Left="718.2" Width="283.5" Height="18.9" Text="ZDS-T6.38.047.A/1.2025" HorzAlign="Center" VertAlign="Center" Font="宋体, 14pt"/>
       <TextObject Name="Text2" Left="311.85" Top="18.9" Width="359.1" Height="37.8" Text="工业管道安装汇总表" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
-      <TextObject Name="Text3" Top="56.7" Width="141.75" Height="28.35" Text="质量证明书编号：" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-      <TextObject Name="Text4" Left="132.3" Top="56.7" Width="330.75" Height="28.35" Text="[CertificateCode]" VertAlign="Center" Font="宋体, 12pt"/>
+      <TextObject Name="Text3" Top="56.7" Width="141.75" Height="28.35" Text="质量证明书编号：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+      <TextObject Name="Text4" Left="132.3" Top="56.7" Width="330.75" Height="28.35" Text="[CertificateCode]" VertAlign="Center" Font="楷体, 10.5pt"/>
       <TableObject Name="Table1" Top="85.05" Width="1009.26" Height="151.2" Border.Lines="Bottom">
         <TableColumn Name="Column1" Width="18.9"/>
         <TableColumn Name="Column23" Width="85.05"/>
@@ -106,11 +106,11 @@ namespace FastReport
         <TableColumn Name="Column21" Width="47.25"/>
         <TableColumn Name="Column22" Width="47.25"/>
         <TableRow Name="Row1" Height="37.8">
-          <TableCell Name="Cell1" Border.Lines="Left, Top, Bottom" Text="交工单元名称：" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="4"/>
+          <TableCell Name="Cell1" Border.Lines="Left, Top, Bottom" Text="交工单元名称：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="4"/>
           <TableCell Name="Cell77" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell2" Border.Lines="Right, Top, Bottom" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell3" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell175" Border.Lines="Top" Text="[DeliveryUnit]" VertAlign="Center" Font="宋体, 12pt" ColSpan="9"/>
+          <TableCell Name="Cell175" Border.Lines="Top" Text="[DeliveryUnit]" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="9"/>
           <TableCell Name="Cell172" Border.Lines="Top" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell4" Border.Lines="All" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell5" Border.Lines="All" VertAlign="Center" Font="宋体, 12pt"/>
@@ -119,10 +119,10 @@ namespace FastReport
           <TableCell Name="Cell29" Border.Lines="All" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell30" Border.Lines="All" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell31" Border.Lines="All" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell32" Border.Lines="Left, Top, Bottom" Text="交工单元编号：" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="3"/>
+          <TableCell Name="Cell32" Border.Lines="Left, Top, Bottom" Text="交工单元编号：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
           <TableCell Name="Cell33" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell35" Border.Lines="Right, Top, Bottom" Text="[DeliveryUnitCode]" VertAlign="Center" Font="宋体, 12pt" ColSpan="7"/>
+          <TableCell Name="Cell35" Border.Lines="Right, Top, Bottom" Text="[DeliveryUnitCode]" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="7"/>
           <TableCell Name="Cell36" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell37" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
@@ -131,54 +131,54 @@ namespace FastReport
           <TableCell Name="Cell42" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
         </TableRow>
         <TableRow Name="Row2" Height="56.7">
-          <TableCell Name="Cell6" Border.Lines="All" Text="管道编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" ColSpan="3" RowSpan="2"/>
-          <TableCell Name="Cell78" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell7" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell8" Border.Lines="All" Text="管道&#13;&#10;级别" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell176" Border.Lines="All" Text="起止点" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
-          <TableCell Name="Cell173" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell9" Border.Lines="All" Text="设计&#13;&#10;压力&#13;&#10;(MPa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell10" Border.Lines="All" Text="设计温度(℃)" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell44" Border.Lines="All" Text="介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell45" Border.Lines="All" Text="材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell46" Border.Lines="All" Text="规格&#13;&#10;（mm）" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell47" Border.Lines="All" Text="长度(m)" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell48" Border.Lines="All" Text="铺设方式" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell49" Border.Lines="All" Text="焊口&#13;&#10;数量&#13;&#10;" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell50" Border.Lines="All" Text="无损检测方法/比例(%)" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell51" Border.Lines="All" Text="耐压试验方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell52" Border.Lines="All" Text="耐压试验介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell53" Border.Lines="All" Text="耐压试验压力(MPa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell54" Border.Lines="All" Text="泄漏试验介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell55" Border.Lines="All" Text="泄漏试验压力(MPa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell57" Border.Lines="All" Text="吹扫、清洗方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell58" Border.Lines="All" Text="腐蚀控制方式" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
-          <TableCell Name="Cell59" Border.Lines="All" Text="保温（绝热）方式&#13;&#10;" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" RowSpan="2"/>
+          <TableCell Name="Cell6" Border.Lines="All" Text="管道编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3" RowSpan="2"/>
+          <TableCell Name="Cell78" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell7" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell8" Border.Lines="All" Text="管道&#13;&#10;级别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell176" Border.Lines="All" Text="起止点" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell173" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell9" Border.Lines="All" Text="设计&#13;&#10;压力&#13;&#10;(MPa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell10" Border.Lines="All" Text="设计温度(℃)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell44" Border.Lines="All" Text="介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell45" Border.Lines="All" Text="材质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell46" Border.Lines="All" Text="规格&#13;&#10;（mm）" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell47" Border.Lines="All" Text="长度(m)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell48" Border.Lines="All" Text="铺设方式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell49" Border.Lines="All" Text="焊口&#13;&#10;数量&#13;&#10;" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell50" Border.Lines="All" Text="无损检测方法/比例(%)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell51" Border.Lines="All" Text="耐压试验方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell52" Border.Lines="All" Text="耐压试验介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell53" Border.Lines="All" Text="耐压试验压力(MPa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell54" Border.Lines="All" Text="泄漏试验介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell55" Border.Lines="All" Text="泄漏试验压力(MPa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell57" Border.Lines="All" Text="吹扫、清洗方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell58" Border.Lines="All" Text="腐蚀控制方式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell59" Border.Lines="All" Text="保温（绝热）方式&#13;&#10;" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
         </TableRow>
         <TableRow Name="Row3" Height="56.7">
-          <TableCell Name="Cell11" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell79" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell13" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell177" Border.Lines="All" Text="起&#13;&#10;点" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell174" Border.Lines="All" Text="终&#13;&#10;点" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell14" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell61" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell62" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell63" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell64" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell65" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell66" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell67" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell68" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell69" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell71" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell74" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell76" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell11" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell79" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell13" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell177" Border.Lines="All" Text="起&#13;&#10;点" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell174" Border.Lines="All" Text="终&#13;&#10;点" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell14" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell61" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell62" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell63" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell64" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell65" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell66" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell67" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell68" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell69" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell70" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell71" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell72" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell74" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell76" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
       </TableObject>
     </PageHeaderBand>
@@ -208,29 +208,29 @@ namespace FastReport
         <TableColumn Name="Column45" Width="47.25"/>
         <TableColumn Name="Column46" Width="47.25"/>
         <TableRow Name="Row6" Height="85.05">
-          <TableCell Name="Cell126" Border.Lines="All" Text="[Data.PipelineCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" ColSpan="3"/>
-          <TableCell Name="Cell127" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell128" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell129" Border.Lines="All" Text="[Data.PipelineLevel]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell179" Border.Lines="All" Text="[Data.PipelineStartPoint]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell178" Border.Lines="All" Text="[Data.PipelineEndPoint]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell130" Border.Lines="All" Text="[Data.DesignPressure]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell131" Border.Lines="All" Text="[Data.DesignTemperature]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell133" Border.Lines="All" Text="[Data.Medium]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell134" Border.Lines="All" Text="[Data.Material]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell135" Border.Lines="All" Text="[Data.Specifications]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell136" Border.Lines="All" Text="[Data.Length]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell137" Border.Lines="All" Text="[Data.LayingMethod]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell138" Border.Lines="All" Text="[Data.WeldsNum]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell139" Border.Lines="All" Text="[Data.LosslessRatio]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell140" Border.Lines="All" Text="[Data.Remark]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell141" Border.Lines="All" Text="[Data.VoltageResistantTestMedium]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell142" Border.Lines="All" Text="[Data.VoltageResistantTestPressure]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell143" Border.Lines="All" Text="[Data.LeakageTestMedium]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell144" Border.Lines="All" Text="[Data.LeakageTestPressure]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell146" Border.Lines="All" Text="[Data.CleaningMethod]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell147" Border.Lines="All" Text="[Data.CorrosionControlMethod]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
-          <TableCell Name="Cell148" Border.Lines="All" Text="[Data.InsulationMethod]" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell126" Border.Lines="All" Text="[Data.PipelineCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell127" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell128" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell129" Border.Lines="All" Text="[Data.PipelineLevel]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell179" Border.Lines="All" Text="[Data.PipelineStartPoint]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell178" Border.Lines="All" Text="[Data.PipelineEndPoint]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell130" Border.Lines="All" Text="[Data.DesignPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell131" Border.Lines="All" Text="[Data.DesignTemperature]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell133" Border.Lines="All" Text="[Data.Medium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell134" Border.Lines="All" Text="[Data.Material]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell135" Border.Lines="All" Text="[Data.Specifications]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell136" Border.Lines="All" Text="[Data.Length]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell137" Border.Lines="All" Text="[Data.LayingMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell138" Border.Lines="All" Text="[Data.WeldsNum]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell139" Border.Lines="All" Text="[Data.LosslessRatio]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell140" Border.Lines="All" Text="[Data.Remark]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell141" Border.Lines="All" Text="[Data.VoltageResistantTestMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell142" Border.Lines="All" Text="[Data.VoltageResistantTestPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell143" Border.Lines="All" Text="[Data.LeakageTestMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell144" Border.Lines="All" Text="[Data.LeakageTestPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell146" Border.Lines="All" Text="[Data.CleaningMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell147" Border.Lines="All" Text="[Data.CorrosionControlMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell148" Border.Lines="All" Text="[Data.InsulationMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
         </TableRow>
       </TableObject>
     </DataBand>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装汇总表2020.frx

@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/26/2026 11:18:50" ReportInfo.Modified="10/09/2026 09:24:54" ReportInfo.CreatorVersion="2017.1.16.0">
+  <ScriptText>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(&quot;Data&quot;);
+      // 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();
+      }
+    }
+  }
+}
+</ScriptText>
+  <Dictionary>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF8J+BXWHdtZvMXnZn54GHNw==">
+      <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
+        <Column Name="Num" DataType="System.String" PropName="attach_image_id"/>
+        <Column Name="PipelineCode" DataType="System.String" PropName="image_series"/>
+        <Column Name="PipelineLevel" DataType="System.String" PropName="file_name"/>
+        <Column Name="DesignPressure" DataType="System.String" PropName="file_size"/>
+        <Column Name="DesignTemperature" DataType="System.String" PropName="file_type"/>
+        <Column Name="OperatingTemperature" DataType="System.String" PropName="created_date"/>
+        <Column Name="Medium" DataType="System.String" PropName="created_by"/>
+        <Column Name="Material" DataType="System.String" PropName="series_desc"/>
+        <Column Name="Specifications" DataType="System.String" PropName="file_path"/>
+        <Column Name="Length" DataType="System.String" PropName="series_timestamp"/>
+        <Column Name="LayingMethod" DataType="System.String" PropName="Column"/>
+        <Column Name="WeldsNum" DataType="System.String" PropName="Column"/>
+        <Column Name="LosslessRatio" DataType="System.String" PropName="Column"/>
+        <Column Name="VoltageResistantTestMedium" DataType="System.String" PropName="Column"/>
+        <Column Name="VoltageResistantTestPressure" DataType="System.String" PropName="Column"/>
+        <Column Name="VoltageResistantTestDate" DataType="System.String" PropName="Column"/>
+        <Column Name="LeakageTestMedium" DataType="System.String" PropName="Column"/>
+        <Column Name="LeakageTestPressure" DataType="System.String" PropName="Column"/>
+        <Column Name="LeakageTestDate" DataType="System.String" PropName="Column"/>
+        <Column Name="CleaningMethod" DataType="System.String" PropName="Column"/>
+        <Column Name="CorrosionControlMethod" DataType="System.String" PropName="Column"/>
+        <Column Name="InsulationMethod" DataType="System.String" PropName="Column"/>
+        <Column Name="PipelineStartPoint" DataType="System.String" PropName="Column"/>
+        <Column Name="PipelineEndPoint" DataType="System.String" PropName="Column1"/>
+        <Column Name="Remark" DataType="System.String" PropName="Column"/>
+      </TableDataSource>
+    </MsSqlDataConnection>
+    <Parameter Name="CertificateCode" DataType="System.String"/>
+    <Parameter Name="DeliveryUnit" DataType="System.String"/>
+    <Parameter Name="DeliveryUnitCode" DataType="System.String"/>
+  </Dictionary>
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" RawPaperSize="9" LeftMargin="16" TopMargin="22" RightMargin="13.2" BottomMargin="17" Guides="718.2,1001.7,311.85,670.95,500.85,642.6,973.35,0,1009.26,151.2,85.05,9.45,37.8,56.7,66.15,28.35,631.26,54.81,47.25,18.9,113.4,198.45,236.25,274.05,368.55,434.7,472.5,529.2,584.01,735.21,886.41,924.21,962.01,669.06,782.46,820.26,103.95,803.25,897.75,538.65,633.15">
+    <PageHeaderBand Name="PageHeader1" Width="1012.28" Height="236.25" Guides="0,18.9,56.7,85.05,236.25,37.8,151.2,75.6">
+      <TextObject Name="Text1" Left="718.2" Width="283.5" Height="18.9" Text="ZDS-T6.38.047.A/0.2020" HorzAlign="Center" VertAlign="Center" Font="Times New Roman, 15pt"/>
+      <TextObject Name="Text2" Left="311.85" Top="18.9" Width="359.1" Height="37.8" Text="二、压力管道安装汇总表" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
+      <TextObject Name="Text3" Left="500.85" Top="56.7" Width="141.75" Height="28.35" Text="质量证明书编号：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+      <TextObject Name="Text4" Left="642.6" Top="56.7" Width="330.75" Height="28.35" Text="[CertificateCode]" VertAlign="Center" Font="楷体, 10.5pt"/>
+      <TableObject Name="Table1" Top="85.05" Width="1009.26" Height="151.2" Border.Lines="Bottom">
+        <TableColumn Name="Column1" Width="18.9"/>
+        <TableColumn Name="Column23" Width="85.05"/>
+        <TableColumn Name="Column2" Width="9.45"/>
+        <TableColumn Name="Column3" Width="37.8"/>
+        <TableColumn Name="Column4" Width="47.25"/>
+        <TableColumn Name="Column5" Width="37.8"/>
+        <TableColumn Name="Column70" Width="37.8"/>
+        <TableColumn Name="Column7" Width="37.8"/>
+        <TableColumn Name="Column8" Width="56.7"/>
+        <TableColumn Name="Column9"/>
+        <TableColumn Name="Column10" Width="37.8"/>
+        <TableColumn Name="Column11" Width="28.35"/>
+        <TableColumn Name="Column12" Width="28.35"/>
+        <TableColumn Name="Column13" Width="54.81"/>
+        <TableColumn Name="Column14" Width="47.25"/>
+        <TableColumn Name="Column15" Width="37.8"/>
+        <TableColumn Name="Column16"/>
+        <TableColumn Name="Column17" Width="47.25"/>
+        <TableColumn Name="Column18" Width="37.8"/>
+        <TableColumn Name="Column73"/>
+        <TableColumn Name="Column20" Width="37.8"/>
+        <TableColumn Name="Column21" Width="37.8"/>
+        <TableColumn Name="Column22" Width="47.25"/>
+        <TableRow Name="Row1" Height="37.8">
+          <TableCell Name="Cell1" Border.Lines="Left, Top, Bottom" Text="交工单元名称：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="4"/>
+          <TableCell Name="Cell77" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell2" Border.Lines="Right, Top, Bottom" VertAlign="Center"/>
+          <TableCell Name="Cell3" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell4" Border.Lines="All" Text="[DeliveryUnit]" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="8"/>
+          <TableCell Name="Cell5" Border.Lines="All" VertAlign="Center"/>
+          <TableCell Name="Cell172"/>
+          <TableCell Name="Cell27" Border.Lines="All" VertAlign="Center"/>
+          <TableCell Name="Cell28" Border.Lines="All" VertAlign="Center"/>
+          <TableCell Name="Cell29" Border.Lines="All" VertAlign="Center"/>
+          <TableCell Name="Cell30" Border.Lines="All" VertAlign="Center"/>
+          <TableCell Name="Cell31" Border.Lines="All" VertAlign="Center"/>
+          <TableCell Name="Cell32" Border.Lines="Left, Top, Bottom" Text="交工单元编号：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell33" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell35" Border.Lines="Right, Top, Bottom" Text="[DeliveryUnitCode]" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="8"/>
+          <TableCell Name="Cell36" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell37" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell177"/>
+          <TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell41" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          <TableCell Name="Cell42" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+        </TableRow>
+        <TableRow Name="Row2" Height="37.8">
+          <TableCell Name="Cell6" Border.Lines="All" Text="序号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell78" Border.Lines="All" Text="单线号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2" RowSpan="2"/>
+          <TableCell Name="Cell7" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell8" Border.Lines="All" Text="管道&#13;&#10;级别" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell9" Border.Lines="All" Text="设计&#13;&#10;压力&#13;&#10;(MPa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell10" Border.Lines="All" Text="设计温度(℃)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell173" Text="操作温度℃" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell44" Border.Lines="All" Text="输送介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell45" Border.Lines="All" Text="管道材质牌号及标准" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell46" Border.Lines="All" Text="管道规格&#13;&#10;（外径×壁厚mm）" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell47" Border.Lines="All" Text="管道长度(m)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell48" Border.Lines="All" Text="铺设方式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell49" Border.Lines="All" Text="焊口&#13;&#10;数量&#13;&#10;" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell50" Border.Lines="All" Text="检测方法/比例(%)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell51" Border.Lines="All" Text="压力试验" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell52" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell53" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell54" Border.Lines="All" Text="泄漏性试验" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell55" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell178" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell57" Border.Lines="All" Text="吹洗方法" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell58" Border.Lines="All" Text="防腐方式" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+          <TableCell Name="Cell59" Border.Lines="All" Text="保温(绝热)方式&#13;&#10;" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+        </TableRow>
+        <TableRow Name="Row3" Height="75.6">
+          <TableCell Name="Cell11" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell79" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell12" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell13" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell14" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell174" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell61" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell62" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell63" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell64" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell65" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell66" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell67" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell68" Border.Lines="All" Text="介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell69" Border.Lines="All" Text="压力(Mpa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell70" Border.Lines="All" Text="日期" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell71" Border.Lines="All" Text="介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell72" Border.Lines="All" Text="压力(Mpa)" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell179" Text="日期" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell74" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell75" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell76" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+      </TableObject>
+    </PageHeaderBand>
+    <DataBand Name="Data1" Top="240.25" Width="1012.28" Height="85.05" Guides="0,85.05">
+      <TableObject Name="Table2" Width="1009.26" Height="85.05" Border.Lines="Bottom" ManualBuildEvent="Table2_ManualBuild">
+        <TableColumn Name="Column24" Width="18.9"/>
+        <TableColumn Name="Column25" Width="75.6"/>
+        <TableColumn Name="Column26" Width="18.9"/>
+        <TableColumn Name="Column27" Width="37.8"/>
+        <TableColumn Name="Column28" Width="47.25"/>
+        <TableColumn Name="Column29" Width="37.8"/>
+        <TableColumn Name="Column71" Width="37.8"/>
+        <TableColumn Name="Column31" Width="37.8"/>
+        <TableColumn Name="Column32" Width="56.7"/>
+        <TableColumn Name="Column33"/>
+        <TableColumn Name="Column34" Width="37.8"/>
+        <TableColumn Name="Column35" Width="28.35"/>
+        <TableColumn Name="Column36" Width="28.35"/>
+        <TableColumn Name="Column37" Width="54.81"/>
+        <TableColumn Name="Column38" Width="47.25"/>
+        <TableColumn Name="Column39" Width="37.8"/>
+        <TableColumn Name="Column40"/>
+        <TableColumn Name="Column41" Width="47.25"/>
+        <TableColumn Name="Column42" Width="37.8"/>
+        <TableColumn Name="Column74"/>
+        <TableColumn Name="Column44" Width="37.8"/>
+        <TableColumn Name="Column45" Width="37.8"/>
+        <TableColumn Name="Column46" Width="47.25"/>
+        <TableRow Name="Row6" Height="85.05">
+          <TableCell Name="Cell126" Border.Lines="All" Text="[Data.Num]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell127" Border.Lines="All" Text="[Data.PipelineCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell128" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell129" Border.Lines="All" Text="[Data.PipelineLevel]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell130" Border.Lines="All" Text="[Data.DesignPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell131" Border.Lines="All" Text="[Data.DesignTemperature]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell175" Border.Lines="All" Text="[Data.OperatingTemperature]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell133" Border.Lines="All" Text="[Data.Medium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell134" Border.Lines="All" Text="[Data.Material]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell135" Border.Lines="All" Text="[Data.Specifications]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell136" Border.Lines="All" Text="[Data.Length]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell137" Border.Lines="All" Text="[Data.LayingMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell138" Border.Lines="All" Text="[Data.WeldsNum]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell139" Border.Lines="All" Text="[Data.LosslessRatio]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell140" Border.Lines="All" Text="[Data.VoltageResistantTestMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell141" Border.Lines="All" Text="[Data.VoltageResistantTestPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell142" Border.Lines="All" Text="[Data.VoltageResistantTestDate]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell143" Border.Lines="All" Text="[Data.LeakageTestMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell144" Border.Lines="All" Text="[Data.LeakageTestPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell180" Border.Lines="All" Text="[Data.LeakageTestDate]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell146" Border.Lines="All" Text="[Data.CleaningMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell147" Border.Lines="All" Text="[Data.CorrosionControlMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell148" Border.Lines="All" Text="[Data.InsulationMethod]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+      </TableObject>
+    </DataBand>
+    <ColumnFooterBand Name="ColumnFooter1" Top="418.35" Width="1012.28">
+      <ChildBand Name="Child1" Top="329.3" Width="1012.28" Height="85.05" Guides="0,85.05" FillUnusedSpace="true">
+        <TableObject Name="Table3" Width="1009.26" Height="85.05" Border.Lines="Bottom">
+          <TableColumn Name="Column47" Width="18.9"/>
+          <TableColumn Name="Column48" Width="75.6"/>
+          <TableColumn Name="Column49" Width="18.9"/>
+          <TableColumn Name="Column50" Width="37.8"/>
+          <TableColumn Name="Column51" Width="47.25"/>
+          <TableColumn Name="Column52" Width="37.8"/>
+          <TableColumn Name="Column72" Width="37.8"/>
+          <TableColumn Name="Column54" Width="37.8"/>
+          <TableColumn Name="Column55" Width="56.7"/>
+          <TableColumn Name="Column56"/>
+          <TableColumn Name="Column57" Width="37.8"/>
+          <TableColumn Name="Column58" Width="28.35"/>
+          <TableColumn Name="Column59" Width="28.35"/>
+          <TableColumn Name="Column60" Width="54.81"/>
+          <TableColumn Name="Column61" Width="47.25"/>
+          <TableColumn Name="Column62" Width="37.8"/>
+          <TableColumn Name="Column63"/>
+          <TableColumn Name="Column64" Width="47.25"/>
+          <TableColumn Name="Column65" Width="37.8"/>
+          <TableColumn Name="Column75"/>
+          <TableColumn Name="Column67" Width="37.8"/>
+          <TableColumn Name="Column68" Width="37.8"/>
+          <TableColumn Name="Column69" Width="47.25"/>
+          <TableRow Name="Row7" Height="85.05">
+            <TableCell Name="Cell149" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell150" Border.Lines="All" HorzAlign="Center" VertAlign="Center" ColSpan="2"/>
+            <TableCell Name="Cell151" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell152" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell153" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell154" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell176" Border.Lines="All"/>
+            <TableCell Name="Cell156" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell157" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell158" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell159" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell160" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell161" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell162" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell163" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell164" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell165" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell166" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell167" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell181" Border.Lines="All"/>
+            <TableCell Name="Cell169" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell170" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+            <TableCell Name="Cell171" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+          </TableRow>
+        </TableObject>
+      </ChildBand>
+    </ColumnFooterBand>
+    <PageFooterBand Name="PageFooter1" Top="422.35" Width="1012.28" Height="56.7" Guides="9.45,28.35">
+      <TextObject Name="Text5" Left="9.45" Top="9.45" Width="94.5" Height="18.9" Text="填表：" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+      <TextObject Name="Text6" Left="274.05" Top="9.45" Width="94.5" Height="18.9" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+      <TextObject Name="Text7" Left="803.25" Top="9.45" Width="94.5" Height="18.9" Text="日期：" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+      <TextObject Name="Text8" Left="538.65" Top="9.45" Width="94.5" Height="18.9" Text="审核：" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+    </PageFooterBand>
+  </ReportPage>
+</Report>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明.frx

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/23/2026 17:12:17" ReportInfo.Modified="04/22/2026 16:43:31" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/23/2026 17:12:17" ReportInfo.Modified="09/10/2026 11:10:02" ReportInfo.CreatorVersion="2017.1.16.0">
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFgL+ZU1XL3bSLY7n7zRKAQQ==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFRLE3fVb1N0D74ri9q0f0Mg==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="CertificateCode" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="EngineeringName" DataType="System.String" PropName="image_series"/>
@@ -25,14 +25,14 @@
       </TableDataSource>
     </MsSqlDataConnection>
   </Dictionary>
-  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="368.55,633.15,170.1,463.05,330.75,642.6,0,646.4,112.27,356.84,469.11,102.82,74.47,47.25,103.95,264.6,274.05,9.45,244.57,292.95,387.45,434.7">
-    <PageHeaderBand Name="PageHeader1" Width="646.38" Height="94.5" Guides="0,18.9,28.35,56.7,66.15,94.5">
-      <TextObject Name="Text1" Left="368.55" Width="264.6" Height="18.9" Text="ZDS-T6.38.047.A/1.2025" HorzAlign="Right" Font="宋体, 15pt"/>
-      <TextObject Name="Text2" Left="170.1" Top="28.35" Width="292.95" Height="28.35" Text="工业管道安装质量证明书" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
-      <TextObject Name="Text4" Left="330.75" Top="66.15" Width="311.85" Height="28.35" Text=" 编号：[Data.CertificateCode]" VertAlign="Center" Font="宋体, 12pt"/>
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="368.55,642.6,170.1,463.05,330.75,0,646.4,112.27,356.84,469.11,102.82,74.47,244.57,37.8,283.5,292.95,387.45,434.7,543.58">
+    <PageHeaderBand Name="PageHeader1" Width="646.38" Height="113.4" Guides="18.9,47.25,75.6,85.05,113.4">
+      <TextObject Name="Text1" Left="368.55" Top="18.9" Width="274.05" Height="28.35" Text="ZDS-T6.38.047.A/1.2025" HorzAlign="Right" VertAlign="Center" Font="宋体, 15pt"/>
+      <TextObject Name="Text2" Left="170.1" Top="47.25" Width="292.95" Height="28.35" Text="工业管道安装质量证明书" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
+      <TextObject Name="Text4" Left="330.75" Top="85.05" Width="311.85" Height="28.35" Text=" 编号：[Data.CertificateCode]" VertAlign="Center" Font="宋体, 12pt"/>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="98.5" Width="646.38" Height="915.45" Guides="0,915.45,62.36,115.27,52.91,158.73,43.46,202.19,245.65,289.11,332.57,376.03,476.19,9.45,37.8,47.25,75.6,100.16,546.95,28.35,70.76,609.31,671.67,752.93,81.26,796.39,119.06">
-      <TableObject Name="Table1" Width="646.4" Height="915.45">
+    <DataBand Name="Data1" Top="117.4" Width="646.38" Height="896.55" Guides="0,896.55,62.36,115.27,52.91,158.73,43.46,202.19,245.65,289.11,332.57,376.03,476.19,100.16,546.95,28.35,47.25,609.31,671.67,752.93,81.26,796.39">
+      <TableObject Name="Table1" Width="646.4" Height="896.55">
         <TableColumn Name="Column1" Width="112.27"/>
         <TableColumn Name="Column2" Width="244.57"/>
         <TableColumn Name="Column3" Width="112.27"/>
@@ -95,20 +95,15 @@
           <TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row10" Height="100.16">
-          <TableCell Name="Cell46" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="5">
-            <TextObject Name="Text3" Left="47.25" Top="9.45" Width="595.35" Height="28.35" Text="本工业管道的安装经质量检验，符合《工业管道安全技术规程》(TSG 31-2025)、" VertAlign="Center" Font="宋体, 12pt"/>
-            <TextObject Name="Text6" Left="103.95" Top="47.25" Width="160.65" Height="28.35" Border.Lines="Bottom" Text="[Data.Remark]" VertAlign="Center" Font="宋体, 12pt"/>
-            <TextObject Name="Text7" Left="274.05" Top="47.25" Width="94.5" Height="28.35" Text="的要求。" Font="宋体, 12pt"/>
-            <TextObject Name="Text5" Left="9.45" Top="47.25" Width="94.5" Height="28.35" Text="设计文件和" VertAlign="Center" Font="宋体, 12pt"/>
-          </TableCell>
-          <TableCell Name="Cell47" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell48" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell49" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell50" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell46" Border.Lines="Left, Right, Top" Text="[Data.Remark]" Padding="35, 10, 10, 10" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell47" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell48" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell49" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell50" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row11" Height="70.76">
-          <TableCell Name="Cell51" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="5">
-            <TextObject Name="Text8" Left="47.25" Top="28.35" Width="245.7" Height="18.9" Text="附：《工业管道安装汇总表》共" Font="宋体, 12pt"/>
+          <TableCell Name="Cell51" Border.Lines="Left" VertAlign="Center" Font="宋体, 12pt">
+            <TextObject Name="Text8" Left="37.8" Top="28.35" Width="245.7" Height="18.9" Text="附：《工业管道安装汇总表》共" Font="宋体, 12pt"/>
             <TextObject Name="Text9" Left="292.95" Top="28.35" Width="94.5" Height="18.9" Border.Lines="Bottom" Font="宋体, 12pt"/>
             <TextObject Name="Text10" Left="387.45" Top="28.35" Width="47.25" Height="18.9" Text="页" Font="宋体, 12pt"/>
           </TableCell>
@@ -120,15 +115,15 @@
         <TableRow Name="Row12" Height="62.36">
           <TableCell Name="Cell56" Border.Lines="Left" Text="检验员：" Padding="50, 1, 2, 1" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
           <TableCell Name="Cell57" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell58" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell59" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell58" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell59" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell60" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row13" Height="62.36">
           <TableCell Name="Cell61" Border.Lines="Left" Text="质量保证工程师：" Padding="50, 1, 2, 1" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
           <TableCell Name="Cell62" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell63" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
-          <TableCell Name="Cell64" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell63" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell64" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell65" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
         <TableRow Name="Row14" Height="81.26">
@@ -145,7 +140,7 @@
           <TableCell Name="Cell74" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell75" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
         </TableRow>
-        <TableRow Name="Row16" Height="119.06">
+        <TableRow Name="Row16" Height="100.16">
           <TableCell Name="Cell76" Border.Lines="Left, Right, Bottom" Text="特种设备安装许可证编号：[Data.SpecialEquipmentProductionLicenseCode]" Padding="50, 1, 2, 1" VertAlign="Center" Font="宋体, 12pt" ColSpan="5"/>
           <TableCell Name="Cell77" Border.Lines="Left, Right" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt"/>
           <TableCell Name="Cell78" Border.Lines="Left, Right" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/压力管道安装质量证明2020.frx

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/23/2026 17:12:17" ReportInfo.Modified="10/08/2026 14:03:50" ReportInfo.CreatorVersion="2017.1.16.0">
+  <Dictionary>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF433RPidlV17rLTooM9L7Rg==">
+      <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
+        <Column Name="CertificateCode" DataType="System.String" PropName="attach_image_id"/>
+        <Column Name="EngineeringName" DataType="System.String" PropName="image_series"/>
+        <Column Name="EngineeringCode" DataType="System.String" PropName="file_name"/>
+        <Column Name="DeliveryUnit" DataType="System.String" PropName="file_size"/>
+        <Column Name="DeliveryUnitCode" DataType="System.String" PropName="file_type"/>
+        <Column Name="InstallStartDate" DataType="System.String" PropName="created_date"/>
+        <Column Name="InstallEndDate" DataType="System.String" PropName="created_by"/>
+        <Column Name="PipelineLevel" DataType="System.String" PropName="series_desc"/>
+        <Column Name="PipelineLength" DataType="System.String" PropName="file_path"/>
+        <Column Name="DesignUnit" DataType="System.String" PropName="series_timestamp"/>
+        <Column Name="DesignLicenseCode" DataType="System.String" PropName="Column"/>
+        <Column Name="SupervisoryAndInspectionAgency" DataType="System.String" PropName="Column"/>
+        <Column Name="QualificationCertificateCode" DataType="System.String" PropName="Column"/>
+        <Column Name="LosslessTestingAgency" DataType="System.String" PropName="Column"/>
+        <Column Name="InstitutionalApprovalCertificate" DataType="System.String" PropName="Column"/>
+        <Column Name="InstallationInspection" DataType="System.String" PropName="Column"/>
+        <Column Name="ConstructionUnit" DataType="System.String" PropName="Column"/>
+        <Column Name="SpecialEquipmentProductionLicenseCode" DataType="System.String" PropName="Column"/>
+        <Column Name="Remark" DataType="System.String" PropName="Column"/>
+      </TableDataSource>
+    </MsSqlDataConnection>
+  </Dictionary>
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="368.55,642.6,170.1,463.05,330.75,132.3,0,646.4,112.27,328.49,440.76,121.72,524.68,83.92,216.22,235.12,480.82,506.91,554.16,459.66">
+    <PageHeaderBand Name="PageHeader1" Width="646.38" Height="160.65" Guides="18.9,47.25,75.6,132.3,160.65,94.5,122.85">
+      <TextObject Name="Text1" Left="368.55" Top="18.9" Width="274.05" Height="28.35" Text="ZDS-T6.38.047.A/0.2020" HorzAlign="Right" VertAlign="Center" Font="宋体, 15pt"/>
+      <TextObject Name="Text2" Left="170.1" Top="47.25" Width="292.95" Height="28.35" Text="压力管道安装质量证明" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
+      <TextObject Name="Text4" Left="330.75" Top="132.3" Width="311.85" Height="28.35" Text=" 编号：[Data.CertificateCode]" VertAlign="Center" Font="宋体, 12pt"/>
+      <TextObject Name="Text11" Left="132.3" Top="94.5" Width="330.75" Height="28.35" Text="一、  压力管道安装质量证明书" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
+    </PageHeaderBand>
+    <DataBand Name="Data1" Top="164.65" Width="646.38" Height="849.3" Guides="0,849.3,52.91,96.37,43.46,139.83,183.29,226.75,264.55,37.8,308.01,351.47,394.93,495.09,100.16,556.4,28.35,47.25,618.76,62.36,681.12,762.38,81.26,805.84">
+      <TableObject Name="Table1" Width="646.4" Height="849.3">
+        <TableColumn Name="Column1" Width="112.27"/>
+        <TableColumn Name="Column2" Width="216.22"/>
+        <TableColumn Name="Column3" Width="112.27"/>
+        <TableColumn Name="Column4" Width="83.92"/>
+        <TableColumn Name="Column5" Width="121.72"/>
+        <TableRow Name="Row1" Height="52.91">
+          <TableCell Name="Cell1" Border.Lines="All" Text="工程名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell2" Border.Lines="All" Text="[Data.EngineeringName]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell3" Border.Lines="All" Text="工程编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell4" Border.Lines="All" Text="[Data.EngineeringCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell5" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row2" Height="43.46">
+          <TableCell Name="Cell6" Border.Lines="All" Text="交工单元名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell7" Border.Lines="All" Text="[Data.DeliveryUnit]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell8" Border.Lines="All" Text="交工单元编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell9" Border.Lines="All" Text="[Data.DeliveryUnitCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell10" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row3" Height="43.46">
+          <TableCell Name="Cell11" Border.Lines="All" Text="安装开工日期" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell12" Border.Lines="All" Text="[Data.InstallStartDate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell13" Border.Lines="All" Text="安装竣工日期" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell14" Border.Lines="All" Text="[Data.InstallEndDate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row4" Height="43.46">
+          <TableCell Name="Cell16" Border.Lines="All" Text="管道级别" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell17" Border.Lines="All" Text="[Data.PipelineLevel]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell18" Border.Lines="All" Text="管道长度" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell19" Border.Lines="All" Text="[Data.PipelineLength]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell20" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row5" Height="43.46">
+          <TableCell Name="Cell21" Border.Lines="All" Text="设计单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell22" Border.Lines="All" Text="[Data.DesignUnit]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell23" Border.Lines="All" Text="压力管道设计许可证编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell24" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell25" Border.Lines="All" Text="[Data.DesignLicenseCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row17" Height="37.8">
+          <TableCell Name="Cell81" Border.Lines="All" Text="监理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell82" Border.Lines="All" Text="[Data.SupervisoryAndInspectionAgency]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell83" Border.Lines="All" Text="资质证书编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell84" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell85" Border.Lines="All" Text="[Data.QualificationCertificateCode]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row7" Height="43.46">
+          <TableCell Name="Cell31" Border.Lines="All" Text="无损检测单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell32" Border.Lines="All" Text="[Data.LosslessTestingAgency]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell33" Border.Lines="All" Text="无损检测机构核准证编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell34" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell35" Border.Lines="All" Text="[Data.InstitutionalApprovalCertificate]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row8" Height="43.46">
+          <TableCell Name="Cell36" Border.Lines="All" Text="安装监检单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell37" Border.Lines="All" Text="[Data.InstallationInspection]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="4"/>
+          <TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row9" Height="43.46">
+          <TableCell Name="Cell41" Border.Lines="All" Text="使用单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell42" Border.Lines="All" Text="[Data.ConstructionUnit]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="4"/>
+          <TableCell Name="Cell43" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell44" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row10" Height="100.16">
+          <TableCell Name="Cell46" Border.Lines="Left, Right, Top" Text="[Data.Remark]" Padding="35, 10, 10, 10" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell47" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell48" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell49" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell50" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row11" Height="61.31">
+          <TableCell Name="Cell51" Border.Lines="Left" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell52" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt">
+            <TextObject Name="Text8" Left="122.85" Top="28.35" Width="245.7" Height="18.9" Text="附：《工业管道安装汇总表》共" Font="宋体, 12pt"/>
+          </TableCell>
+          <TableCell Name="Cell53" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell54" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt">
+            <TextObject Name="Text10" Left="66.15" Top="28.35" Width="47.25" Height="18.9" Text="页" Font="宋体, 12pt"/>
+            <TextObject Name="Text9" Left="18.9" Top="28.35" Width="47.25" Height="18.9" Border.Lines="Bottom" Font="宋体, 12pt"/>
+          </TableCell>
+          <TableCell Name="Cell55" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row12" Height="62.36">
+          <TableCell Name="Cell56" Border.Lines="Left" Text="检验员：" Padding="50, 1, 2, 1" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell57" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell58" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell59" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell60" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row13" Height="62.36">
+          <TableCell Name="Cell61" Border.Lines="Left" Text="质量保证工程师：" Padding="50, 1, 2, 1" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell62" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell63" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell64" Text="日期：" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell65" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row14" Height="81.26">
+          <TableCell Name="Cell66" Border.Lines="Left, Right" Text="安装单位（盖章）" Padding="2, 1, 50, 1" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell67" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell68" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell69" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell70" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+        </TableRow>
+        <TableRow Name="Row15" Height="43.46">
+          <TableCell Name="Cell71" Border.Lines="Left, Right" Text="年   月  日" Padding="2, 1, 50, 1" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell72" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell73" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell74" Border.Lines="Left, Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell75" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+        </TableRow>
+        <TableRow Name="Row16" Height="43.46">
+          <TableCell Name="Cell76" Border.Lines="Left, Right, Bottom" Text="特种设备安装许可证编号：[Data.SpecialEquipmentProductionLicenseCode]" Padding="50, 1, 2, 1" VertAlign="Center" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell77" Border.Lines="Left, Right" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell78" Border.Lines="Left, Right" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell79" Border.Lines="Left, Right" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell80" Border.Lines="Right, Bottom" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt"/>
+        </TableRow>
+      </TableObject>
+    </DataBand>
+  </ReportPage>
+</Report>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工业管道安装质量证明书（改造、修理）.frx

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/23/2026 17:12:17" ReportInfo.Modified="09/11/2026 14:43:51" ReportInfo.CreatorVersion="2017.1.16.0">
+  <Dictionary>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFaSQGGfp0C04d0yi9F5iJBg==">
+      <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
+        <Column Name="QualityCertificateCode" DataType="System.String" PropName="attach_image_id"/>
+        <Column Name="ConUnit" DataType="System.String" PropName="image_series"/>
+        <Column Name="ConUnitUSCC" DataType="System.String" PropName="file_name"/>
+        <Column Name="LicenseCode" DataType="System.String" PropName="file_size"/>
+        <Column Name="LicenseScope" DataType="System.String" PropName="file_type"/>
+        <Column Name="NotificationCode" DataType="System.String" PropName="created_date"/>
+        <Column Name="PipelineCode" DataType="System.String" PropName="created_by"/>
+        <Column Name="PipeLength" DataType="System.String" PropName="series_desc"/>
+        <Column Name="PipeCategory" DataType="System.String" PropName="file_path"/>
+        <Column Name="UseUnit" DataType="System.String" PropName="Column"/>
+        <Column Name="UseUSCC" DataType="System.String" PropName="Column"/>
+        <Column Name="UseAddress" DataType="System.String" PropName="Column"/>
+        <Column Name="DesignUnit" DataType="System.String" PropName="Column"/>
+        <Column Name="DesignDate" DataType="System.String" PropName="Column"/>
+        <Column Name="DesignLicenseCode" DataType="System.String" PropName="Column"/>
+        <Column Name="ModRepairProject" DataType="System.String" PropName="Column"/>
+        <Column Name="Remark" DataType="System.String" PropName="Column"/>
+        <Column Name="Remark" Enabled="false" DataType="System.String" PropName="Column"/>
+        <Column Name="CompletionDate" DataType="System.String" PropName="Column"/>
+        <Column Name="QC_Inspector" DataType="System.String" PropName="Column"/>
+        <Column Name="QA_Engineer" DataType="System.String" PropName="Column1"/>
+      </TableDataSource>
+    </MsSqlDataConnection>
+    <Parameter Name="chkGaiZao" DataType="System.String"/>
+    <Parameter Name="chkZhongDaWeiXiu" DataType="System.String"/>
+    <Parameter Name="chkWeiXiu" DataType="System.String"/>
+  </Dictionary>
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="368.55,642.6,9.45,0,311.85,646.4,112.27,337.94,431.31,140.62,93.37,74.47,440.76,452.1,497.46,508.8,582.51,593.85,506.91,591.96,639.21,450.21,225.67,505.78,508.04">
+    <PageHeaderBand Name="PageHeader1" Width="646.38" Height="122.85" Guides="9.45,37.8,66.15,94.5,122.85">
+      <TextObject Name="Text1" Left="368.55" Top="9.45" Width="274.05" Height="28.35" Text="ZDS-T6.38.048.A/0.2020" HorzAlign="Right" VertAlign="Center" Font="Calibri, 15pt, style=Bold"/>
+      <TextObject Name="Text2" Left="9.45" Top="66.15" Width="633.15" Height="28.35" Text="压力管道改造维修质量证明书" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 22pt, style=Bold"/>
+      <TextObject Name="Text4" Top="94.5" Width="311.85" Height="28.35" Text=" 编号：[Data.QualityCertificateCode]" VertAlign="Center"/>
+      <TextObject Name="Text11" Left="9.45" Top="37.8" Width="633.15" Height="28.35" Text="浙 江 鼎 盛 石 化 工 程 有 限 公 司" HorzAlign="Center" VertAlign="Center" Font="宋体, 16pt"/>
+    </PageHeaderBand>
+    <DataBand Name="Data1" Top="126.85" Width="646.38" Height="886.23" Guides="0,886.23,52.91,105.82,149.28,43.46,192.74,236.2,18.9,30.24,9.45,37.8,279.66,323.12,366.58,413.83,47.25,517.78,103.95,617.9401,100.16,688.7,70.76,760.51,71.81,813.42,885.23,1">
+      <TableObject Name="Table1" Width="646.4" Height="886.23">
+        <TableColumn Name="Column1" Width="112.27"/>
+        <TableColumn Name="Column2" Width="225.67"/>
+        <TableColumn Name="Column3" Width="93.37"/>
+        <TableColumn Name="Column4" Width="74.47"/>
+        <TableColumn Name="Column5" Width="140.62"/>
+        <TableRow Name="Row1" Height="52.91">
+          <TableCell Name="Cell1" Border.Lines="All" Text="施工单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell2" Border.Lines="All" Text="[Data.ConUnit]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell3" Border.Lines="All" Text="统一社会信用代码" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell4" Border.Lines="All" Text="[Data.ConUnitUSCC]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell5" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row2" Height="52.91">
+          <TableCell Name="Cell6" Border.Lines="All" Text="压力管道安装许可证编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell7" Border.Lines="All" Text="[Data.LicenseCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell8" Border.Lines="All" Text="许可范围" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell9" Border.Lines="All" Text="[Data.LicenseScope]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell10" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row3" Height="43.46">
+          <TableCell Name="Cell11" Border.Lines="All" Text="告知单编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell12" Border.Lines="All" Text="[Data.NotificationCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="4"/>
+          <TableCell Name="Cell13" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell14" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell15" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row4" Height="43.46">
+          <TableCell Name="Cell16" Border.Lines="All" Text="管线号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell17" Border.Lines="All" Text="[Data.PipelineCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell18" Border.Lines="All" Text="管道长度" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell19" Border.Lines="All" Text="[Data.PipeLength]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell20" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row5" Height="43.46">
+          <TableCell Name="Cell21" Border.Lines="All" Text="管道类别" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell22" Border.Lines="All" Text="[Data.PipeCategory]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell23" Border.Lines="All" Text="施工类别" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell24" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="微软雅黑, 12pt" ColSpan="2">
+            <CheckBoxObject Name="chkGaiZao" Left="9.45" Top="18.9" Width="11.34" Height="11.34" Border.Lines="All" Checked="false" Expression="[chkGaiZao] == &quot;True&quot;"/>
+            <CheckBoxObject Name="chkZhongDaWeiXiu" Left="66.15" Top="18.9" Width="11.34" Height="11.34" Border.Lines="All" Checked="false" Expression="[chkZhongDaWeiXiu] == &quot;True&quot;"/>
+            <CheckBoxObject Name="chkWeiXiu" Left="151.2" Top="18.9" Width="11.34" Height="11.34" Border.Lines="All" Checked="false" Expression="[chkWeiXiu]== &quot;True&quot;"/>
+            <TextObject Name="Text12" Left="75.6" Top="9.45" Width="75.6" Height="28.35" Text="重大维修" Padding="5, 2, 0, 2" VertAlign="Center" Font="楷体, 10.5pt"/>
+            <TextObject Name="Text13" Left="160.65" Top="9.45" Width="47.25" Height="28.35" Text="维修" Padding="5, 2, 0, 2" VertAlign="Center" Font="楷体, 10.5pt"/>
+            <TextObject Name="Text14" Left="18.9" Top="9.45" Width="47.25" Height="28.35" Text="改造" Padding="5, 2, 0, 2" VertAlign="Center" Font="楷体, 10.5pt"/>
+          </TableCell>
+          <TableCell Name="Cell25" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row7" Height="43.46">
+          <TableCell Name="Cell31" Border.Lines="All" Text="使用单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell32" Border.Lines="All" Text="[Data.UseUnit]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell33" Border.Lines="All" Text="统一社会信用代码" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell34" Border.Lines="All" Text="[Data.UseUSCC]" HorzAlign="Center" VertAlign="Center" Font="楷体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell35" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row8" Height="43.46">
+          <TableCell Name="Cell36" Border.Lines="All" Text="使用地点" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell37" Border.Lines="All" Text="[Data.UseAddress]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="4"/>
+          <TableCell Name="Cell38" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell39" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell40" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row9" Height="43.46">
+          <TableCell Name="Cell41" Border.Lines="All" Text="设计单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell42" Border.Lines="All" Text="[Data.DesignUnit]" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="4"/>
+          <TableCell Name="Cell43" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell44" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell45" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row17" Height="47.25">
+          <TableCell Name="Cell81" Border.Lines="All" Text="设计日期" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell82" Border.Lines="All" Text="[Data.DesignDate]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell83" Border.Lines="All" Text="设计许可证编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell84" Border.Lines="All" Text="[Data.DesignLicenseCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell85" Border.Lines="All" HorzAlign="Center" VertAlign="Center"/>
+        </TableRow>
+        <TableRow Name="Row18" Height="103.95">
+          <TableCell Name="Cell86" Border.Lines="Left, Right" Text="改造与重大维修项目：[Data.ModRepairProject]" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell87"/>
+          <TableCell Name="Cell88"/>
+          <TableCell Name="Cell89"/>
+          <TableCell Name="Cell90"/>
+        </TableRow>
+        <TableRow Name="Row10" Height="100.16">
+          <TableCell Name="Cell46" Border.Lines="Left, Right, Top" Text="    该压力管道由本单位负责改造/维修，特此证明改造/维修质量符合相关特种设备安全技术规范的规定。" Padding="10, 10, 10, 10" Font="宋体, 12pt" ColSpan="5"/>
+          <TableCell Name="Cell47" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell48" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell49" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell50" Border.Lines="Left, Right, Top" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row11" Height="70.76">
+          <TableCell Name="Cell51" Border.Lines="Left" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell52" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell53" Text="（单位公章）" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell54" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell55" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row12" Height="71.81">
+          <TableCell Name="Cell56" Border.Lines="Left" Padding="50, 1, 2, 1" VertAlign="Center" Font="宋体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell57" HorzAlign="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell58" Border.Lines="Right" Text="竣工日期：[Data.CompletionDate]" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell59" Border.Lines="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell60" Border.Lines="Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row13" Height="52.91">
+          <TableCell Name="Cell61" Border.Lines="Left" Text="质检员（签章）：" Padding="50, 1, 2, 1" HorzAlign="Right" VertAlign="Center" Font="黑体, 12pt" ColSpan="2"/>
+          <TableCell Name="Cell62" HorzAlign="Right" VertAlign="Center" Font="黑体, 10.5pt"/>
+          <TableCell Name="Cell63" Border.Lines="Right" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="3">
+            <TextObject Name="Text3" Top="9.45" Width="170.1" Height="28.35" Border.Lines="Bottom" Text="[Data.QC_Inspector]" VertAlign="Center" Font="黑体, 12pt"/>
+          </TableCell>
+          <TableCell Name="Cell64" Border.Lines="Right" HorzAlign="Right" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell65" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row14" Height="71.81">
+          <TableCell Name="Cell66" Border.Lines="Left" Padding="2, 1, 50, 1" HorzAlign="Right" VertAlign="Center" Font="宋体, 12pt"/>
+          <TableCell Name="Cell67" Text="质量保证工程师（签章）：" HorzAlign="Right" VertAlign="Center" Font="黑体, 12pt"/>
+          <TableCell Name="Cell68" Border.Lines="Right" VertAlign="Center" Font="楷体, 12pt" ColSpan="3">
+            <TextObject Name="Text5" Top="18.9" Width="170.1" Height="28.35" Border.Lines="Bottom" Text="[Data.QA_Engineer]" VertAlign="Center" Font="黑体, 12pt"/>
+          </TableCell>
+          <TableCell Name="Cell69" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="楷体, 12pt"/>
+          <TableCell Name="Cell70" Border.Lines="Right" HorzAlign="Center" VertAlign="Center" Font="楷体, 12pt"/>
+        </TableRow>
+        <TableRow Name="Row19" Height="1">
+          <TableCell Name="Cell91" Border.Lines="Left, Right, Bottom" ColSpan="5"/>
+          <TableCell Name="Cell92" Border.Lines="Left, Right, Bottom"/>
+          <TableCell Name="Cell93" Border.Lines="Left, Right, Bottom"/>
+          <TableCell Name="Cell94" Border.Lines="Left, Right, Bottom"/>
+          <TableCell Name="Cell95" Border.Lines="Left, Right, Bottom"/>
+        </TableRow>
+      </TableObject>
+    </DataBand>
+  </ReportPage>
+</Report>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" TextQuality="ClearType" ReportInfo.Created="12/12/2025 11:03:02" ReportInfo.Modified="04/22/2026 16:57:14" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" TextQuality="ClearType" ReportInfo.Created="12/12/2025 11:03:02" ReportInfo.Modified="09/07/2026 17:14:54" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -32,7 +32,7 @@ namespace FastReport
     <Parameter Name="HeaderMan" DataType="System.String"/>
     <Parameter Name="SupervisoryOpinion" DataType="System.String"/>
   </Dictionary>
-  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="0,646.4,160.28,51.79,386.71,99.04,471.76,108.49,127.39,339.46,424.51,405.61,580.25,85.05,174.64,287.67,642.6,161.6,323.2,484.8">
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="22" TopMargin="13.3" RightMargin="17" BottomMargin="16.5" Guides="0,646.4,160.28,51.79,386.71,99.04,471.76,108.49,127.39,85.05,174.64,287.67,642.6,161.6,323.2,484.8">
     <PageHeaderBand Name="PageHeader1" Width="646.38" Height="830.18" Guides="0,830.18,82.54,22.68,59.86,114.05,31.51,145.56,167.62,22.06,414.08,28.35,66.15,37.8,226.8,246.46,436.14,590.5,154.36,622.01,644.07,798.43,31.75">
       <TableObject Name="Table1" Width="646.4" Height="830.18">
         <TableColumn Name="Column1" Width="108.49"/>
@@ -42,7 +42,7 @@ namespace FastReport
         <TableColumn Name="Column10" Width="85.05"/>
         <TableColumn Name="Column5" Width="174.64"/>
         <TableRow Name="Row1" Height="22.68">
-          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3503—J107B" HorzAlign="Center" VertAlign="Center" Font="黑体, 10.5pt" ColSpan="2" RowSpan="2"/>
+          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3503—J107A" HorzAlign="Center" VertAlign="Center" Font="黑体, 10.5pt" ColSpan="2" RowSpan="2"/>
           <TableCell Name="Cell2" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
           <TableCell Name="Cell3" Border.Lines="All" Text="工程交工验收证书" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold" ColSpan="2" RowSpan="2"/>
           <TableCell Name="Cell4" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/焊条烘烤记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="10/26/2024 15:04:43" ReportInfo.Modified="04/22/2026 23:04:05" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="10/26/2024 15:04:43" ReportInfo.Modified="09/24/2026 13:25:49" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -39,7 +39,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFjpTGEarsSxENa6kYDYyuhA==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFXRA52hHA2Zz6d5lLvCYfUA==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="HJGL_BakeRecords" Enabled="true" TableName="Data">
         <Column Name="BakeDateMonth" DataType="System.String"/>
         <Column Name="BakeDateDay" DataType="System.String" PropName="Column"/>
@@ -65,9 +65,9 @@ namespace FastReport
     </MsSqlDataConnection>
     <Parameter Name="ProjectName" DataType="System.String"/>
   </Dictionary>
-  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" RawPaperSize="9" LeftMargin="16" TopMargin="22" RightMargin="13.2" BottomMargin="17" Guides="0,1011.67,330.2,33.91,100.06,52.81,729.89,81.16,43.36,822.17,744.9,778.81,788.26,812.72,856.08,899.44,933.35,77.27,177.33,277.39,383.01,464.17,507.53,618.71,797.71,575.35,662.07,78.32,541.44,695.98,763.8,9.45,1001.7,708.75,1011.51,43.38,77.31,177.39,277.47,383.13,52.83,464.31,507.69,541.62,575.55,618.93,662.31,696.24,730.17,764.1,798.03,821.9301,855.86,899.24,933.17,1011.63,515.05,33.89,100.04,52.79,62.24,71.69,3.84,43.34,63.18">
-    <PageHeaderBand Name="PageHeader1" Width="1012.28" Height="205.81" Guides="56.7,205.81,0,78.25,101.87,23.62,149.11,125.49,28.35,37.8">
-      <TableObject Name="Table1" Top="56.7" Width="1011.67" Height="149.11">
+  <ReportPage Name="Page1" Landscape="true" PaperWidth="297" PaperHeight="210" RawPaperSize="9" LeftMargin="16" TopMargin="22" RightMargin="13.2" BottomMargin="17" Guides="0,1011.67,330.2,33.91,100.06,52.81,729.89,81.16,43.36,822.17,24.46,78.32,77.27,177.33,277.39,383.01,464.17,507.53,618.71,797.71,899.44,933.35,575.35,662.07,856.08,541.44,695.98,763.8,1011.51,43.38,77.31,177.39,277.47,383.13,52.83,464.31,507.69,541.62,575.55,618.93,662.31,696.24,730.17,764.1,798.03,821.9301,855.86,899.24,933.17,1011.63,515.05,33.89,100.04,52.79,62.24,71.69,3.84,43.34,63.18">
+    <PageHeaderBand Name="PageHeader1" Width="1012.28" Height="149.11" Guides="0,149.11,78.25,101.87,23.62,125.49">
+      <TableObject Name="Table1" Width="1011.67" Height="149.11">
         <TableColumn Name="Column1" Width="43.36"/>
         <TableColumn Name="Column2" Width="33.91"/>
         <TableColumn Name="Column3" Width="100.06"/>
@@ -182,10 +182,8 @@ namespace FastReport
           <TableCell Name="Cell89" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
         </TableRow>
       </TableObject>
-      <TextObject Name="Text1" Left="9.45" Width="992.25" Height="28.35" Text="浙 江 鼎 盛 石 化 工 程 有 限 公 司" HorzAlign="Center" VertAlign="Center" Font="思源宋体 CN, 16pt, style=Bold"/>
-      <TextObject Name="Text2" Left="708.75" Top="37.8" Width="292.95" Height="18.9" Text="ZDS-T6.37.075.A/1.2020" HorzAlign="Center" VertAlign="Center" Font="宋体, 12pt"/>
     </PageHeaderBand>
-    <DataBand Name="Data1" Top="209.81" Width="1012.28" Height="33.07" Guides="0,33.07">
+    <DataBand Name="Data1" Top="153.11" Width="1012.28" Height="33.07" Guides="0,33.07">
       <TableObject Name="Table2" Width="1011.51" Height="33.07" ManualBuildEvent="Table2_ManualBuild">
         <TableColumn Name="Column22" Width="43.38"/>
         <TableColumn Name="Column23" Width="33.93"/>
@@ -233,8 +231,8 @@ namespace FastReport
         </TableRow>
       </TableObject>
     </DataBand>
-    <ColumnFooterBand Name="ColumnFooter1" Top="283.95" Width="1012.28">
-      <ChildBand Name="Child1" Top="246.88" Width="1012.28" Height="33.07" Guides="0,33.07" FillUnusedSpace="true">
+    <ColumnFooterBand Name="ColumnFooter1" Top="227.25" Width="1012.28">
+      <ChildBand Name="Child1" Top="190.18" Width="1012.28" Height="33.07" Guides="0,33.07" FillUnusedSpace="true">
         <TableObject Name="Table3" Width="1011.67" Height="33.07">
           <TableColumn Name="Column43" Width="43.36"/>
           <TableColumn Name="Column44" Width="33.91"/>
@@ -283,7 +281,7 @@ namespace FastReport
         </TableObject>
       </ChildBand>
     </ColumnFooterBand>
-    <PageFooterBand Name="PageFooter1" Top="287.95" Width="1012.28" Height="43.47" Guides="0,43.47">
+    <PageFooterBand Name="PageFooter1" Top="231.25" Width="1012.28" Height="43.47" Guides="0,43.47">
       <TableObject Name="Table4" Width="1011.63" Height="43.47">
         <TableColumn Name="Column64" Width="33.89"/>
         <TableColumn Name="Column65" Width="33.89"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道无损检测数量统计表.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="04/22/2026 22:22:55" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="09/10/2026 14:12:26" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF+jEvKxLL874QPxeZpe4mMg==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFsoKsInwAGXf7JXNSZ89jqA==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="IsoNo" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="NDTR_Name" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx

@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/29/2026 10:23:50" ReportInfo.Modified="09/18/2026 11:22:49" ReportInfo.CreatorVersion="2017.1.16.0">
+  <ScriptText>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(&quot;Data&quot;);
+      // 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();
+      }
+    }
+  }
+}
+</ScriptText>
+  <Dictionary>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFlDGVCtBD9EyVLKcJ6YVUug==">
+      <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
+        <Column Name="PipelineNo" DataType="System.String" PropName="attach_image_id"/>
+        <Column Name="DesignPressure" DataType="System.String" PropName="image_series"/>
+        <Column Name="DesignTem" DataType="System.String" PropName="file_name"/>
+        <Column Name="TestAmbientTemp" DataType="System.String" PropName="file_size"/>
+        <Column Name="TestMediumTemp" Enabled="false" DataType="System.String" PropName="created_date"/>
+        <Column Name="LeakPressure" DataType="System.String" PropName="created_by"/>
+        <Column Name="LeakMedium" DataType="System.String" PropName="series_desc"/>
+        <Column Name="VacuumPressure" DataType="System.String" PropName="Column"/>
+        <Column Name="VacuumMedium" DataType="System.String" PropName="Column"/>
+        <Column Name="TestMediumTemp" DataType="System.String" PropName="Column"/>
+      </TableDataSource>
+    </MsSqlDataConnection>
+    <MsSqlDataConnection Name="Connection1" ConnectionString="rijcmlqM3/HbiZANEYP3Y6oNtE7mqsCE0NW5tkXiWL0RJsdm/BnXhHrIFd8DaTyqYvkCZwzaaQipsiBeb+lBhzIDpDvfvxDsovr3/ckbYEBSCcpPFiH7Npcn4kPkDoxtl7XrCt1j63ma3mCLcLPN9o74aBqqd1WZsaEs7MLRtSWt4L/IDLoaEYKi0euV49rY12ECZLm">
+      <TableDataSource Name="MainData" DataType="System.Int32" PropName="JGZL_LeakageVacuum" Enabled="true" TableName="MainData">
+        <Column Name="ProjectName" DataType="System.String" PropName="LeakageVacuumId"/>
+        <Column Name="SystemName" DataType="System.String" PropName="ProjectId"/>
+        <Column Name="SystemCode" DataType="System.String" PropName="SystemName"/>
+        <Column Name="SystemCode" Enabled="false" DataType="System.String"/>
+        <Column Name="CheckItemResult1" DataType="System.String"/>
+        <Column Name="CheckItemResult2" DataType="System.String"/>
+        <Column Name="CheckItemResult3" DataType="System.String"/>
+        <Column Name="CheckItemResult4" DataType="System.String"/>
+        <Column Name="CheckItemResult5" DataType="System.String"/>
+        <Column Name="Conclusion" DataType="System.String"/>
+      </TableDataSource>
+    </MsSqlDataConnection>
+    <Parameter Name="ProjectName" DataType="System.String"/>
+    <Parameter Name="SystemName" DataType="System.String"/>
+    <Parameter Name="SystemCode" DataType="System.String"/>
+    <Parameter Name="TestConclusion" DataType="System.String"/>
+    <Parameter Name="Remark" DataType="System.String"/>
+  </Dictionary>
+  <ReportPage Name="Page1" RawPaperSize="9" LeftMargin="25" TopMargin="20" RightMargin="20" BottomMargin="21" Guides="0,624.25,141.89,37.87,406.72,397.04,491.54,122.92,104.06,104.02,141.91,520.19,283.8,623.8,425.3,623.7,71.55,62.1,52.65,43.2,66.15,137.7,209.25,280.8,342.9,395.55,504.9,438.75,557.55,207.9,415.8">
+    <PageHeaderBand Name="PageHeader1" Width="623.7" Height="160.65" Guides="0,160.65,94.5,66.15,9.45,28.35">
+      <TableObject Name="Table1" Width="624.25" Height="160.65">
+        <TableColumn Name="Column1" Width="104.02"/>
+        <TableColumn Name="Column2" Width="37.87"/>
+        <TableColumn Name="Column3" Width="141.91"/>
+        <TableColumn Name="Column4" Width="122.92"/>
+        <TableColumn Name="Column5" Width="113.47"/>
+        <TableColumn Name="Column6" Width="104.06"/>
+        <TableRow Name="Row1" Height="66.15">
+          <TableCell Name="Cell1" Border.Lines="All" Text="SH/T 3503—J407" HorzAlign="Center" VertAlign="Center" Font="黑体, 10.5pt" ColSpan="2" RowSpan="2"/>
+          <TableCell Name="Cell2" Border.Lines="All"/>
+          <TableCell Name="Cell3" Border.Lines="All" Text="管道系统泄漏性/真空&#13;&#10;试验条件确认与试验记录" HorzAlign="Center" VertAlign="Center" Font="华文中宋, 16pt, style=Bold" ColSpan="2" RowSpan="2">
+            <TextObject Name="Text1" Left="255.15" Top="9.45" Width="94.5" Height="18.9" Text="工程名称：" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          </TableCell>
+          <TableCell Name="Cell4" Border.Lines="All"/>
+          <TableCell Name="Cell5" Border.Lines="Left, Right, Top" Text="          [MainData.ProjectName]" Padding="2, 9, 2, 1" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell26" Border.Lines="All"/>
+        </TableRow>
+        <TableRow Name="Row2" Height="28.35">
+          <TableCell Name="Cell6" Border.Lines="All"/>
+          <TableCell Name="Cell7" Border.Lines="All"/>
+          <TableCell Name="Cell8" Border.Lines="All"/>
+          <TableCell Name="Cell9" Border.Lines="All"/>
+          <TableCell Name="Cell10" Border.Lines="Left, Bottom" Text="单位工程名称：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell27" Border.Lines="Right, Bottom" Text="管道安装工程" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row3" Height="66.15">
+          <TableCell Name="Cell11" Border.Lines="All" Text="系统名称" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell12" Border.Lines="All" Text="[MainData.SystemName]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell13" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell14" Border.Lines="All" Text="系统编号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell15" Border.Lines="All" Text="[MainData.SystemCode]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt" ColSpan="2"/>
+          <TableCell Name="Cell28" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+      </TableObject>
+      <ChildBand Name="Child1" Top="164.65" Width="623.7" Height="160.56" Guides="0,160.56,26.76,53.52,80.28,107.04,133.8">
+        <TableObject Name="Table6" Width="623.8" Height="160.56" Border.Lines="All">
+          <TableColumn Name="Column40" Width="425.3"/>
+          <TableColumn Name="Column41" Width="198.5"/>
+          <TableRow Name="Row17" Height="26.76">
+            <TableCell Name="Cell130" Border.Lines="All" Text="检查项目与要求" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell131" Border.Lines="All" Text="检查结果" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          </TableRow>
+          <TableRow Name="Row18" Height="26.76">
+            <TableCell Name="Cell135" Border.Lines="All" Text="管道压力试验合格" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell136" Border.Lines="All" Text="[MainData.CheckItemResult1]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          </TableRow>
+          <TableRow Name="Row19" Height="26.76">
+            <TableCell Name="Cell140" Border.Lines="All" Text="压力试验采用的临时法兰、螺栓、垫片等均已更换" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell141" Border.Lines="All" Text="[MainData.CheckItemResult2]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          </TableRow>
+          <TableRow Name="Row20" Height="26.76">
+            <TableCell Name="Cell145" Border.Lines="All" Text="未参与压力试验的安全附件及仪表等已安装复位" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell146" Border.Lines="All" Text="[MainData.CheckItemResult3]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          </TableRow>
+          <TableRow Name="Row21" Height="26.76">
+            <TableCell Name="Cell150" Border.Lines="All" Text="试验管道系统的阀门已全部开启" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell151" Border.Lines="All" Text="[MainData.CheckItemResult4]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          </TableRow>
+          <TableRow Name="Row22" Height="26.76">
+            <TableCell Name="Cell152" Border.Lines="All" Text="试压用压力表、精度等级、检定状态符合规范要求" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell153" Border.Lines="All" Text="[MainData.CheckItemResult5]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          </TableRow>
+        </TableObject>
+        <ChildBand Name="Child3" Top="329.21" Width="623.7" Height="103.96" Guides="0,103.96,33.08,66.16,37.8">
+          <TableObject Name="Table2" Width="623.7" Height="103.96" Border.Lines="Left, Bottom">
+            <TableColumn Name="Column7" Width="137.7"/>
+            <TableColumn Name="Column8" Width="71.55"/>
+            <TableColumn Name="Column9" Width="71.55"/>
+            <TableColumn Name="Column10" Width="62.1"/>
+            <TableColumn Name="Column12" Width="52.65"/>
+            <TableColumn Name="Column13" Width="43.2"/>
+            <TableColumn Name="Column34"/>
+            <TableColumn Name="Column14" Width="52.65"/>
+            <TableColumn Name="Column35"/>
+            <TableRow Name="Row4" Height="33.08">
+              <TableCell Name="Cell29" Border.Lines="All" Text="试   验  记  录 " HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="9"/>
+              <TableCell Name="Cell30" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell31" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell32" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell54" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell55" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell120"/>
+              <TableCell Name="Cell56" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell123"/>
+            </TableRow>
+            <TableRow Name="Row5" Height="33.08">
+              <TableCell Name="Cell34" Border.Lines="All" Text="管道编号&#13;&#10;/单线号" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+              <TableCell Name="Cell35" Border.Lines="All" Text="设计压力&#13;&#10;MPa" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+              <TableCell Name="Cell36" Border.Lines="All" Text="设计温度&#13;&#10;℃" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+              <TableCell Name="Cell37" Border.Lines="All" Text="试验环境温度&#13;&#10;℃" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+              <TableCell Name="Cell57" Border.Lines="All" Text="试验介质温度&#13;&#10;℃" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" RowSpan="2"/>
+              <TableCell Name="Cell58" Border.Lines="All" Text="泄漏性试验" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+              <TableCell Name="Cell121"/>
+              <TableCell Name="Cell59" Border.Lines="All" Text="真空试验" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="2"/>
+              <TableCell Name="Cell124"/>
+            </TableRow>
+            <TableRow Name="Row16" Height="37.8">
+              <TableCell Name="Cell113"/>
+              <TableCell Name="Cell114"/>
+              <TableCell Name="Cell115"/>
+              <TableCell Name="Cell116"/>
+              <TableCell Name="Cell117"/>
+              <TableCell Name="Cell118" Border.Lines="All" Text="压力&#13;&#10;MPa" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell122" Border.Lines="All" Text="介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell119" Border.Lines="All" Text="压力&#13;&#10;MPa" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+              <TableCell Name="Cell125" Border.Lines="All" Text="介质" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            </TableRow>
+          </TableObject>
+        </ChildBand>
+      </ChildBand>
+    </PageHeaderBand>
+    <DataBand Name="Data1" Top="437.17" Width="623.7" Height="33.08" Guides="0,33.08">
+      <TableObject Name="Table3" Width="623.7" Height="33.08" Border.Lines="Left, Bottom" ManualBuildEvent="Table3_ManualBuild">
+        <TableColumn Name="Column15" Width="137.7"/>
+        <TableColumn Name="Column16" Width="71.55"/>
+        <TableColumn Name="Column17" Width="71.55"/>
+        <TableColumn Name="Column18" Width="62.1"/>
+        <TableColumn Name="Column20" Width="52.65"/>
+        <TableColumn Name="Column21" Width="43.2"/>
+        <TableColumn Name="Column36"/>
+        <TableColumn Name="Column22" Width="52.65"/>
+        <TableColumn Name="Column37"/>
+        <TableRow Name="Row7" Height="33.08">
+          <TableCell Name="Cell68" Border.Lines="All" Text="[Data.PipelineNo]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell69" Border.Lines="All" Text="[Data.DesignPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell70" Border.Lines="All" Text="[Data.DesignTem]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell71" Border.Lines="All" Text="[Data.TestAmbientTemp]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell73" Border.Lines="All" Text="[Data.TestMediumTemp]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell74" Border.Lines="All" Text="[Data.LeakPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell126" Border.Lines="All" Text="[Data.LeakMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell75" Border.Lines="All" Text="[Data.VacuumPressure]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+          <TableCell Name="Cell127" Border.Lines="All" Text="[Data.VacuumMedium]" HorzAlign="Center" VertAlign="Center" Font="楷体, 10.5pt"/>
+        </TableRow>
+      </TableObject>
+    </DataBand>
+    <ColumnFooterBand Name="ColumnFooter1" Top="511.33" Width="623.7">
+      <ChildBand Name="Child2" Top="474.25" Width="623.7" Height="33.08" Guides="0,33.08" FillUnusedSpace="true">
+        <TableObject Name="Table4" Width="623.7" Height="33.08" Border.Lines="Left, Bottom">
+          <TableColumn Name="Column23" Width="137.7"/>
+          <TableColumn Name="Column24" Width="71.55"/>
+          <TableColumn Name="Column25" Width="71.55"/>
+          <TableColumn Name="Column26" Width="62.1"/>
+          <TableColumn Name="Column28" Width="52.65"/>
+          <TableColumn Name="Column29" Width="43.2"/>
+          <TableColumn Name="Column38"/>
+          <TableColumn Name="Column30" Width="52.65"/>
+          <TableColumn Name="Column39"/>
+          <TableRow Name="Row8" Height="33.08">
+            <TableCell Name="Cell76" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell77" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell78" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell79" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell81" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell82" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell128" Border.Lines="All"/>
+            <TableCell Name="Cell83" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+            <TableCell Name="Cell129" Border.Lines="All"/>
+          </TableRow>
+        </TableObject>
+      </ChildBand>
+    </ColumnFooterBand>
+    <PageFooterBand Name="PageFooter1" Top="515.33" Width="623.7" Height="211.26" Guides="0,211.26,30.18,60.36,90.54,120.72,150.9,181.08">
+      <TableObject Name="Table5" Width="623.7" Height="211.26" Border.Lines="All">
+        <TableColumn Name="Column31" Width="207.9"/>
+        <TableColumn Name="Column32" Width="207.9"/>
+        <TableColumn Name="Column33" Width="207.9"/>
+        <TableRow Name="Row9" Height="30.18">
+          <TableCell Name="Cell84" Text="试验结论：" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell85" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell86" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row10" Height="30.18">
+          <TableCell Name="Cell89" VertAlign="Center" Font="宋体, 10.5pt" ColSpan="3"/>
+          <TableCell Name="Cell90" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell91" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row11" Height="30.18">
+          <TableCell Name="Cell94" Border.Lines="All" Text="建设/监理单位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell95" Border.Lines="All" Text="总 承 包 单 位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell96" Border.Lines="All" Text="施 工 单 位" HorzAlign="Center" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row12" Height="30.18">
+          <TableCell Name="Cell99" Text="专业工程师：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell100" Border.Lines="Left, Right" Text="专业工程师：" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell101" Text="施工班组长：" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row13" Height="30.18">
+          <TableCell Name="Cell104" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell105" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell106" Text="质量检查员：" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row14" Height="30.18">
+          <TableCell Name="Cell107" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell108" Border.Lines="Left, Right" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell109" Text="专业工程师：" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+        <TableRow Name="Row15" Height="30.18">
+          <TableCell Name="Cell110" Text="日期：   年  月   日" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell111" Border.Lines="Left, Right" Text="日期：   年  月   日" VertAlign="Center" Font="宋体, 10.5pt"/>
+          <TableCell Name="Cell112" Text="日期：   年  月   日" VertAlign="Center" Font="宋体, 10.5pt"/>
+        </TableRow>
+      </TableObject>
+    </PageFooterBand>
+  </ReportPage>
+</Report>

HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性试验记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="01/29/2026 10:23:50" ReportInfo.Modified="03/19/2026 15:08:11" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="01/29/2026 10:23:50" ReportInfo.Modified="09/14/2026 14:54:57" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFg1qRjSswFxgpEVsc1cd7Ug==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFLqIlIgZXSpuHRnSqyOh9GQ==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="PipelineNo" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="DesignPressure" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/焊条烘烤记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="10/26/2024 15:04:43" ReportInfo.Modified="11/05/2024 15:06:25" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="10/26/2024 15:04:43" ReportInfo.Modified="09/24/2026 13:53:49" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -39,7 +39,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqdP6ADbZQpLOMXx+Ivgq2SioFBJ7B1iEOuUxf7y1evrTM15NUOhfx6SD2+E9SReEWvg7u6EQdXpqQDDPj6WgkoKQIrTt5q9lJyuCu5B6Nl0MXJ6ZEae4ta6haGkhwICyq72I9X2dS6a3zf8gkFZpb6VtdwKlyFhTivyv2i8IjPiUXLimy5mJMh8U2rXyiDDAJIsLkZzjrsv+NOSh6uCq6Ug==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFUQPsnPetCK/eKuGGko7kWA==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="HJGL_BakeRecords" Enabled="true" TableName="Data">
         <Column Name="BakeDateMonth" DataType="System.String"/>
         <Column Name="BakeDateDay" DataType="System.String" PropName="Column"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道无损检测数量统计表.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="02/03/2026 11:01:08" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="10/20/2025 10:51:50" ReportInfo.Modified="09/10/2026 14:22:00" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF2tKnmFHGYxmZtRT5hZjQMw==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QFNSrLsmhmwUFwAlp5vIclNg==">
       <TableDataSource Name="Data" DataType="System.Int32" PropName="Attach_Image" Enabled="true" TableName="Data">
         <Column Name="IsoNo" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="NDTR_Name" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="05/13/2026 09:16:24" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="11/23/2024 15:00:41" ReportInfo.Modified="09/09/2026 10:47:23" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF9BIAyY5+UaR+KsNHv+fwLw==">
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqtRsOalcXxDhVt62rPEPNYjaATUoMqziRYvJtgNsyJKYAG7kXKvNAMI/qBkgJNPccFsWrhiII6oyX1HS+uwN7YigxVjqUq3vIet2zpPnmWhwvYEvWOOCZZGx6EC4BfGfWX8aPj6bmoF52Z0fnUA9g71duxa/gvChTW/nzu9qsYVuvlVHliMnnu6jEIF9n+/QF4n65VIsY0T+Kq4g5gTDpIg==">
       <TableDataSource Name="Attach_Image" Alias="Data" DataType="System.Int32" Enabled="true" TableName="Attach_Image">
         <Column Name="Number" DataType="System.String" PropName="attach_image_id"/>
         <Column Name="ISO_IsoNo" DataType="System.String" PropName="image_series"/>

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1404,8 +1404,12 @@
     <Content Include="JGZL\ElectrodeRecovery.aspx" />
     <Content Include="JGZL\EWeldRHRecord.aspx" />
     <Content Include="JGZL\FileDirectory.aspx" />
+    <Content Include="JGZL\IndustrialPipelineInstallationSummary2020.aspx" />
+    <Content Include="JGZL\IndustrialPipelineQualityCertificate2020.aspx" />
     <Content Include="JGZL\InsulationAcceptanceRecord.aspx" />
     <Content Include="JGZL\InsulationAcceptanceRecordEdit.aspx" />
+    <Content Include="JGZL\LeakageVacuum.aspx" />
+    <Content Include="JGZL\ModRepairQualityCertificate.aspx" />
     <Content Include="JGZL\PressureTestOfPipelineSystemConfirmationRecord.aspx" />
     <Content Include="JGZL\LeakTestOfPipelineSystemRecord.aspx" />
     <Content Include="JGZL\PressureTestOfPipelineSystemConfirmationRecordEdit.aspx" />
@@ -7026,7 +7030,7 @@
     </Compile>
     <Compile Include="JGZL\Cover.aspx.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\Cover.aspx.designer.cs">
       <DependentUpon>Cover.aspx</DependentUpon>
@@ -7059,6 +7063,20 @@
     <Compile Include="JGZL\FileDirectory.aspx.designer.cs">
       <DependentUpon>FileDirectory.aspx</DependentUpon>
     </Compile>
+    <Compile Include="JGZL\IndustrialPipelineInstallationSummary2020.aspx.cs">
+      <DependentUpon>IndustrialPipelineInstallationSummary2020.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JGZL\IndustrialPipelineInstallationSummary2020.aspx.designer.cs">
+      <DependentUpon>IndustrialPipelineInstallationSummary2020.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JGZL\IndustrialPipelineQualityCertificate2020.aspx.cs">
+      <DependentUpon>IndustrialPipelineQualityCertificate2020.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JGZL\IndustrialPipelineQualityCertificate2020.aspx.designer.cs">
+      <DependentUpon>IndustrialPipelineQualityCertificate2020.aspx</DependentUpon>
+    </Compile>
     <Compile Include="JGZL\InsulationAcceptanceRecord.aspx.cs">
       <DependentUpon>InsulationAcceptanceRecord.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -7073,6 +7091,20 @@
     <Compile Include="JGZL\InsulationAcceptanceRecordEdit.aspx.designer.cs">
       <DependentUpon>InsulationAcceptanceRecordEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="JGZL\LeakageVacuum.aspx.cs">
+      <DependentUpon>LeakageVacuum.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JGZL\LeakageVacuum.aspx.designer.cs">
+      <DependentUpon>LeakageVacuum.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="JGZL\ModRepairQualityCertificate.aspx.cs">
+      <DependentUpon>ModRepairQualityCertificate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JGZL\ModRepairQualityCertificate.aspx.designer.cs">
+      <DependentUpon>ModRepairQualityCertificate.aspx</DependentUpon>
+    </Compile>
     <Compile Include="JGZL\PressureTestOfPipelineSystemConfirmationRecord.aspx.cs">
       <DependentUpon>PressureTestOfPipelineSystemConfirmationRecord.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -7159,7 +7191,7 @@
     </Compile>
     <Compile Include="JGZL\CommencementReportEdit.aspx.cs">
       <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
-      <SubType>Component</SubType>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="JGZL\CommencementReportEdit.aspx.designer.cs">
       <DependentUpon>CommencementReportEdit.aspx</DependentUpon>
@@ -8704,6 +8736,27 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <WarningLevel>0</WarningLevel>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>

HJGL_DS/FineUIPro.Web/Global.asax.cs

@@ -340,6 +340,7 @@
                     newWelder.MaxHanTiao = q.MID_HanTiao;
                     newWelder.MaxWeldingWire = q.MID_WeldingWire;
                     newWelder.IsOAM = true;
+                    newWelder.IsSelfCreate = q.IsSelfCreate;
                     if (s.Count() > 0)
                     {
                         newWelder.WED_ID = s.First().WED_ID;
@@ -377,9 +378,22 @@
                 {
                     if (!string.IsNullOrEmpty(q.MIDWelder_QualifiedProjectCode))
                     {
-                        if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
+                        if (q.MIDWelder_QualifiedProjectCode.Contains("+") || q.MIDWelder_QualifiedProjectCode.Contains("＋") || q.MIDWelder_QualifiedProjectCode.Contains("和"))
                         {
-                            string[] codes = q.MIDWelder_QualifiedProjectCode.Split('+');
+                            string[] codes = null;
+                            if (q.MIDWelder_QualifiedProjectCode.Contains("+"))
+                            {
+                                codes = q.MIDWelder_QualifiedProjectCode.Split('+');
+                            }
+                            if (q.MIDWelder_QualifiedProjectCode.Contains("＋"))
+                            {
+                                codes = q.MIDWelder_QualifiedProjectCode.Split('＋');
+                            }
+                            if (q.MIDWelder_QualifiedProjectCode.Contains("和"))
+                            {
+                                codes = q.MIDWelder_QualifiedProjectCode.Split('和');
+                            }
+
                             foreach (string c in codes)
                             {
                                 var oldCode = from x in Funs.DB.HJGL_BS_WelderQualifiedProject where x.WED_ID == s.First().WED_ID && x.QualifiedProjectCode == c && x.LimitDate.Value.Date == q.MIDWelder_LimitDate.Value.Date select x;
@@ -425,10 +439,17 @@
                                 BLL.HJGL_WelderQualifiedProjectService.UpdateWelderQualifiedLimitDate(welderQualifiedProjectId, limitDate, q.MIDWelder_sfxgjgbl, q.MIDWelder_jjsybl, q.MIDWelder_jjsy);
                             }
                         }
+
+
                         // 回写表OAM_UesrQualified
                         long welder_ID = q.MIDWelder_ID;
                         bool isSync = true;
                         BLL.HJGL_WelderQualifiedProjectService.UpdateOAWelderQue(welder_ID, isSync);
+
+                        //List<SqlParameter> listStr = new List<SqlParameter>();
+                        //listStr.Add(new SqlParameter("@MIDWelder_ID", q.MIDWelder_ID));
+                        //SqlParameter[] parameter = listStr.ToArray();
+                        //BLL.SQLHelper.ExecutSql("UPDATE dbo.OAM_UesrQualified SET IsSync=1 WHERE MIDWelder_ID=@MIDWelder_ID", parameter);
                     }
                 }
             }

HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx

@@ -34,8 +34,7 @@
                 <Items>                   
                     <f:Tree ID="tvControlItem" ShowHeader="false" Height="480px" Title="管道无损检测数量统计表节点树"
                         OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
-                        EnableSingleClickExpand="true" OnNodeExpand="tvControlItem_NodeExpand" AutoLeafIdentification="true"
-                        EnableTextSelection="true" Expanded="true">
+                        AutoLeafIdentification="true" EnableTextSelection="true" Expanded="true">
                     </f:Tree>
                 </Items>
             </f:Panel>

HJGL_DS/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.cs

@@ -45,7 +45,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
         {
             this.tvControlItem.Nodes.Clear();
             TreeNode rootNode = new TreeNode();
-            rootNode.Text = "施工号-装置";
+            rootNode.Text = "施工号";
             rootNode.ToolTip = "项目";
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
@@ -63,15 +63,16 @@ namespace FineUIPro.Web.HJGL.CheckManage
                 rootProjectNode.Text = item.ProjectCode;
                 rootProjectNode.NodeID = item.ProjectId;
                 rootProjectNode.EnableExpandEvent = true;
+                rootProjectNode.EnableClickEvent = true;
                 rootProjectNode.ToolTip = item.ProjectName;
                 rootProjectNode.CommandName = "施工号";
                 rootNode.Nodes.Add(rootProjectNode);
 
-                TreeNode tn = new TreeNode();
-                tn.NodeID = "temp";
-                tn.Text = "正在加载...";
+                //TreeNode tn = new TreeNode();
+                //tn.NodeID = "temp";
+                //tn.Text = "正在加载...";
 
-                rootProjectNode.Nodes.Add(tn);
+                //rootProjectNode.Nodes.Add(tn);
             }
         }
 
@@ -80,38 +81,38 @@ namespace FineUIPro.Web.HJGL.CheckManage
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e)
-        {
-            if (e.Node.Nodes != null)
-            {
-                e.Node.Nodes.Clear();
-            }
-            List<Model.Project_Installation> list = (from x in Funs.DB.Project_Installation where x.ProjectId == e.NodeID select x).ToList();
+        //protected void tvControlItem_NodeExpand(object sender, TreeNodeEventArgs e)
+        //{
+        //    if (e.Node.Nodes != null)
+        //    {
+        //        e.Node.Nodes.Clear();
+        //    }
+        //    List<Model.Project_Installation> list = (from x in Funs.DB.Project_Installation where x.ProjectId == e.NodeID select x).ToList();
 
-            this.BindNodes(e.Node, list);
-        }
+        //    this.BindNodes(e.Node, list);
+        //}
 
         /// <summary>
         ///  绑定树节点
         /// </summary>
         /// <param name="node"></param>
-        private void BindNodes(TreeNode node, List<Model.Project_Installation> treeLists)
-        {
-            if (node.CommandName == "施工号")
-            {
-                var lists = (from x in treeLists orderby x.InstallationCode descending select x).Distinct();
-                foreach (var item in lists)
-                {
-                    TreeNode newNode = new TreeNode();
-                    newNode.Text = item.InstallationCode;
-                    newNode.NodeID = item.InstallationId;
-                    newNode.ToolTip = item.InstallationName;
-                    newNode.CommandName = "装置";
-                    newNode.EnableClickEvent = true;
-                    node.Nodes.Add(newNode);
-                }
-            }
-        }
+        //private void BindNodes(TreeNode node, List<Model.Project_Installation> treeLists)
+        //{
+        //    if (node.CommandName == "施工号")
+        //    {
+        //        var lists = (from x in treeLists orderby x.InstallationCode descending select x).Distinct();
+        //        foreach (var item in lists)
+        //        {
+        //            TreeNode newNode = new TreeNode();
+        //            newNode.Text = item.InstallationCode;
+        //            newNode.NodeID = item.InstallationId;
+        //            newNode.ToolTip = item.InstallationName;
+        //            newNode.CommandName = "装置";
+        //            newNode.EnableClickEvent = true;
+        //            node.Nodes.Add(newNode);
+        //        }
+        //    }
+        //}
         #endregion
 
         #region 点击TreeView
@@ -133,43 +134,43 @@ namespace FineUIPro.Web.HJGL.CheckManage
         /// </summary>
         private void BindGrid()
         {
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && this.tvControlItem.SelectedNodeID != "0")
             {
                 string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";//AND InstallationId = @InstallationId";
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
-                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
+                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.NodeID));
                 //listStr.Add(new SqlParameter("@InstallationId", this.tvControlItem.SelectedNodeID));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
+                //DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
                 // 2.获取当前分页数据
                 //var table = this.GetPagedDataTable(Grid1, tb1);
-                Grid1.RecordCount = rows.Count();
+                Grid1.RecordCount = tb.Rows.Count;
                 //tb = GetFilteredTable(Grid1.FilteredData, tb);
-                //var table = this.GetPagedDataTable(Grid1, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
 
-                Grid1.DataSource = rows;
+                Grid1.DataSource = table;
                 Grid1.DataBind();
             }
         }
 
         private void BindPage()
         {
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
-            {
-                var ins = BLL.Project_InstallationService.GetInstallationByInstallationId(this.tvControlItem.SelectedNodeID);
-                if (ins != null)
-                {
-                    this.txtWorkAreaCode.Text = ins.InstallationCode;
-                }
+            //if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            //{
+            //    var ins = BLL.Project_InstallationService.GetInstallationByInstallationId(this.tvControlItem.SelectedNodeID);
+            //    if (ins != null)
+            //    {
+            //        this.txtWorkAreaCode.Text = ins.InstallationCode;
+            //    }
                 this.txtTestingStandard.Text = "NB/T47013-2015";
-            }
-            else
-            {
-                this.txtWorkAreaCode.Text = string.Empty;
-            }
+            //}
+            //else
+            //{
+            //    this.txtWorkAreaCode.Text = string.Empty;
+            //}
         }
         #endregion
 
@@ -440,16 +441,16 @@ namespace FineUIPro.Web.HJGL.CheckManage
             string rootPath = Server.MapPath("~/");
             BLL.Common.FastReportService.ResetData();
 
-            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && this.tvControlItem.SelectedNode.NodeID!="0")
             {
                 string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
 
-                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
+                listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.NodeID));
 
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-                DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
+                //DataRow[] rows = tb.Select("InstallationId='" + this.tvControlItem.SelectedNodeID + "'");
 
                 DataTable dt = new DataTable();
                 dt.TableName = "Data";
@@ -469,10 +470,10 @@ namespace FineUIPro.Web.HJGL.CheckManage
                 dt.Columns.Add("Mt3Num");
                 dt.Columns.Add("Pt3Num");
 
-                //DataView dv = tb.DefaultView;//获取表视图
-                //dv.Sort = "ISO_IsoNo ASC";//按照ID倒序排序
-                //tb = dv.ToTable();//转为表
-                //DataRow[] rows = tb.DefaultView.ToTable().Select();
+                DataView dv = tb.DefaultView;//获取表视图
+                dv.Sort = "IsoNo ASC";//按照ID倒序排序
+                tb = dv.ToTable();//转为表
+                DataRow[] rows = tb.DefaultView.ToTable().Select();
                 foreach (var row in rows)
                 {
                     var newRows = dt.NewRow();
@@ -498,7 +499,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
 
                 //传参
                 Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
-                keyValuePairs.Add("projectName", BLL.Base_ProjectService.GetProjectByProjectId(this.tvControlItem.SelectedNode.ParentNode.NodeID).ProjectName);
+                keyValuePairs.Add("projectName", BLL.Base_ProjectService.GetProjectByProjectId(this.tvControlItem.SelectedNode.NodeID).ProjectName);
                 keyValuePairs.Add("workAreaCode", txtWorkAreaCode.Text.Trim());
                 keyValuePairs.Add("testCategoryNumber", txtTestCategoryNumber.Text.Trim());
                 keyValuePairs.Add("acceptanceCriteria", txtAcceptanceCriteria.Text.Trim());

HJGL_DS/FineUIPro.Web/HJGL/DataIn/DrawingRecognitionContent.aspx

@@ -172,12 +172,12 @@
                                                         <f:RenderField Width="100px" HeaderText="图号" ColumnID="drawing_number" DataField="drawing_number"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
-                                                         <f:RenderField Width="70px" HeaderText="涂漆编码" ColumnID="coating_code" DataField="coating_code"
+                                                         <%--<f:RenderField Width="70px" HeaderText="涂漆编码" ColumnID="coating_code" DataField="coating_code"
                                                              FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                          </f:RenderField>
                                                          <f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
-                                                        </f:RenderField>
+                                                        </f:RenderField>--%>
                                                          <f:TemplateField ColumnID="Category2" Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
                                                               <ItemTemplate>
                                                                   <asp:Label ID="lblCategory2" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>
@@ -229,12 +229,12 @@
                                                         <f:RenderField Width="100px" HeaderText="管线号" ColumnID="pipe_no" DataField="pipe_no"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                         </f:RenderField>
-                                                         <f:RenderField Width="70px" HeaderText="涂漆编码" ColumnID="coating_code" DataField="coating_code"
+                                                         <%--<f:RenderField Width="70px" HeaderText="涂漆编码" ColumnID="coating_code" DataField="coating_code"
                                                              FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
                                                          </f:RenderField>
                                                          <f:RenderField Width="70px" HeaderText="材料代号" ColumnID="code" DataField="code"
                                                             FieldType="String" HeaderTextAlign="Center" TextAlign="Center">
-                                                        </f:RenderField>
+                                                        </f:RenderField>--%>
                                                         <f:TemplateField ColumnID="Category3" Width="70px" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
                                                               <ItemTemplate>
                                                                   <asp:Label ID="lblCategory3" runat="server" Text='<%# ConvertCategory(Eval("category")) %>'></asp:Label>

HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx

@@ -36,7 +36,7 @@
                                 <f:FileUpload ID="FileExcel" runat="server" Label="数据文件" EmptyText="请上传EXCEl格式文件" Width="400px" LabelWidth="70px"></f:FileUpload>
                                 <f:Button ID="btnAudit" runat="server" Text="审核" ToolTip="文件审核！" OnClick="btnAudit_Click"></f:Button>
                                 <f:Button ID="imgbtnImport" runat="server" Text="上传" ToolTip="文件上传！" OnClick="imgbtnImport_Click"></f:Button>
-                                <f:CheckBox ID="cbUpdateIn" runat="server" Text="更新导入"></f:CheckBox>
+                                <f:CheckBox ID="cbUpdateIn" runat="server" Text="更新导入" Hidden="true"></f:CheckBox>
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
                                 <f:Button ID="imgbtnUpload" runat="server" Icon="DiskDownload" Text="模板下载" OnClick="imgbtnUpload_Click" EnableAjaxLoading="false"></f:Button>
                                 <f:HiddenField ID="hdFileName" runat="server">

HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs

@@ -16,6 +16,11 @@ namespace FineUIPro.Web.HJGL.DataIn
 {
     public partial class JointIn : PageBase
     {
+        /// <summary>
+        /// 图纸标注生成的焊口临时数据类型。
+        /// </summary>
+        private const string DrawingJointTempType = "0";
+
         /// <summary>
         /// 导入的焊口Id
         /// </summary>
@@ -823,7 +828,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                     {
                         newJointInfo.ProjectId = getProject.ProjectId;
                         newJointInfo.ISO_ID = getPWisInfo.ISO_ID;
-                        newJointInfo.JOT_JointDesc = "Φ" + col10 + "×" + col11;
+                        newJointInfo.JOT_JointDesc = "Φ" + newJointInfo.JOT_Dia.Value.ToString("0.##") + "×" + Funs.GetNewDecimalOrZero(col11).ToString("0.##");
                         newJointInfo.STE_ID = getSteel1.STE_ID;
                         if (getSteel2 != null)
                         {
@@ -915,6 +920,11 @@ namespace FineUIPro.Web.HJGL.DataIn
                             }
                             newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
                             BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
+                            SyncCoordinatesFromTempAndDelete(
+                                newJointInfo.JOT_ID,
+                                getProject.ProjectId,
+                                getPWisInfo.ISO_IsoNo,
+                                col2);
                             // 更新排序字段
                             string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET 
                                            Sort1=(case when PATINDEX('[A-Z]%',JOT_JointNo)>0   THEN 'B'
@@ -962,6 +972,11 @@ namespace FineUIPro.Web.HJGL.DataIn
                                 }
                                 newJointInfo.JOT_ID = getJoint.JOT_ID;
                                 BLL.HJGL_PW_JointInfoService.UpdateJointInfo(newJointInfo);
+                                SyncCoordinatesFromTempAndDelete(
+                                    newJointInfo.JOT_ID,
+                                    getProject.ProjectId,
+                                    getPWisInfo.ISO_IsoNo,
+                                    col2);
 
                                 // 更新排序字段
                                 string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET 
@@ -1018,6 +1033,57 @@ namespace FineUIPro.Web.HJGL.DataIn
                 return;
             }
         }
+
+        /// <summary>
+        /// 将图纸标注临时数据中的坐标同步到焊口，并删除已消费的临时记录。
+        /// </summary>
+        private void SyncCoordinatesFromTempAndDelete(
+            string jointId,
+            string projectId,
+            string isoNo,
+            string jointNo)
+        {
+            if (string.IsNullOrWhiteSpace(jointId)
+                || string.IsNullOrWhiteSpace(projectId)
+                || string.IsNullOrWhiteSpace(isoNo)
+                || string.IsNullOrWhiteSpace(jointNo))
+            {
+                return;
+            }
+
+            Model.SGGLDB db = Funs.DB;
+            List<Model.HJGL_Sys_DataInTemp> tempJointList = db.HJGL_Sys_DataInTemp
+                .Where(x => x.ProjectId == projectId
+                    && x.UserId == this.CurrUser.UserId
+                    && x.Type == DrawingJointTempType
+                    && x.Value3 == isoNo
+                    && x.Value4 == jointNo)
+                .ToList();
+            if (tempJointList.Count == 0)
+            {
+                return;
+            }
+
+            Model.HJGL_PW_JointInfo jointInfo = db.HJGL_PW_JointInfo
+                .FirstOrDefault(x => x.JOT_ID == jointId);
+            if (jointInfo == null)
+            {
+                return;
+            }
+
+            Model.HJGL_Sys_DataInTemp coordinateSource = tempJointList
+                .OrderByDescending(x => x.Time)
+                .ThenByDescending(x => x.RowNo)
+                .First();
+            jointInfo.X = coordinateSource.Value46;
+            jointInfo.Y = coordinateSource.Value47;
+            jointInfo.X2 = coordinateSource.Value48;
+            jointInfo.Y2 = coordinateSource.Value49;
+
+            db.HJGL_Sys_DataInTemp.DeleteAllOnSubmit(tempJointList);
+            db.SubmitChanges();
+        }
+
         #endregion
         protected void imgbtnUpload_Click(object sender, EventArgs e)
         {
@@ -1077,4 +1143,4 @@ namespace FineUIPro.Web.HJGL.DataIn
         }
         #endregion   
     }
-}
+}

HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx

@@ -79,9 +79,9 @@
                                                     <f:RenderField HeaderText="单线图号" ColumnID="ISO_IsoNo" DataField="ISO_IsoNo" SortField="ISO_IsoNo"
                                                          FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px" Locked="true">
                                                      </f:RenderField>
-                                                     <f:RenderField HeaderText="管道等级" ColumnID="IDName" DataField="IDName" SortField="IDName"
+                                                     <%--<f:RenderField HeaderText="管道等级" ColumnID="IDName" DataField="IDName" SortField="IDName"
                                                          FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px" Locked="true">
-                                                     </f:RenderField>
+                                                     </f:RenderField>--%>
                                                      <f:TemplateField Width="90px" HeaderText="管道等级" HeaderTextAlign="Center" TextAlign="Center">
                                                         <ItemTemplate>
                                                             <asp:Label ID="Label1" runat="server" Text='<%# ConvertIsoClass(Eval("ISC_ID")) %>'></asp:Label>

HJGL_DS/FineUIPro.Web/HJGL/DataIn/PipelineGrid.aspx.cs

@@ -116,146 +116,84 @@ namespace FineUIPro.Web.HJGL.DataIn
         /// <param name="e"></param>
         protected void InitGrid()
         {
-
-            // 加载PDF文档
-            PdfDocument pdf = new PdfDocument();
             if (!File.Exists(fileUrl))
             {
                 return;
             }
-            pdf.LoadFromFile(fileUrl);
-            PdfTableExtractor extractor = new PdfTableExtractor(pdf);
-            // 遍历每一页
-            int i = 0;
-            if (ckbSkipFirst == "1")
+
+            int startPageIndex = ckbSkipFirst == "1" ? 1 : 0;
+            DataTable dtTemp = ExtractAllPdfTables(fileUrl, startPageIndex);
+            if (dtTemp.Rows.Count == 0 || dtTemp.Columns.Count <= 1)
             {
-                i = 1;
+                BindIsoGrid();
+                return;
             }
-            var units = from x in Funs.DB.Base_Unit
-                        join y in Funs.DB.Project_Unit on x.UnitId equals y.UnitId
-                        where y.ProjectId == CurrUser.LoginProjectId
-                        select x;
-            var installs = from x in Funs.DB.Project_Installation where x.ProjectId == this.CurrUser.LoginProjectId select x;
+
+            ProcessMergedTable(dtTemp);
+            BindIsoGrid();
+        }
+
+        /// <summary>
+        /// 统一清洗、映射并转换全部PDF页面的数据。
+        /// </summary>
+        private void ProcessMergedTable(DataTable dtTemp)
+        {
             var steels = from x in Funs.DB.HJGL_BS_Steel select x;
             var materialStandards = from x in Funs.DB.HJGL_BS_MaterialStandard select x;
-
-            var rates = from x in Funs.DB.HJGL_BS_NDTRate select x;
-            var types = from x in Funs.DB.HJGL_BS_JointType select x;
-            var methods = from x in Funs.DB.HJGL_BS_WeldMethod select x;
-            var materials = from x in Funs.DB.HJGL_BS_WeldMaterial select x;
             var services = from x in Funs.DB.HJGL_BS_Service select x;
-            var slopeTypes = from x in Funs.DB.HJGL_BS_SlopeType select x;
             var isoClasss = from x in Funs.DB.HJGL_BS_IsoClass select x;
-            var components = from x in Funs.DB.HJGL_BS_Component select x;
-            var dns = from x in Funs.DB.HJGL_BS_SchTab select x;
             var execStandards = from x in Funs.DB.HJGL_BS_ExecStandard select x;
-            var dataInTemp = from x in Funs.DB.HJGL_Sys_DataInTemp
-                             where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == this.IsPDMS
-                             select x;
-            var users = from x in Funs.DB.Sys_User select x;
-            for (; i < pdf.Pages.Count; i++)
+            string serviceNames = string.Empty;
+
+            // 所有页面的表格已经合并，只调用一次大模型清洗和表头映射。
+            string csvContent = ConvertDataTableToCsv(dtTemp);
+            Console.WriteLine("生成的CSV内容：");
+            Console.WriteLine(csvContent);
+
+            // 3. 上传到服务器
+            string uploadUrl = "http://localhost:8000/api/table/clean"; // 替换为实际上传地址
+            string fileName = $"data_{DateTime.Now:yyyyMMddHHmmss}.csv";
+            //"管线号", "公称直径", "管道等级", "管道材料", "主要介质", "起止点", "操作参数温度", "操作参数压力", "设计参数温度", "设计参数压力", "隔热工程代号", "隔热材料", "厚度", "介质", "压力", "比例", "方法", "合格等级", "PID尾号", "压力管道类别", "应力分析题号", "备注"
+            Region2.Items.Add(CreateTableGrid(dtTemp));
+            set.Tables.Add(dtTemp);
+            string response = UploadCsvFile(csvContent, uploadUrl, fileName);
+            JObject dynamicObj = JObject.Parse(response);
+
+            DataTable dtAfterProcess = new DataTable();
+            foreach (JToken employeeToken in dynamicObj["headers"])
             {
-                PdfPageBase page = pdf.Pages[i];
-                // 提取页面中的表格
-                PdfTable[] tables = extractor.ExtractTable(i);
-                // 输出找到的表格数量
-                Console.WriteLine($"第 {i + 1} 页找到 {tables.Length} 个表格");
-                // 遍历提取到的表格
-                for (int j = 0; j < tables.Length; j++)
+                dtAfterProcess.Columns.Add(employeeToken.ToString());
+            }
+            dtAfterProcess.Columns.Add("Id");
+
+            foreach (JToken rowData in dynamicObj["rows"])
+            {
+                // int index = 0;
+                var row = dtAfterProcess.NewRow();
+                var datas = rowData.ToList();
+                row["Id"] = Guid.NewGuid().ToString();
+
+                foreach (DataRow row1 in dtTemp.Rows)
                 {
-                    PdfTable table = tables[j];
-                    DataTable dtTemp = new DataTable();
-                    for (int col = 0; col < table.GetColumnCount(); col++)
+                    if (datas[0].ToString() == row1[0].ToString())
                     {
-                        dtTemp.Columns.Add("col" + col);
-                    }
-                    // 遍历表格的行列
-                    for (int row = 0; row < table.GetRowCount(); row++)
-                    {
-                        DataRow rowData = dtTemp.NewRow();
-                        dtTemp.Rows.Add(rowData);
-                        for (int col = 0; col < table.GetColumnCount(); col++)
+                        for (int index = 0; index < dtTemp.Columns.Count; index++)
                         {
-                            string text = table.GetText(row, col);
-                            rowData[col] = table.GetText(row, col);
-                            Console.Write($"{text}\t");
+                            row[index] = row1[index];
                         }
-                        Console.WriteLine(); // 换行
                     }
+                }
+                //foreach (var d in datas)
+                //{
+                //    row[index] = d.ToString(); index++;
+                //}
+                dtAfterProcess.Rows.Add(row);
+            }
+            Region1.Items.Add(CreateTableGrid(dtAfterProcess));
+            setAfterProcess.Tables.Add(dtAfterProcess);
 
-                    if (dtTemp.Rows.Count > 0 && dtTemp.Columns.Count > 1)
-                    {// 2. 转换为CSV
-                        string csvContent = ConvertDataTableToCsv(dtTemp);
-                        Console.WriteLine("生成的CSV内容：");
-                        Console.WriteLine(csvContent);
-
-                        // 3. 上传到服务器
-                        string uploadUrl = "http://localhost:8000/api/table/clean"; // 替换为实际上传地址
-                        string fileName = $"data_{DateTime.Now:yyyyMMddHHmmss}.csv";
-                        //"管线号", "公称直径", "管道等级", "管道材料", "主要介质", "起止点", "操作参数温度", "操作参数压力", "设计参数温度", "设计参数压力", "隔热工程代号", "隔热材料", "厚度", "介质", "压力", "比例", "方法", "合格等级", "PID尾号", "压力管道类别", "应力分析题号", "备注"
-
-
-                        try
-                        {
-                            Grid grid = new Grid();
-                            grid.ShowGridHeader = true;
-                            grid.Title = dtTemp.TableName;
-                            grid.AllowColumnLocking = true;
-                            grid.DataKeyNames = new string[] { "Id" };
-                            foreach (DataColumn dc in dtTemp.Columns)
-                            {
-                                grid.Columns.Add(new BoundField() { DataField = dc.ColumnName, HeaderText = dc.ColumnName });
-                            }
-                            grid.DataSource = dtTemp;
-                            grid.DataBind();
-                            Region2.Items.Add(grid);
-                            set.Tables.Add(dtTemp);
-                            string response = UploadCsvFile(csvContent, uploadUrl, fileName);
-                            Grid grid1 = new Grid();
-                            grid1.ShowGridHeader = true;
-                            grid1.Title = dtTemp.TableName;
-                            grid1.AllowColumnLocking = true;
-                            grid1.DataKeyNames = new string[] { "Id" };
-                            JObject dynamicObj = JObject.Parse(response);
-
-                            DataTable dtAfterProcess = new DataTable();
-                            foreach (JToken employeeToken in dynamicObj["headers"])
-                            {
-                                dtAfterProcess.Columns.Add(employeeToken.ToString());
-                                grid1.Columns.Add(new BoundField() { DataField = employeeToken.ToString(), HeaderText = employeeToken.ToString() });
-                            }
-                            dtAfterProcess.Columns.Add("Id");
-
-                            foreach (JToken rowData in dynamicObj["rows"])
-                            {
-                                // int index = 0;
-                                var row = dtAfterProcess.NewRow();
-                                var datas = rowData.ToList();
-                                row["Id"] = Guid.NewGuid().ToString();
-
-                                foreach (DataRow row1 in dtTemp.Rows)
-                                {
-                                    if (datas[0].ToString() == row1[0].ToString())
-                                    {
-                                        for (int index = 0; index < dtTemp.Columns.Count; index++)
-                                        {
-                                            row[index] = row1[index];
-                                        }
-                                    }
-                                }
-                                //foreach (var d in datas)
-                                //{
-                                //    row[index] = d.ToString(); index++;
-                                //}
-                                dtAfterProcess.Rows.Add(row);
-                            }
-                            grid1.DataSource = dtAfterProcess;
-                            grid1.DataBind();
-                            Region1.Items.Add(grid1);
-                            setAfterProcess.Tables.Add(dtAfterProcess);
-
-                            string urlHeaderCorrespondence = "http://localhost:8000/api/table/head";
-                            string data = @"{
+            string urlHeaderCorrespondence = "http://localhost:8000/api/table/head";
+            string data = @"{
                                               ""source_headers"":   " + dynamicObj["headers"].ToString() + @" ,
                                               ""target_fields"": [
                                                 ""管线号"",
@@ -272,6 +210,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                                                 ""泄露性试验"",
                                                 ""设计压力"",
                                                 ""设计温度"",
+                                                ""压力试验压力"",
                                                 ""耐压试验"",
                                                  ""外径"",
                                                  ""壁厚"",
@@ -283,184 +222,288 @@ namespace FineUIPro.Web.HJGL.DataIn
                                               ""extra_instructions"": ""管线号优先匹配管线代号，优先将含有 Main Fluid 的字段映射到 介质,优先匹配隔热工程代号到绝热类别，压力管道类别映射管道类别，有名称首先匹配名称，没有名称匹配代号，按匹配度从高低输出""
                                             }
                                             ";
-                            string resHeaderCorrespondence = HeaderCorrespondence(urlHeaderCorrespondence, data, "POST", "application/json;charset=utf-8");
+            string resHeaderCorrespondence = HeaderCorrespondence(urlHeaderCorrespondence, data, "POST", "application/json;charset=utf-8");
 
-                            if (!string.IsNullOrEmpty(resHeaderCorrespondence))
+            if (!string.IsNullOrEmpty(resHeaderCorrespondence))
+            {
+                JObject dynamicHeaderCorrespondence = JObject.Parse(resHeaderCorrespondence);
+                Dictionary<string, string> headerCorrespondenceDic = new Dictionary<string, string>();
+                foreach (JToken employeeToken in dynamicHeaderCorrespondence["mapping"])
+                {
+                    headerCorrespondenceDic.Add(employeeToken["source_header"].ToString(), employeeToken["target_field"].ToString());
+                }
+                foreach (DataRow row in dtAfterProcess.Rows)
+                {
+                    HJGL_PW_IsoInfo isoInfo = new HJGL_PW_IsoInfo();
+                    isoInfo.ISO_ID = Guid.NewGuid().ToString();
+                    isoInfo.ISO_CreateDate = DateTime.Now;
+                    isoInfo.ISO_Creator = CurrUser.UserCode;
+                    isoInfo.ProjectId = CurrUser.LoginProjectId;
+                    isoInfo.BSU_ID = CurrUser.UnitId;
+                    isoInfo.IsHot = "0";
+                    foreach (DataColumn dataColumn in dtAfterProcess.Columns)
+                    {
+
+                        if (headerCorrespondenceDic.ContainsKey(dataColumn.ColumnName))
+                            switch (headerCorrespondenceDic[dataColumn.ColumnName])
                             {
-                                JObject dynamicHeaderCorrespondence = JObject.Parse(resHeaderCorrespondence);
-                                Dictionary<string, string> headerCorrespondenceDic = new Dictionary<string, string>();
-                                foreach (JToken employeeToken in dynamicHeaderCorrespondence["mapping"])
-                                {
-                                    headerCorrespondenceDic.Add(employeeToken["source_header"].ToString(), employeeToken["target_field"].ToString());
-                                }
-                                foreach (DataRow row in dtAfterProcess.Rows)
-                                {
-                                    HJGL_PW_IsoInfo isoInfo = new HJGL_PW_IsoInfo();
-                                    isoInfo.ISO_ID = Guid.NewGuid().ToString();
-                                    isoInfo.ISO_CreateDate = DateTime.Now;
-                                    isoInfo.ISO_Creator = CurrUser.UserCode;
-                                    isoInfo.ProjectId = CurrUser.LoginProjectId;
-                                    isoInfo.BSU_ID = CurrUser.UnitId;
-                                    isoInfo.IsHot = "0";
-                                    foreach (DataColumn dataColumn in dtAfterProcess.Columns)
+                                case "管线号":
+                                    isoInfo.ISO_IsoNo = row[dataColumn.ColumnName].ToString();
+                                    break;
+                                case "管道等级":
+                                    isoInfo.ISC_ID = isoClasss.Where(x => x.ISC_IsoName == row[dataColumn.ColumnName].ToString() || x.ISC_IsoCode == row[dataColumn.ColumnName].ToString()).Select(x => x.ISC_ID).FirstOrDefault();
+                                    break;
+                                case "执行标准":
+                                    if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
                                     {
+                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "SH/T3501-2021").Select(x => x.ExecStandardId).FirstOrDefault();
+                                    }
+                                    else
+                                    {
+                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "GB 50517-2010").Select(x => x.ExecStandardId).FirstOrDefault();
+                                    }
+                                    break;
+                                case "材质":
 
-                                        if (headerCorrespondenceDic.ContainsKey(dataColumn.ColumnName))
-                                            switch (headerCorrespondenceDic[dataColumn.ColumnName])
-                                            {
-                                                case "管线号":
-                                                    isoInfo.ISO_IsoNo = row[dataColumn.ColumnName].ToString();
-                                                    break;
-                                                case "管道等级":
-                                                    isoInfo.ISC_ID = isoClasss.Where(x => x.ISC_IsoName == row[dataColumn.ColumnName].ToString() || x.ISC_IsoCode == row[dataColumn.ColumnName].ToString()).Select(x => x.ISC_ID).FirstOrDefault();
-                                                    break;
-                                                case "执行标准":
-                                                    if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
-                                                    {
-                                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "SH/T3501-2021").Select(x => x.ExecStandardId).FirstOrDefault();
-                                                    }
-                                                    else
-                                                    {
-                                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "GB 50517-2010").Select(x => x.ExecStandardId).FirstOrDefault();
-                                                    }
-                                                    break;
-                                                case "材质":
-
-                                                    var steel = steels.FirstOrDefault(x => x.STE_Code == row[dataColumn.ColumnName].ToString());
-                                                    if (steel != null)
-                                                    {
-                                                        isoInfo.STE_ID = steel.STE_ID;
-                                                        if (steel.STE_SteelType == "FeⅣ")
-                                                        {
-                                                            isoInfo.IsHotType = "1";
-
-                                                        }
-                                                        else if (steel.STE_SteelType == "FeⅠ" || steel.STE_SteelType == "FeⅡ" || steel.STE_SteelType == "FeⅢ")
-                                                        {
-                                                            isoInfo.IsHotType = "2";
-
-                                                        }
-                                                    }
-                                                    break;
-                                                case "材质标准":
-                                                    isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString() || x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();
-                                                    break;
-                                                case "介质":
-                                                    var SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
-                                                    if (!string.IsNullOrEmpty(SER_ID))
-                                                    {
-                                                        isoInfo.SER_ID = SER_ID;
-                                                    }
-                                                    break;
-                                                case "管道类别":
-                                                    isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString();
-                                                    if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
-                                                    {
-                                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "SH/T3501-2021").Select(x => x.ExecStandardId).FirstOrDefault();
-                                                    }
-                                                    else
-                                                    {
-                                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "GB 50517-2010").Select(x => x.ExecStandardId).FirstOrDefault();
-                                                    }
-                                                    break;
-                                                case "涂漆类别":
-                                                    isoInfo.ISO_Paint = row[dataColumn.ColumnName].ToString();
-                                                    break;
-                                                case "绝热类别":
-                                                    if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
-                                                    {
-                                                        isoInfo.ISO_Insulator = row[dataColumn.ColumnName].ToString();
-                                                    }
-                                                    else
-                                                    {
-                                                        isoInfo.ISO_Insulator = "/";
-
-                                                    }
-                                                    break;
-                                                case "操作压力":
-                                                    isoInfo.OperatingPressure = row[dataColumn.ColumnName].ToString();
-                                                    break;
-                                                case "操作温度":
-                                                    isoInfo.OperatingTemperature = row[dataColumn.ColumnName].ToString();
-                                                    break;
-                                                case "泄露性试验":
-                                                    if (isoInfo.ISO_DesignPress.HasValue)
-                                                    {
-                                                        isoInfo.LeakageTest = isoInfo.ISO_DesignPress.Value.ToString("##.##");// row[dataColumn.ColumnName].ToString();
-                                                    }
-                                                    break;
-                                                case "设计压力":
-                                                    isoInfo.ISO_DesignPress = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
-                                                    isoInfo.LeakageTest = row[dataColumn.ColumnName].ToString();
-                                                    break;
-                                                case "设计温度":
-                                                    isoInfo.ISO_DesignTemperature = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
-                                                    break;
-                                                case "耐压试验":
-                                                    if (isoInfo.ISO_DesignPress.HasValue)
-                                                    {
-                                                        isoInfo.ISO_TestPress = isoInfo.ISO_DesignPress.Value * 1.5m;
-                                                    }
-                                                    break;
-                                                case "外径":
-                                                    isoInfo.ISO_Dia = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
-                                                    break;
-                                                case "壁厚":
-                                                    isoInfo.ISO_Sch = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
-                                                    break;
-                                                case "管线长度":
-                                                    isoInfo.PipeLineLength = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
-                                                    break;
-                                                case "检测类别序号":
-                                                    isoInfo.TestCategoryNum = "/";
-                                                    break;
-                                                case "热处理类型":
-                                                    {
-                                                        if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
-                                                        {
-                                                            //isoInfo.IsHotType = row[dataColumn.ColumnName].ToString();
-                                                            isoInfo.IsHot = "1";
-                                                        }
-                                                    }
-                                                    break;
-                                                case "备注":
-                                                    isoInfo.ISO_Remark = row[dataColumn.ColumnName].ToString();
-                                                    break;
-                                            }
-
-                                        if (row[dataColumn.ColumnName].ToString().Contains("漆"))
+                                    var steel = steels.FirstOrDefault(x => x.STE_Code == row[dataColumn.ColumnName].ToString());
+                                    if (steel != null)
+                                    {
+                                        isoInfo.STE_ID = steel.STE_ID;
+                                        if (steel.STE_SteelType == "FeⅣ")
                                         {
-                                            isoInfo.ISO_Paint = row[dataColumn.ColumnName].ToString();
+                                            isoInfo.IsHotType = "1";
+
                                         }
-                                        if (row[dataColumn.ColumnName].ToString().Contains("SH"))
+                                        else if (steel.STE_SteelType == "FeⅠ" || steel.STE_SteelType == "FeⅡ" || steel.STE_SteelType == "FeⅢ")
                                         {
-                                            isoInfo.ISC_ID = isoClasss.Where(x => x.ISC_IsoName == row[dataColumn.ColumnName].ToString() || x.ISC_IsoCode == row[dataColumn.ColumnName].ToString()).Select(x => x.ISC_ID).FirstOrDefault();
+                                            isoInfo.IsHotType = "2";
+
                                         }
-                                        if (row[dataColumn.ColumnName].ToString().Contains("焊后热处理"))
+                                    }
+                                    break;
+                                case "材质标准":
+                                    isoInfo.MaterialStandardId = materialStandards.Where(x => x.MaterialStandardName == row[dataColumn.ColumnName].ToString() || x.MaterialStandardCode == row[dataColumn.ColumnName].ToString()).Select(x => x.MaterialStandardId).FirstOrDefault();
+                                    break;
+                                case "介质":
+                                    var SER_ID = services.Where(x => x.SER_Name == row[dataColumn.ColumnName].ToString() || x.SER_Code == row[dataColumn.ColumnName].ToString()).Select(x => x.SER_ID).FirstOrDefault();
+                                    if (!string.IsNullOrEmpty(SER_ID))
+                                    {
+                                        isoInfo.SER_ID = SER_ID;
+                                    }
+                                    else
+                                    {
+                                        if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()) && !serviceNames.Contains(row[dataColumn.ColumnName].ToString()))
+                                        {
+                                            Model.HJGL_BS_Service newBSService = new HJGL_BS_Service();
+                                            newBSService.SER_ID = SQLHelper.GetNewID();
+                                            newBSService.SER_Code = row[dataColumn.ColumnName].ToString();
+                                            newBSService.SER_Name = row[dataColumn.ColumnName].ToString();
+                                            Funs.DB.HJGL_BS_Service.InsertOnSubmit(newBSService);
+                                            Funs.DB.SubmitChanges();
+                                            serviceNames += row[dataColumn.ColumnName].ToString();
+                                            isoInfo.SER_ID = newBSService.SER_ID;
+                                        }
+                                    }
+                                    break;
+                                case "管道类别":
+                                    isoInfo.PipeLineClass = row[dataColumn.ColumnName].ToString();
+                                    if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
+                                    {
+                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "SH/T3501-2021").Select(x => x.ExecStandardId).FirstOrDefault();
+                                    }
+                                    else
+                                    {
+                                        isoInfo.ISO_Executive = execStandards.Where(x => x.ExecStandardName == "GB 50517-2010").Select(x => x.ExecStandardId).FirstOrDefault();
+                                    }
+                                    break;
+                                case "涂漆类别":
+                                    isoInfo.ISO_Paint = row[dataColumn.ColumnName].ToString();
+                                    break;
+                                case "绝热类别":
+                                    if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
+                                    {
+                                        isoInfo.ISO_Insulator = row[dataColumn.ColumnName].ToString();
+                                    }
+                                    else
+                                    {
+                                        isoInfo.ISO_Insulator = "/";
+
+                                    }
+                                    break;
+                                case "操作压力":
+                                    if(string.IsNullOrEmpty(isoInfo.OperatingPressure)) isoInfo.OperatingPressure = row[dataColumn.ColumnName].ToString();
+                                    break;
+                                case "操作温度":
+                                    if (string.IsNullOrEmpty(isoInfo.OperatingTemperature))  isoInfo.OperatingTemperature = row[dataColumn.ColumnName].ToString();
+                                    break;
+                                case "泄露性试验":
+                                    if (isoInfo.ISO_DesignPress.HasValue)
+                                    {
+                                        isoInfo.LeakageTest = isoInfo.ISO_DesignPress.Value.ToString("0.00") ?? "";// row[dataColumn.ColumnName].ToString();
+                                    }
+                                    break;
+                                case "设计压力":
+                                    isoInfo.ISO_DesignPress = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
+                                    isoInfo.LeakageTest = row[dataColumn.ColumnName].ToString();
+                                    break;
+                                case "设计温度":
+                                    isoInfo.ISO_DesignTemperature = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
+                                    break;
+                                case "压力试验压力":
+                                    if (isoInfo.ISO_DesignPress.HasValue)
+                                    {
+                                        isoInfo.ISO_TestPress = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
+                                    }
+                                    break;
+                                case "外径":
+                                    isoInfo.ISO_Dia = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
+                                    break;
+                                case "壁厚":
+                                    isoInfo.ISO_Sch = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
+                                    break;
+                                case "管线长度":
+                                    isoInfo.PipeLineLength = Funs.GetNewDecimal(row[dataColumn.ColumnName].ToString());
+                                    break;
+                                case "检测类别序号":
+                                    isoInfo.TestCategoryNum = "/";
+                                    break;
+                                case "热处理类型":
+                                    {
+                                        if (!string.IsNullOrEmpty(row[dataColumn.ColumnName].ToString()))
                                         {
                                             //isoInfo.IsHotType = row[dataColumn.ColumnName].ToString();
                                             isoInfo.IsHot = "1";
                                         }
                                     }
-                                    isoList.Add(isoInfo);
-                                }
+                                    break;
+                                case "备注":
+                                    isoInfo.ISO_Remark = row[dataColumn.ColumnName].ToString();
+                                    break;
                             }
 
-                        }
-                        catch (Exception e11)
+                        if (row[dataColumn.ColumnName].ToString().Contains("漆"))
                         {
-
+                            isoInfo.ISO_Paint = row[dataColumn.ColumnName].ToString();
+                        }
+                        if (row[dataColumn.ColumnName].ToString().Contains("SH"))
+                        {
+                            var parts = row[dataColumn.ColumnName].ToString().Split(new[] { "SH" }, StringSplitOptions.None);
+                            string PipeLineClass = parts[0];          // GC2
+                            string ISC_IsoName = "SH" + parts[1];    // SHB3 
+                            isoInfo.ISC_ID = isoClasss.Where(x => x.ISC_IsoName == ISC_IsoName || x.ISC_IsoCode == ISC_IsoName).Select(x => x.ISC_ID).FirstOrDefault();
+                            if (!string.IsNullOrEmpty(PipeLineClass))
+                            {
+                                isoInfo.PipeLineClass = PipeLineClass; 
+                            }
+                        }
+                        if (row[dataColumn.ColumnName].ToString().Contains("焊后热处理"))
+                        {
+                            //isoInfo.IsHotType = row[dataColumn.ColumnName].ToString();
+                            isoInfo.IsHot = "1";
                         }
-
                     }
-                    Console.WriteLine($"\n--- 表格 {j + 1} ---");
+                    isoList.Add(isoInfo);
                 }
             }
+        }
 
+        /// <summary>
+        /// 一次性读取PDF指定页范围内的全部表格，并按列位置合并为一个数据表。
+        /// </summary>
+        private static DataTable ExtractAllPdfTables(string pdfFilePath, int startPageIndex)
+        {
+            DataTable result = new DataTable("PDF全部页");
+            using (PdfDocument pdf = new PdfDocument())
+            {
+                pdf.LoadFromFile(pdfFilePath);
+                PdfTableExtractor extractor = new PdfTableExtractor(pdf);
 
+                for (int pageIndex = startPageIndex; pageIndex < pdf.Pages.Count; pageIndex++)
+                {
+                    PdfTable[] tables = extractor.ExtractTable(pageIndex);
+                    foreach (PdfTable table in tables)
+                    {
+                        AppendPdfTable(result, table);
+                    }
+                }
+            }
+            return result;
+        }
 
-            this.IsoGrid.DataSource = this.isoList;
-            this.IsoGrid.DataBind();
+        /// <summary>
+        /// 将单个PDF表格追加到汇总表，页间列数不同时按最大列数补齐。
+        /// </summary>
+        private static void AppendPdfTable(DataTable target, PdfTable source)
+        {
+            int firstColumnIndex = 0;
+            while (firstColumnIndex < source.GetColumnCount() && IsPdfColumnEmpty(source, firstColumnIndex))
+            {
+                firstColumnIndex++;
+            }
+
+            int lastColumnIndex = source.GetColumnCount() - 1;
+            while (lastColumnIndex >= firstColumnIndex && IsPdfColumnEmpty(source, lastColumnIndex))
+            {
+                lastColumnIndex--;
+            }
+
+            if (lastColumnIndex < firstColumnIndex)
+            {
+                return;
+            }
+
+            // Spire可能在不同页面的表格首尾生成全空占位列，追加前先去掉这些列，避免整页错位。
+            int contentColumnCount = lastColumnIndex - firstColumnIndex + 1;
+            while (target.Columns.Count < contentColumnCount)
+            {
+                target.Columns.Add("col" + target.Columns.Count);
+            }
+
+            for (int rowIndex = 0; rowIndex < source.GetRowCount(); rowIndex++)
+            {
+                DataRow row = target.NewRow();
+                for (int columnIndex = 0; columnIndex < contentColumnCount; columnIndex++)
+                {
+                    row[columnIndex] = source.GetText(rowIndex, firstColumnIndex + columnIndex);
+                }
+                target.Rows.Add(row);
+            }
+        }
+
+        private static bool IsPdfColumnEmpty(PdfTable table, int columnIndex)
+        {
+            for (int rowIndex = 0; rowIndex < table.GetRowCount(); rowIndex++)
+            {
+                if (!string.IsNullOrWhiteSpace(table.GetText(rowIndex, columnIndex)))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private void BindIsoGrid()
+        {
+            IsoGrid.DataSource = isoList;
+            IsoGrid.DataBind();
+        }
+
+        private static Grid CreateTableGrid(DataTable table)
+        {
+            Grid grid = new Grid
+            {
+                ShowGridHeader = true,
+                Title = table.TableName,
+                AllowColumnLocking = true,
+                DataKeyNames = new string[] { "Id" }
+            };
+            foreach (DataColumn column in table.Columns)
+            {
+                grid.Columns.Add(new BoundField { DataField = column.ColumnName, HeaderText = column.ColumnName });
+            }
+            grid.DataSource = table;
+            grid.DataBind();
+            return grid;
         }
 
 
@@ -1156,4 +1199,4 @@ namespace FineUIPro.Web.HJGL.DataIn
         }
         #endregion
     }
-}
+}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx

@@ -7,25 +7,12 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title></title>    
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<%--    <script type="module" crossorigin="" src="./assets/main-DE8eQLmE.js"></script>
-    <link rel="modulepreload" crossorigin="" href="./assets/pdf-lib-D5zKcp81.js">
-    <link rel="modulepreload" crossorigin="" href="./assets/pdfjs-HfNT2Y4W.js">
-    <link rel="modulepreload" crossorigin="" href="./assets/styles-Bno-H3Kc.js">
-    <link rel="stylesheet" crossorigin="" href="./assets/styles-CDHjsf7D.css">
-    <link rel="stylesheet" crossorigin="" href="./assets/main-DSskaVYi.css">
-
-    <script type="module" crossorigin src="./assets/main-BVrK8ZH3.js"></script>
-    <link rel="modulepreload" crossorigin href="./assets/pdf-lib-D5zKcp81.js">
-    <link rel="modulepreload" crossorigin href="./assets/pdfjs-HfNT2Y4W.js">
-    <link rel="modulepreload" crossorigin href="./assets/styles-DSX1EPGh.js">
-    <link rel="stylesheet" crossorigin href="./assets/styles-RcW4wYEA.css">
-    <link rel="stylesheet" crossorigin href="./assets/main-Ct3Co9Zo.css">--%>
-    <script type="module" crossorigin src="./assets/main-CAQAECJj.js"></script>
+    <script type="module" crossorigin src="./assets/main-COgjld70.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/pdf-lib-AfLQbX6n.js">
     <link rel="modulepreload" crossorigin href="./assets/pdfjs-DXqArq6h.js">
-    <link rel="modulepreload" crossorigin href="./assets/styles-BivZUUi2.js">
-    <link rel="stylesheet" crossorigin href="./assets/styles-D86IH2mE.css">
-    <link rel="stylesheet" crossorigin href="./assets/main-BrQ26Trd.css">
+    <link rel="modulepreload" crossorigin href="./assets/styles-G88NglGL.js">
+    <link rel="stylesheet" crossorigin href="./assets/styles-CXI0s-Oz.css">
+    <link rel="stylesheet" crossorigin href="./assets/main-BOr4VZxp.css">
 
 
     <style type="text/css">

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs

@@ -796,7 +796,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
 
         protected void btnNext_Click(object sender, EventArgs e)
         {
-            btnImport.Hidden = false;
+            //btnImport.Hidden = false;
             Grid1.Hidden = false;
             contentPanel.Hidden = true;
             btnNext.Hidden = true;
@@ -817,6 +817,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
                 if (iso != null)
                 {
                     var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID);
+                    string steelCode = Funs.DB.HJGL_BS_Steel
+                        .Where(x => x.STE_ID == iso.STE_ID)
+                        .Select(x => x.STE_Code)
+                        .FirstOrDefault();
                     HashSet<string> existingJointNos = new HashSet<string>(
                         Funs.DB.HJGL_PW_JointInfo
                             .Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.ISO_ID == ISO_ID)
@@ -866,6 +870,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
                         newDataInTemp.Value1 = unit != null ? unit.UnitCode : null;
                         newDataInTemp.Value3 = iso.ISO_IsoNo;
                         newDataInTemp.Value4 = jointNo;
+                        newDataInTemp.Value5 = steelCode;
+                        newDataInTemp.Value12 = iso.Specification;
+                        newDataInTemp.Value13 = iso.ISO_Sch.HasValue ? iso.ISO_Sch.Value.ToString() : null;
+                        newDataInTemp.Value32 = iso.ISO_Dia.HasValue ? iso.ISO_Dia.Value.ToString() : null;
                         newDataInTemp.Value46 = item.Value<string>("x");
                         newDataInTemp.Value47 = item.Value<string>("y");
                         newDataInTemp.Value48 = item.Value<string>("x2");

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx

@@ -6,25 +6,18 @@
 <head runat="server">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title></title>    
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<%--    <script type="module" crossorigin="" src="./assets/viewer-Dla4Cfl-.js"></script>
-    <link rel="modulepreload" crossorigin="" href="./assets/pdf-lib-D5zKcp81.js">
-    <link rel="modulepreload" crossorigin="" href="./assets/pdfjs-HfNT2Y4W.js">
-    <link rel="modulepreload" crossorigin="" href="./assets/styles-Bno-H3Kc.js">
-    <link rel="stylesheet" crossorigin="" href="./assets/styles-CDHjsf7D.css">
-    <link rel="stylesheet" crossorigin="" href="./assets/viewer-BilNgxa5.css">--%>
-
-       <script type="module" crossorigin src="./assets/viewer-OAWYGAQy.js"></script>
+    <script type="module" crossorigin src="./assets/viewer-D3iNrO9k.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/pdf-lib-AfLQbX6n.js">
     <link rel="modulepreload" crossorigin href="./assets/pdfjs-DXqArq6h.js">
-    <link rel="modulepreload" crossorigin href="./assets/styles-BivZUUi2.js">
-    <link rel="stylesheet" crossorigin href="./assets/styles-D86IH2mE.css">
-    <link rel="stylesheet" crossorigin href="./assets/viewer-DahJGFsF.css">
+    <link rel="modulepreload" crossorigin href="./assets/styles-G88NglGL.js">
+    <link rel="stylesheet" crossorigin href="./assets/styles-CXI0s-Oz.css">
+    <link rel="stylesheet" crossorigin href="./assets/viewer-u37LBwT8.css">
 </head>
 <body>
     <form id="form1" runat="server">
      <input  id="hdpdfurl"  type="hidden" value="<%=URL %>"/>
-     <input  id="annotionData"  type="hidden"    value='<%=JointData %>'/>
+     <input  id="annotionData"  type="hidden"    runat="server"/>
+
      <input  id="hdworkRecord"  type="hidden"    runat="server"/>
      <input  id="imgurl2"  type="hidden"    runat="server"/>
      <input  id="imgurl1"  type="hidden"    runat="server"/>

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs

@@ -2,6 +2,7 @@
 using BLL.Common;
  
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
  
 using System;
 using System.Collections.Generic;
@@ -59,18 +60,6 @@ namespace FineUIPro.Web.HJGL.JoinMarking
                 ViewState["URL"] = value;
             }
         }
-        public string JointData
-        {
-            get
-            {
-                return (string)ViewState["JointData"];
-            }
-            set
-            {
-                ViewState["JointData"] = value;
-            }
-        }
-
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
@@ -79,6 +68,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
                 ISO_ID = Request.Params["ISO_ID"];
                 FileId = Request.Params["FileId"];
                 URL = Funs.HJGLUrl + Request.Params["pdfurl"];
+                annotionData.Value = DrawingInfoService.GetDrawingJson(FileId) ?? "{}";
 
                 var iso = Funs.DB.HJGL_PW_IsoInfo.FirstOrDefault(x => x.ISO_ID == ISO_ID);
                 if (iso != null)
@@ -86,19 +76,31 @@ namespace FineUIPro.Web.HJGL.JoinMarking
                     UnitName = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID)?.UnitName;
                 }
 
-                var jotids = Funs.DB.HJGL_PW_JointInfo.Where(x => x.ISO_ID == ISO_ID && x.AttachSourceId == FileId).Select(x => x.JOT_ID).ToList();
 
-                string sqlData = @"select a.JOT_ID ,a.JOT_JointNo,c.WED_Code,JOT_Location,b.JOT_WeldDate ,'/' DetectionTypeCode ,'/' IsRepair,'/' IsHotProcess,x,y,x2,y2
+                string sqlData = @"select a.JOT_ID ,a.JOT_JointNo,
+                                    (case when cellWelder.WED_Code is not null and floorWelder.WED_Code is not null
+                                               and cellWelder.WED_Code <> floorWelder.WED_Code
+                                          then cellWelder.WED_Code + '/' + floorWelder.WED_Code
+                                          else coalesce(cellWelder.WED_Code, floorWelder.WED_Code, '') end) WED_Code,
+                                    JOT_Location,b.JOT_WeldDate ,'/' DetectionTypeCode ,'/' IsRepair,'/' IsHotProcess,x,y,x2,y2
 							                            ,(case a.JOT_JointStatus 
 	                        when '100' then '正常' 
 	                        when '102' then '扩透' 
 	                        when '101' then '点口' 
 	                        when '104' then '已切除' end) as JOT_JointStatus from HJGL_PW_JointInfo a 
-														left join  HJGL_BO_WeldReportMain b on a.DReportID=b.DReportID
-														left join  HJGL_bs_welder AS c ON a.JOT_FloorWelder = c.wed_id							 
-                            WHERE   a.ProjectId = @ProjectId   and a.JOT_ID in ('" + string.Join("','", jotids) + "') ";
-                SqlParameter[] parameter1 = new SqlParameter[] { new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId) };
+												left join  HJGL_BO_WeldReportMain b on a.DReportID=b.DReportID
+												left join HJGL_bs_welder cellWelder on a.JOT_CellWelder = cellWelder.WED_ID
+												left join HJGL_bs_welder floorWelder on a.JOT_FloorWelder = floorWelder.WED_ID
+                            where a.ProjectId = @ProjectId and a.ISO_ID = @IsoId";
+                SqlParameter[] parameter1 = new SqlParameter[]
+                {
+                    new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId),
+                    new SqlParameter("@IsoId", ISO_ID)
+                };
                 DataTable tb1 = SQLHelper.GetDataTableRunText(sqlData, parameter1);
+                List<string> jotids = tb1.Rows.Cast<DataRow>()
+                    .Select(x => x["JOT_ID"].ToString())
+                    .ToList();
 
                 string sqlTrust = @"select a.JOT_ID, c.DetectionTypeCode,b.CH_TrustType  from CH_TrustItem AS a  
                                 LEFT JOIN CH_Trust AS b ON a.CH_TrustID = b.CH_TrustID 
@@ -132,7 +134,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
                 Dictionary<string, string> HotProessDic = new Dictionary<string, string>();
                 if (tbCheck != null)
                 {
-                    foreach (DataRow row in tbTrust.Rows)
+                    foreach (DataRow row in tbCheck.Rows)
                     {
                         string WeldJointId = row["WeldJointId"].ToString();
                         string HotProessTrustId = row["HotProessTrustId"].ToString();
@@ -142,49 +144,60 @@ namespace FineUIPro.Web.HJGL.JoinMarking
                         }
                     }
                 }
-                if (tb1 != null)
+                foreach (DataRow row in tb1.Rows)
                 {
-                    foreach (DataRow row in tb1.Rows)
-                    {
-                        string JOT_ID = row["JOT_ID"].ToString();
-                        if (DetectionTypeDic.ContainsKey(JOT_ID))
-                        {
-                            row["DetectionTypeCode"] = DetectionTypeDic[JOT_ID];
-                        }
-                        else
-                        {
-                            row["DetectionTypeCode"] = "/";
-                        }
-                        if (TrustTypeDic.ContainsKey(JOT_ID))
-                        {
-                            row["IsRepair"] = "是";
-                        }
-                        else
-                        {
-                            row["IsRepair"] = "/";
-                        }
-                        if (HotProessDic.ContainsKey(JOT_ID))
-                        {
-                            row["IsHotProcess"] ="是";
-                        }
-                        else
-                        {
-                            row["IsHotProcess"] = "/";
-                        }
-                    }
+                    string JOT_ID = row["JOT_ID"].ToString();
+                    string detectionType;
+                    row["DetectionTypeCode"] = DetectionTypeDic.TryGetValue(JOT_ID, out detectionType)
+                        ? detectionType : "/";
+                    row["IsRepair"] = TrustTypeDic.ContainsKey(JOT_ID) ? "是" : "/";
+                    row["IsHotProcess"] = HotProessDic.ContainsKey(JOT_ID) ? "是" : "/";
                 }
 
-                JointData = JsonConvert.SerializeObject(tb1);
-
-
-
+                annotionData.Value = ExtendDrawingJson(annotionData.Value, tb1);
             }
         }
-         
-         
-        
-       
 
-         
+        /// <summary>
+        /// 将焊口业务字段扩展到对应标注中。
+        /// </summary>
+        private static string ExtendDrawingJson(string drawingJson, DataTable jointTable)
+        {
+            JObject drawing = JObject.Parse(string.IsNullOrWhiteSpace(drawingJson) ? "{}" : drawingJson);
+            JObject annotations = drawing.Value<JObject>("annotations");
+            if (annotations == null || jointTable == null || jointTable.Rows.Count == 0)
+            {
+                return drawing.ToString(Formatting.None);
+            }
+
+            foreach (JObject annotation in annotations.Properties()
+                .SelectMany(x => (x.Value as JArray) ?? new JArray())
+                .OfType<JObject>())
+            {
+                string label = annotation.Value<string>("label");
+                DataRow jointRow = jointTable.Rows.Cast<DataRow>()
+                    .FirstOrDefault(x => string.Equals(
+                        x["JOT_JointNo"].ToString(),
+                        label,
+                        StringComparison.OrdinalIgnoreCase));
+                if (jointRow == null)
+                {
+                    continue;
+                }
+
+                annotation["JOT_ID"] = jointRow["JOT_ID"].ToString();
+                annotation["JOT_JointNo"] = jointRow["JOT_JointNo"].ToString();
+                annotation["WED_Code"] = jointRow["WED_Code"].ToString();
+                annotation["JOT_Location"] = jointRow["JOT_Location"].ToString();
+                annotation["JOT_WeldDate"] = jointRow["JOT_WeldDate"].ToString();
+                annotation["DetectionTypeCode"] = jointRow["DetectionTypeCode"].ToString();
+                annotation["IsRepair"] = jointRow["IsRepair"].ToString();
+                annotation["IsHotProcess"] = jointRow["IsHotProcess"].ToString();
+                annotation["JOT_JointStatus"] = jointRow["JOT_JointStatus"].ToString();
+            }
+
+            return drawing.ToString(Formatting.None);
+        }
+
     }
-}
+}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.designer.cs

@@ -23,6 +23,15 @@ namespace FineUIPro.Web.HJGL.JoinMarking
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
 
+        /// <summary>
+        /// annotionData 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden annotionData;
+
         /// <summary>
         /// hdworkRecord 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/assets/main-BOr4VZxp.css

@@ -1 +1 @@
-.menu-item[data-v-730149df]:hover{background-color:#f3f4f6!important}.annotation-detail-panel[data-v-730149df]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.panel-header[data-v-730149df]{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:#334155;color:#fff}.close-btn[data-v-730149df]{background:transparent;border:none;color:#fff;font-size:18px;cursor:pointer;padding:0 4px;line-height:1}.close-btn[data-v-730149df]:hover{color:#fca5a5}.detail-content[data-v-730149df]{padding:12px}.detail-row[data-v-730149df]{display:flex;align-items:center;gap:8px;margin-bottom:10px}.detail-row label[data-v-730149df]{min-width:70px;font-size:12px;color:#64748b}.detail-row.readonly[data-v-730149df]{color:#94a3b8;font-size:12px}.detail-row.readonly span[data-v-730149df]{color:#475569}.label-preview[data-v-730149df]{flex:1;padding:6px 10px;background:#1e293b;color:#f1f5f9;border-radius:4px;font-family:monospace;font-size:13px;text-align:center}.detail-input[data-v-730149df]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px}.detail-input[data-v-730149df]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-textarea[data-v-730149df]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px;min-height:60px;resize:vertical;font-family:inherit}.detail-textarea[data-v-730149df]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-divider[data-v-730149df]{height:1px;background:#e2e8f0;margin:12px 0}.detail-actions[data-v-730149df]{display:flex;gap:8px;margin-top:12px}.detail-actions .btn-primary[data-v-730149df]{flex:1;padding:8px;background:#3b82f6;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-primary[data-v-730149df]:hover{background:#2563eb}.detail-actions .btn-danger[data-v-730149df]{padding:8px 12px;background:#fee2e2;color:#dc2626;border:1px solid #fecaca;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-danger[data-v-730149df]:hover{background:#fecaca}.weld-table-panel[data-v-3f4d92b8]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.weld-table-header[data-v-3f4d92b8]{display:flex;justify-content:space-between;align-items:center;padding:8px 12px;background:#334155;color:#fff;font-size:13px;font-weight:600;cursor:pointer;user-select:none}.weld-table-body[data-v-3f4d92b8]{padding:8px;overflow-y:auto;flex:1;min-height:0}.header-close[data-v-3f4d92b8]{cursor:pointer;font-size:16px;line-height:1;padding:0 2px;color:#fff}.header-close[data-v-3f4d92b8]:hover{color:#fca5a5}.weld-table-empty[data-v-3f4d92b8]{font-size:12px;color:#94a3b8;text-align:center;padding:12px 0}.weld-table[data-v-3f4d92b8]{border-collapse:collapse;width:100%;font-size:11px}.weld-table th[data-v-3f4d92b8]{text-align:left;color:#64748b;font-weight:600;padding:4px;border-bottom:1px solid #e2e8f0;white-space:nowrap}.weld-table td[data-v-3f4d92b8]{padding:3px 4px;border-bottom:1px solid #f1f5f9;color:#334155}.weld-table tbody tr[data-v-3f4d92b8]{cursor:pointer}.weld-table tbody tr[data-v-3f4d92b8]:hover{background:#f0f9ff}.weld-table tbody tr.row-selected[data-v-3f4d92b8]{background:#e0f2fe}.cell-input[data-v-3f4d92b8]{box-sizing:border-box;padding:2px 4px;border:1px solid #cbd5e1;border-radius:3px;font-size:11px;background:#fff}.cell-input[data-v-3f4d92b8]:focus{outline:none;border-color:#0ea5e9}.row-delete[data-v-3f4d92b8]{color:#ef4444;cursor:pointer;font-size:13px;padding:0 4px}.row-delete[data-v-3f4d92b8]:hover{color:#b91c1c}
+.menu-item[data-v-a19709be]:hover{background-color:#f3f4f6!important}.annotation-detail-panel[data-v-a19709be]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.panel-header[data-v-a19709be]{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:#334155;color:#fff}.close-btn[data-v-a19709be]{background:transparent;border:none;color:#fff;font-size:18px;cursor:pointer;padding:0 4px;line-height:1}.close-btn[data-v-a19709be]:hover{color:#fca5a5}.detail-content[data-v-a19709be]{padding:12px}.detail-row[data-v-a19709be]{display:flex;align-items:center;gap:8px;margin-bottom:10px}.detail-row label[data-v-a19709be]{min-width:70px;font-size:12px;color:#64748b}.detail-row.readonly[data-v-a19709be]{color:#94a3b8;font-size:12px}.detail-row.readonly span[data-v-a19709be]{color:#475569}.label-preview[data-v-a19709be]{flex:1;padding:6px 10px;background:#1e293b;color:#f1f5f9;border-radius:4px;font-family:monospace;font-size:13px;text-align:center}.detail-input[data-v-a19709be]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px}.detail-input[data-v-a19709be]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-textarea[data-v-a19709be]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px;min-height:60px;resize:vertical;font-family:inherit}.detail-textarea[data-v-a19709be]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-divider[data-v-a19709be]{height:1px;background:#e2e8f0;margin:12px 0}.detail-actions[data-v-a19709be]{display:flex;gap:8px;margin-top:12px}.detail-actions .btn-primary[data-v-a19709be]{flex:1;padding:8px;background:#3b82f6;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-primary[data-v-a19709be]:hover{background:#2563eb}.detail-actions .btn-danger[data-v-a19709be]{padding:8px 12px;background:#fee2e2;color:#dc2626;border:1px solid #fecaca;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-danger[data-v-a19709be]:hover{background:#fecaca}.weld-table-panel[data-v-3f4d92b8]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.weld-table-header[data-v-3f4d92b8]{display:flex;justify-content:space-between;align-items:center;padding:8px 12px;background:#334155;color:#fff;font-size:13px;font-weight:600;cursor:pointer;user-select:none}.weld-table-body[data-v-3f4d92b8]{padding:8px;overflow-y:auto;flex:1;min-height:0}.header-close[data-v-3f4d92b8]{cursor:pointer;font-size:16px;line-height:1;padding:0 2px;color:#fff}.header-close[data-v-3f4d92b8]:hover{color:#fca5a5}.weld-table-empty[data-v-3f4d92b8]{font-size:12px;color:#94a3b8;text-align:center;padding:12px 0}.weld-table[data-v-3f4d92b8]{border-collapse:collapse;width:100%;font-size:11px}.weld-table th[data-v-3f4d92b8]{text-align:left;color:#64748b;font-weight:600;padding:4px;border-bottom:1px solid #e2e8f0;white-space:nowrap}.weld-table td[data-v-3f4d92b8]{padding:3px 4px;border-bottom:1px solid #f1f5f9;color:#334155}.weld-table tbody tr[data-v-3f4d92b8]{cursor:pointer}.weld-table tbody tr[data-v-3f4d92b8]:hover{background:#f0f9ff}.weld-table tbody tr.row-selected[data-v-3f4d92b8]{background:#e0f2fe}.cell-input[data-v-3f4d92b8]{box-sizing:border-box;padding:2px 4px;border:1px solid #cbd5e1;border-radius:3px;font-size:11px;background:#fff}.cell-input[data-v-3f4d92b8]:focus{outline:none;border-color:#0ea5e9}.row-delete[data-v-3f4d92b8]{color:#ef4444;cursor:pointer;font-size:13px;padding:0 4px}.row-delete[data-v-3f4d92b8]:hover{color:#b91c1c}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/assets/main-Ct3Co9Zo.css

@@ -1 +0,0 @@
-.menu-item[data-v-bd4e31be]:hover{background-color:#f3f4f6!important}.annotation-detail-panel[data-v-bd4e31be]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.panel-header[data-v-bd4e31be]{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:#334155;color:#fff}.close-btn[data-v-bd4e31be]{background:transparent;border:none;color:#fff;font-size:18px;cursor:pointer;padding:0 4px;line-height:1}.close-btn[data-v-bd4e31be]:hover{color:#fca5a5}.detail-content[data-v-bd4e31be]{padding:12px}.detail-row[data-v-bd4e31be]{display:flex;align-items:center;gap:8px;margin-bottom:10px}.detail-row label[data-v-bd4e31be]{min-width:70px;font-size:12px;color:#64748b}.detail-row.readonly[data-v-bd4e31be]{color:#94a3b8;font-size:12px}.detail-row.readonly span[data-v-bd4e31be]{color:#475569}.label-preview[data-v-bd4e31be]{flex:1;padding:6px 10px;background:#1e293b;color:#f1f5f9;border-radius:4px;font-family:monospace;font-size:13px;text-align:center}.detail-input[data-v-bd4e31be]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px}.detail-input[data-v-bd4e31be]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-textarea[data-v-bd4e31be]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px;min-height:60px;resize:vertical;font-family:inherit}.detail-textarea[data-v-bd4e31be]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-divider[data-v-bd4e31be]{height:1px;background:#e2e8f0;margin:12px 0}.detail-actions[data-v-bd4e31be]{display:flex;gap:8px;margin-top:12px}.detail-actions .btn-primary[data-v-bd4e31be]{flex:1;padding:8px;background:#3b82f6;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-primary[data-v-bd4e31be]:hover{background:#2563eb}.detail-actions .btn-danger[data-v-bd4e31be]{padding:8px 12px;background:#fee2e2;color:#dc2626;border:1px solid #fecaca;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-danger[data-v-bd4e31be]:hover{background:#fecaca}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/assets/main-DSskaVYi.css

@@ -1 +0,0 @@
-.menu-item[data-v-6090802b]:hover{background-color:#f3f4f6!important}.annotation-detail-panel[data-v-6090802b]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.panel-header[data-v-6090802b]{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:#334155;color:#fff}.close-btn[data-v-6090802b]{background:transparent;border:none;color:#fff;font-size:18px;cursor:pointer;padding:0 4px;line-height:1}.close-btn[data-v-6090802b]:hover{color:#fca5a5}.detail-content[data-v-6090802b]{padding:12px}.detail-row[data-v-6090802b]{display:flex;align-items:center;gap:8px;margin-bottom:10px}.detail-row label[data-v-6090802b]{min-width:70px;font-size:12px;color:#64748b}.detail-row.readonly[data-v-6090802b]{color:#94a3b8;font-size:12px}.detail-row.readonly span[data-v-6090802b]{color:#475569}.label-preview[data-v-6090802b]{flex:1;padding:6px 10px;background:#1e293b;color:#f1f5f9;border-radius:4px;font-family:monospace;font-size:13px;text-align:center}.detail-input[data-v-6090802b]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px}.detail-input[data-v-6090802b]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-textarea[data-v-6090802b]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px;min-height:60px;resize:vertical;font-family:inherit}.detail-textarea[data-v-6090802b]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-divider[data-v-6090802b]{height:1px;background:#e2e8f0;margin:12px 0}.detail-actions[data-v-6090802b]{display:flex;gap:8px;margin-top:12px}.detail-actions .btn-primary[data-v-6090802b]{flex:1;padding:8px;background:#3b82f6;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-primary[data-v-6090802b]:hover{background:#2563eb}.detail-actions .btn-danger[data-v-6090802b]{padding:8px 12px;background:#fee2e2;color:#dc2626;border:1px solid #fecaca;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-danger[data-v-6090802b]:hover{background:#fecaca}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/assets/main-DbSTqVeT.css

@@ -1 +0,0 @@
-.menu-item[data-v-99d9d8cd]:hover{background-color:#f3f4f6!important}.annotation-detail-panel[data-v-99d9d8cd]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.panel-header[data-v-99d9d8cd]{display:flex;justify-content:space-between;align-items:center;padding:10px 12px;background:#334155;color:#fff}.close-btn[data-v-99d9d8cd]{background:transparent;border:none;color:#fff;font-size:18px;cursor:pointer;padding:0 4px;line-height:1}.close-btn[data-v-99d9d8cd]:hover{color:#fca5a5}.detail-content[data-v-99d9d8cd]{padding:12px}.detail-row[data-v-99d9d8cd]{display:flex;align-items:center;gap:8px;margin-bottom:10px}.detail-row label[data-v-99d9d8cd]{min-width:70px;font-size:12px;color:#64748b}.detail-row.readonly[data-v-99d9d8cd]{color:#94a3b8;font-size:12px}.detail-row.readonly span[data-v-99d9d8cd]{color:#475569}.label-preview[data-v-99d9d8cd]{flex:1;padding:6px 10px;background:#1e293b;color:#f1f5f9;border-radius:4px;font-family:monospace;font-size:13px;text-align:center}.detail-input[data-v-99d9d8cd]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px}.detail-input[data-v-99d9d8cd]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-textarea[data-v-99d9d8cd]{flex:1;padding:6px 8px;border:1px solid #d1d5db;border-radius:4px;font-size:12px;min-height:60px;resize:vertical;font-family:inherit}.detail-textarea[data-v-99d9d8cd]:focus{outline:none;border-color:#3b82f6;box-shadow:0 0 0 2px #3b82f633}.detail-divider[data-v-99d9d8cd]{height:1px;background:#e2e8f0;margin:12px 0}.detail-actions[data-v-99d9d8cd]{display:flex;gap:8px;margin-top:12px}.detail-actions .btn-primary[data-v-99d9d8cd]{flex:1;padding:8px;background:#3b82f6;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-primary[data-v-99d9d8cd]:hover{background:#2563eb}.detail-actions .btn-danger[data-v-99d9d8cd]{padding:8px 12px;background:#fee2e2;color:#dc2626;border:1px solid #fecaca;border-radius:4px;cursor:pointer;font-size:12px}.detail-actions .btn-danger[data-v-99d9d8cd]:hover{background:#fecaca}.weld-table-panel[data-v-3f4d92b8]{background:#f8fafc;border:1px solid #e2e8f0;border-radius:8px;margin-bottom:16px;overflow:hidden}.weld-table-header[data-v-3f4d92b8]{display:flex;justify-content:space-between;align-items:center;padding:8px 12px;background:#334155;color:#fff;font-size:13px;font-weight:600;cursor:pointer;user-select:none}.weld-table-body[data-v-3f4d92b8]{padding:8px;overflow-y:auto;flex:1;min-height:0}.header-close[data-v-3f4d92b8]{cursor:pointer;font-size:16px;line-height:1;padding:0 2px;color:#fff}.header-close[data-v-3f4d92b8]:hover{color:#fca5a5}.weld-table-empty[data-v-3f4d92b8]{font-size:12px;color:#94a3b8;text-align:center;padding:12px 0}.weld-table[data-v-3f4d92b8]{border-collapse:collapse;width:100%;font-size:11px}.weld-table th[data-v-3f4d92b8]{text-align:left;color:#64748b;font-weight:600;padding:4px;border-bottom:1px solid #e2e8f0;white-space:nowrap}.weld-table td[data-v-3f4d92b8]{padding:3px 4px;border-bottom:1px solid #f1f5f9;color:#334155}.weld-table tbody tr[data-v-3f4d92b8]{cursor:pointer}.weld-table tbody tr[data-v-3f4d92b8]:hover{background:#f0f9ff}.weld-table tbody tr.row-selected[data-v-3f4d92b8]{background:#e0f2fe}.cell-input[data-v-3f4d92b8]{box-sizing:border-box;padding:2px 4px;border:1px solid #cbd5e1;border-radius:3px;font-size:11px;background:#fff}.cell-input[data-v-3f4d92b8]:focus{outline:none;border-color:#0ea5e9}.row-delete[data-v-3f4d92b8]{color:#ef4444;cursor:pointer;font-size:13px;padding:0 4px}.row-delete[data-v-3f4d92b8]:hover{color:#b91c1c}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/assets/viewer-BilNgxa5.css

@@ -1 +0,0 @@
-.viewer-container[data-v-0899ee83]{display:flex;height:100vh;padding:12px;box-sizing:border-box}.viewer-main[data-v-0899ee83]{flex:1;display:flex;flex-direction:column;border:1px solid var(--border);border-radius:10px;background:var(--panel);box-shadow:0 10px 30px -18px #00000059;padding:8px;box-sizing:border-box}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/assets/viewer-DahJGFsF.css

@@ -1 +0,0 @@
-.viewer-container[data-v-eda88533]{display:flex;height:100vh;padding:12px;box-sizing:border-box}.viewer-main[data-v-eda88533]{flex:1;display:flex;flex-direction:column;border:1px solid var(--border);border-radius:10px;background:var(--panel);box-shadow:0 10px 30px -18px #00000059;padding:8px;box-sizing:border-box}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/assets/viewer-u37LBwT8.css

@@ -0,0 +1 @@
+.viewer-container[data-v-b1adea8b]{display:flex;height:100vh;padding:12px;box-sizing:border-box}.viewer-main[data-v-b1adea8b]{flex:1;min-width:0;display:flex;flex-direction:column;border:1px solid var(--border);border-radius:10px;background:var(--panel);box-shadow:0 10px 30px -18px #00000059;padding:8px;box-sizing:border-box}.controls[data-v-b1adea8b]{flex-wrap:wrap;overflow:visible}.controls[data-v-b1adea8b]>*{flex-shrink:0}

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/index.html

@@ -0,0 +1,679 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vue PDF Viewer</title>
+    <script type="module" crossorigin src="./assets/main-COgjld70.js"></script>
+    <link rel="modulepreload" crossorigin href="./assets/pdf-lib-AfLQbX6n.js">
+    <link rel="modulepreload" crossorigin href="./assets/pdfjs-DXqArq6h.js">
+    <link rel="modulepreload" crossorigin href="./assets/styles-G88NglGL.js">
+    <link rel="stylesheet" crossorigin href="./assets/styles-CXI0s-Oz.css">
+    <link rel="stylesheet" crossorigin href="./assets/main-BOr4VZxp.css">
+  </head>
+  <body>
+    <div id="app"></div>
+    <!-- <input id="hdpdfurl" value="https://equipmentcheck.oss-cn-beijing.aliyuncs.com/03DR-003A-12-C1R_Sht_1.PDF">
+    <input id="imgurl1" value="https://equipmentcheck.oss-cn-beijing.aliyuncs.com/Screenshots/%E5%B1%8F%E5%B9%95%E6%88%AA%E5%9B%BE%202026-01-12%20110935.png">
+    <input id="imgurl2" value="https://equipmentcheck.oss-cn-beijing.aliyuncs.com/Screenshots/%E5%B1%8F%E5%B9%95%E6%88%AA%E5%9B%BE%202026-02-08%20132814.png"> -->
+
+    <!-- <input id="annotionData" value='{
+  "version": "1.0",
+  "exportDate": "2026-08-31T03:15:48.411Z",
+  "sourceFile": "03DR-003A-12-C1R_Sht_1.pdf",
+  "globalSettings": {
+    "startNumber": 14,
+    "increment": 1,
+    "prefix": "",
+    "suffix": "",
+    "fontSize": 23,
+    "borderStyle": "none",
+    "annotationStyle": "dot"
+  },
+  "annotations": {
+    "1": [
+      {
+        "x": 190.0625978090767,
+        "y": 262.206572769953,
+        "x2": 140.0625978090767,
+        "y2": 312.206572769953,
+        "displayValue": 1,
+        "label": "1",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 252.660406885759,
+        "y": 298.20031298904536,
+        "x2": 202.660406885759,
+        "y2": 348.20031298904536,
+        "displayValue": 2,
+        "label": "2",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 344.9921752738654,
+        "y": 219.9530516431925,
+        "x2": 294.9921752738654,
+        "y2": 269.9530516431925,
+        "displayValue": 13,
+        "label": "13",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 305.0860719874804,
+        "y": 161.26760563380282,
+        "x2": 255.08607198748044,
+        "y2": 211.26760563380282,
+        "displayValue": 4,
+        "label": "4",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 13,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 13,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 346.55712050078245,
+        "y": 287.24569640062595,
+        "x2": 296.55712050078245,
+        "y2": 337.24569640062595,
+        "displayValue": 12,
+        "label": "12",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 283.1768388106416,
+        "y": 356.1032863849765,
+        "x2": 233.1768388106416,
+        "y2": 406.1032863849765,
+        "displayValue": 5,
+        "label": "5",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 202.58215962441315,
+        "y": 378.7949921752739,
+        "x2": 152.58215962441315,
+        "y2": 428.7949921752739,
+        "displayValue": 3,
+        "label": "3",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 298.0438184663537,
+        "y": 423.39593114241,
+        "x2": 248.04381846635368,
+        "y2": 473.39593114241,
+        "displayValue": 6,
+        "label": "6",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 401.3302034428795,
+        "y": 357.6682316118936,
+        "x2": 351.3302034428795,
+        "y2": 407.6682316118936,
+        "displayValue": 9,
+        "label": "9",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 354.38184663536776,
+        "y": 422.61345852895147,
+        "x2": 304.38184663536776,
+        "y2": 472.61345852895147,
+        "displayValue": 8,
+        "label": "8",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 468.622848200313,
+        "y": 387.4021909233177,
+        "x2": 418.622848200313,
+        "y2": 437.4021909233177,
+        "displayValue": 11,
+        "label": "11",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 393.5054773082942,
+        "y": 457.82472613458526,
+        "x2": 343.5054773082942,
+        "y2": 507.82472613458526,
+        "displayValue": 10,
+        "label": "10",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 184.585289514867,
+        "y": 453.1298904538341,
+        "x2": 134.585289514867,
+        "y2": 503.1298904538341,
+        "displayValue": 4,
+        "label": "4",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 294.131455399061,
+        "y": 471.9092331768388,
+        "x2": 244.13145539906102,
+        "y2": 521.9092331768388,
+        "displayValue": 7,
+        "label": "7",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 164.24100156494524,
+        "y": 96.32237871674491,
+        "x2": 114.24100156494522,
+        "y2": 146.3223787167449,
+        "displayValue": 15,
+        "label": "15",
+        "style": "none",
+        "annotationStyle": "circle-outline",
+        "fontSize": 13,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 13,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "circle-outline"
+        }
+      },
+      {
+        "x": 271.4397496087637,
+        "y": 69.71830985915493,
+        "x2": 221.4397496087637,
+        "y2": 119.71830985915493,
+        "displayValue": 16,
+        "label": "16",
+        "style": "none",
+        "annotationStyle": "circle-outline",
+        "fontSize": 13,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 13,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "circle-outline"
+        }
+      },
+      {
+        "x": 175.19561815336465,
+        "y": 95.53990610328637,
+        "x2": 125.19561815336463,
+        "y2": 145.53990610328637,
+        "displayValue": 17,
+        "label": "17",
+        "style": "none",
+        "annotationStyle": "circle-outline",
+        "fontSize": 13,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 13,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "circle-outline"
+        }
+      },
+      {
+        "x": 338.7323943661972,
+        "y": 54.85133020344287,
+        "x2": 288.7323943661972,
+        "y2": 104.85133020344287,
+        "displayValue": 18,
+        "label": "18",
+        "style": "none",
+        "annotationStyle": "circle-outline",
+        "fontSize": 13,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 13,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "circle-outline"
+        }
+      },
+      {
+        "x": 241.70579029733958,
+        "y": 91.62754303599374,
+        "x2": 191.70579029733958,
+        "y2": 141.62754303599374,
+        "displayValue": 19,
+        "label": "19",
+        "style": "none",
+        "annotationStyle": "circle-outline",
+        "fontSize": 13,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 13,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "circle-outline"
+        }
+      },
+      {
+        "x": 140,
+        "y": 305.66666412353516,
+        "x2": 90,
+        "y2": 355.66666412353516,
+        "displayValue": 20,
+        "label": "20",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 137,
+        "y": 347.66666412353516,
+        "x2": 87,
+        "y2": 397.66666412353516,
+        "displayValue": 21,
+        "label": "21",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 139,
+        "y": 397.66666412353516,
+        "x2": 89,
+        "y2": 447.66666412353516,
+        "displayValue": 22,
+        "label": "22",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 139,
+        "y": 449.66666412353516,
+        "x2": 89,
+        "y2": 499.66666412353516,
+        "displayValue": 23,
+        "label": "23",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 225,
+        "y": 492.66666412353516,
+        "x2": 175,
+        "y2": 542.6666641235352,
+        "displayValue": 24,
+        "label": "24",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 347,
+        "y": 493.66666412353516,
+        "x2": 297,
+        "y2": 543.6666641235352,
+        "displayValue": 25,
+        "label": "25",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 450,
+        "y": 144.66666412353516,
+        "x2": 400,
+        "y2": 194.66666412353516,
+        "displayValue": 26,
+        "label": "26",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 474,
+        "y": 205.66666412353516,
+        "x2": 424,
+        "y2": 255.66666412353516,
+        "displayValue": 27,
+        "label": "27",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 431,
+        "y": 89.66666412353516,
+        "x2": 381,
+        "y2": 139.66666412353516,
+        "displayValue": 28,
+        "label": "28",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 425,
+        "y": 31.666664123535156,
+        "x2": 375,
+        "y2": 81.66666412353516,
+        "displayValue": 29,
+        "label": "29",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 557,
+        "y": 135.66666412353516,
+        "x2": 507,
+        "y2": 185.66666412353516,
+        "displayValue": 30,
+        "label": "30",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 553,
+        "y": 229.66666412353516,
+        "x2": 503,
+        "y2": 279.66666412353516,
+        "displayValue": 31,
+        "label": "31",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      },
+      {
+        "x": 553,
+        "y": 306.66666412353516,
+        "x2": 503,
+        "y2": 356.66666412353516,
+        "displayValue": 32,
+        "label": "32",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 23,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 23,
+          "startNumber": 14,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      }
+    ]
+  }
+}'> -->
+  </body>
+</html>

HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/viewer.html

@@ -0,0 +1,99 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>PDF 预览</title>
+    <script type="module" crossorigin src="./assets/viewer-D3iNrO9k.js"></script>
+    <link rel="modulepreload" crossorigin href="./assets/pdf-lib-AfLQbX6n.js">
+    <link rel="modulepreload" crossorigin href="./assets/pdfjs-DXqArq6h.js">
+    <link rel="modulepreload" crossorigin href="./assets/styles-G88NglGL.js">
+    <link rel="stylesheet" crossorigin href="./assets/styles-CXI0s-Oz.css">
+    <link rel="stylesheet" crossorigin href="./assets/viewer-u37LBwT8.css">
+  </head>
+  <body>
+    <div id="app"></div>
+    <input id="hdpdfurl" value="https://equipmentcheck.oss-cn-beijing.aliyuncs.com/03DR-003A-12-C1R_Sht_1.PDF">
+    <input id="imgurl1" value="https://equipmentcheck.oss-cn-beijing.aliyuncs.com/Screenshots/%E5%B1%8F%E5%B9%95%E6%88%AA%E5%9B%BE%202026-01-12%20110935.png">
+    <input id="imgurl2" value="https://equipmentcheck.oss-cn-beijing.aliyuncs.com/Screenshots/%E5%B1%8F%E5%B9%95%E6%88%AA%E5%9B%BE%202026-02-08%20132814.png">
+    <input id="orgname" value="中石化十六有限公司">
+
+    <input id="annotionData" value='
+    {
+  "version": "1.0",
+  "exportDate": "2026-08-31T03:22:40.554Z",
+  "sourceFile": "201079-JGJC-ZPC2-1121-0022-PP4009-001202608271441.pdf",
+  "globalSettings": {
+    "startNumber": 1,
+    "increment": 1,
+    "prefix": "",
+    "suffix": "",
+    "fontSize": 18,
+    "borderStyle": "none",
+    "annotationStyle": "dot"
+  },
+  "annotations": {
+    "1": [
+      {
+        "x": 396,
+        "y": 401,
+        "x2": 346,
+        "y2": 451,
+        "JOT_ID": "a1b2c3d4-1111-4000-a000-000000000001",
+        "JOT_JointNo": "GB1XX",
+        "WED_Code": "W001",
+        "JOT_Location": "1G",
+        "JOT_WeldDate": "2026-02-01",
+        "DetectionTypeCode": "RT",
+        "IsRepair": "否",
+        "IsHotProcess": "否",
+        "JOT_JointStatus": "正常",
+        "displayValue": 24,
+        "label": "24",
+        "style": "none",
+        "annotationStyle": "arrow",
+        "fontSize": 5,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 5,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "arrow"
+        }
+      },
+      {
+        "x": 310,
+        "y": 305,
+        "x2": 260,
+        "y2": 355,
+        "JOT_ID": "6ab8a006-efee-4c1c-80be-001f7cadad01",
+        "JOT_JointNo": "GB1XX",
+        "WED_Code": "W001",
+        "JOT_Location": "1G",
+        "JOT_WeldDate": "2026-02-01",
+        "DetectionTypeCode": "RT",
+        "IsRepair": "否",
+        "IsHotProcess": "否",
+        "JOT_JointStatus": "正常",
+        "displayValue": 27,
+        "label": "27",
+        "style": "none",
+        "annotationStyle": "dot",
+        "fontSize": 18,
+        "settings": {
+          "prefix": "",
+          "suffix": "",
+          "fontSize": 18,
+          "startNumber": 1,
+          "increment": 1,
+          "borderStyle": "none",
+          "annotationStyle": "dot"
+        }
+      }
+    ]
+  }
+}    ' >
+</body>
+</html>

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx

@@ -20,17 +20,19 @@
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" EnableCheckBoxSelect="true"
                             KeepCurrentSelection="true" runat="server" BoxFlex="1" DataKeyNames="BakeRecordsId"
                             DataIDField="BakeRecordsId" AllowSorting="true" SortField="BakeDate" SortDirection="DESC"
-                            OnSort="Grid1_Sort" EnableTextSelection="True">
+                            OnSort="Grid1_Sort" EnableTextSelection="True" AllowPaging="true" IsDatabasePaging="true" PageSize="50"
+                    OnPageIndexChange="Grid1_PageIndexChange" >
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server">
                                     <Items>
-                                        <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="265px" 
+                                        <f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="200px" 
                                             EnableEdit="true">
                                         </f:DropDownList>
                                         <f:DatePicker ID="txtStartDate" runat="server" Label="烘烤日期" EmptyText="开始时间" Width="220px" LabelAlign="Right"></f:DatePicker>
                                         <f:Label ID="Label1" runat="server" Text="-"></f:Label>
                                         <f:DatePicker ID="txtEndDate" runat="server" EmptyText="结束时间" Width="120px"></f:DatePicker>
-                                        <f:TextBox runat="server" Label="焊材牌号" ID="txtBrand" EmptyText="输入查询条件" Width="300px" LabelAlign="right"></f:TextBox>
+                                        <f:DropDownList ID="drpUnitStore" runat="server" Label="焊材库" LabelAlign="Right" Width="220px" LabelWidth="80px"></f:DropDownList>
+                                        <f:TextBox runat="server" Label="焊材牌号" ID="txtBrand" EmptyText="输入查询条件" Width="200px" LabelAlign="right"></f:TextBox>
                                         <f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                         </f:ToolbarFill>

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.cs

@@ -30,6 +30,8 @@ namespace FineUIPro.Web.HJGL.MaterialManage
                 this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectList("1");
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
+
+                BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, null, true);
                 BindGrid();
             }
         }
@@ -82,13 +84,18 @@ namespace FineUIPro.Web.HJGL.MaterialManage
                 strSql += " AND BakeRecords.BakeDate <= @endDate";
                 listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim()));
             }
+            if (this.drpUnitStore.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitStore.SelectedValue))
+            {
+                strSql += " AND BakeRecords.UnitStoreId = @UnitStoreId";
+                listStr.Add(new SqlParameter("@UnitStoreId", this.drpUnitStore.SelectedValue));
+            }
             strSql += " order by BakeRecords.BakeDate desc";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
             Grid1.RecordCount = tb.Rows.Count;
-            //var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = tb;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
             Grid1.DataBind();
         }
         #endregion
@@ -107,6 +114,19 @@ namespace FineUIPro.Web.HJGL.MaterialManage
         }
         #endregion
 
+        #region 页索引改变事件
+        /// <summary>
+        /// 页索引改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+        #endregion
+
         #region 提交        
         /// <summary>
         /// 确定按钮

HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx.designer.cs

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.MaterialManage {
-    
-    
-    public partial class ElectrodeBakeRecordNewSelect {
-        
+namespace FineUIPro.Web.HJGL.MaterialManage
+{
+
+
+    public partial class ElectrodeBakeRecordNewSelect
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-        
+
         /// <summary>
         /// drpProjectId 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectId;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -101,7 +103,16 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
+        /// <summary>
+        /// drpUnitStore 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitStore;
+
         /// <summary>
         /// txtBrand 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtBrand;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSure 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSure;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs

@@ -1609,6 +1609,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 dt.Columns.Add("JOT_JointDesc");
                 dt.Columns.Add("STE_Code");
                 dt.Columns.Add("QRCodeAttachUrl");
+                dt.Columns.Add("WED_Code");
+                dt.Columns.Add("JOT_WeldDate");
+                dt.Columns.Add("IS_Proess");
 
                 DataView dv = tb.DefaultView;//获取表视图
                 dv.Sort = "JOT_JointNo ASC";//按照ID排序
@@ -1624,6 +1627,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     newRow["JOT_JointDesc"] = row["JOT_JointDesc"].ToString();
                     newRow["STE_Code"] = row["STE_Code"].ToString();
                     newRow["QRCodeAttachUrl"] = Funs.RootPath + row["QRCodeAttachUrl"].ToString();
+                    newRow["WED_Code"] = row["WED_Code"].ToString();
+                    string wedDate = string.Format("{0:yyyy.MM.dd}", row["JOT_WeldDate"]);
+                    newRow["JOT_WeldDate"] = wedDate;
+                    newRow["IS_Proess"] = row["IS_Proess"].ToString();
                     dt.Rows.Add(newRow);
                 }
                 BLL.Common.FastReportService.AddFastreportTable(dt);

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs

@@ -766,7 +766,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     {
                         newWeldReportMain.CHT_Tabler = this.drpCHT_Tabler.SelectedValue;
                     }
-                    newWeldReportMain.CHT_TableDate = Funs.GetNewDateTime(this.txtCHT_TableDate.Text);
+                    else
+                    {
+                        newWeldReportMain.CHT_Tabler = this.CurrUser.UserId;
+                    }
+                    newWeldReportMain.CHT_TableDate = DateTime.Now;
                     newWeldReportMain.JOT_Remark = this.txtJOT_Remark.Text.Trim();
 
                     if (!string.IsNullOrEmpty(this.DReportID))

HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx

@@ -53,7 +53,7 @@
                                 <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                 </f:ToolbarFill>
                                 <f:TextBox ID="txtCode" runat="server" Label="卷号" LabelAlign="Right"></f:TextBox>
-                                <f:Button ID="btnPrint" Text="封面打印" Icon="Printer" runat="server" OnClick="btnPrint_Click">
+                                <f:Button ID="btnPrint" Text="预览" Icon="Printer" runat="server" OnClick="btnPrint_Click">
                                 </f:Button>
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出Word" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">

HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs

@@ -790,7 +790,7 @@ namespace FineUIPro.Web.JGZL
                         dt.Columns.Add("ConstructionUnit");
                         dt.Columns.Add("SpecialEquipmentProductionLicenseCode");
                         dt.Columns.Add("Remark");
-                        var report = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateByProjectId(projectId);
+                        var report = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateByProjectId(projectId, "2");
                         if (report != null)
                         {  
                             var newRow = dt.NewRow();