From b2f446f93d3779406594acbfc8e3fbb46ccb6249 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Wed, 16 Sep 2026 17:21:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?20260916=20=E7=AE=A1=E9=81=93=E5=AE=89?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-09-14_bwj.sql | 74 ++ .../版本日志/HJGLDB_DS_2026-09-16_bwj.sql | 7 + HJGL_DS/BLL/BLL.csproj | 2 + HJGL_DS/BLL/Common/Const.cs | 12 + HJGL_DS/BLL/JGZL/LeakageVacuumService.cs | 85 ++ .../BLL/JGZL/LeakageVacuumTestRecordServic.cs | 72 ++ ...系统泄漏性、真空试验条件确认与试验记录.frx | 285 ++++++ .../JGZL/管道系统泄漏性试验记录.frx | 4 +- .../JGZL/管道系统泄漏性试验记录导出模板.docx | Bin 0 -> 15913 bytes HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 8 + .../FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- ...lineInstallationQualityCertificate.aspx.cs | 10 +- ...rialPipelineQualityCertificate2020.aspx.cs | 7 + HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx | 225 +++++ .../FineUIPro.Web/JGZL/LeakageVacuum.aspx.cs | 817 ++++++++++++++++++ .../JGZL/LeakageVacuum.aspx.designer.cs | 341 ++++++++ .../JGZL/ModRepairQualityCertificate.aspx | 15 +- .../JGZL/ModRepairQualityCertificate.aspx.cs | 35 +- ...dRepairQualityCertificate.aspx.designer.cs | 40 +- HJGL_DS/FineUIPro.Web/Web.config | 2 +- HJGL_DS/Model/Model.cs | 764 ++++++++++++++++ HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +- 22 files changed, 2744 insertions(+), 65 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-09-14_bwj.sql create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-09-16_bwj.sql create mode 100644 HJGL_DS/BLL/JGZL/LeakageVacuumService.cs create mode 100644 HJGL_DS/BLL/JGZL/LeakageVacuumTestRecordServic.cs create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx create mode 100644 HJGL_DS/FineUIPro.Web/File/Word/JGZL/管道系统泄漏性试验记录导出模板.docx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs diff --git a/DataBase/版本日志/HJGLDB_DS_2026-09-14_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-09-14_bwj.sql new file mode 100644 index 0000000..61a765c --- /dev/null +++ b/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 \ No newline at end of file diff --git a/DataBase/版本日志/HJGLDB_DS_2026-09-16_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-09-16_bwj.sql new file mode 100644 index 0000000..e1badfb --- /dev/null +++ b/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 \ No newline at end of file diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index f1367b3..8a53395 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -266,6 +266,8 @@ + + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index fd17d98..86f5eac 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -1831,6 +1831,11 @@ namespace BLL /// public const string JGZL_BlowingCleaningMenuId = "E64FC226-8164-43F7-AA4D-6E268EDEC5BC"; + /// + /// 管道系统泄漏性/真空试验条件确认与试验记录 + /// + public const string JGZL_LeakageVacuumMenuId = "FF56CCBE-0B8C-4AF6-832E-EC6ED1584C94"; + /// /// 防腐工程质量验收记录 @@ -2625,6 +2630,11 @@ namespace BLL /// public const string JGZL_ArchivalTransferUrl = "File\\Word\\JGZL\\档案资料移交表导出模板.docx"; + /// + /// 管道系统泄漏性/真空试验条件确认与试验记录 + /// + public const string JGZL_LeakageVacuumUrl = "File\\Word\\JGZL\\管道系统泄漏性试验记录导出模板.docx"; + #endregion /// @@ -2636,5 +2646,7 @@ namespace BLL /// 焊缝返修台账导出模板 /// public const string HJGL_WeldRepairListsUrl = "File\\Excel\\焊缝返修台账导出模板.xlsx"; + + } } diff --git a/HJGL_DS/BLL/JGZL/LeakageVacuumService.cs b/HJGL_DS/BLL/JGZL/LeakageVacuumService.cs new file mode 100644 index 0000000..c0fd44e --- /dev/null +++ b/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 +{ + /// + /// 管道系统泄漏性/真空试验条件确认与试验记录 + /// + public class LeakageVacuumService + { + /// + /// 根据项目Id获取管道系统泄漏性/真空试验条件确认与试验记录 + /// + /// + /// + public static Model.JGZL_LeakageVacuum GetLeakageVacuumByProjectId(string projectId) + { + return Funs.DB.JGZL_LeakageVacuum.FirstOrDefault(e => e.ProjectId == projectId); + } + + /// + /// 添加获取管道系统泄漏性/真空试验条件确认与试验记录 + /// + /// + 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(); + } + + /// + /// 修改管道系统泄漏性/真空试验条件确认与试验记录 + /// + /// + 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(); + } + } + + /// + /// 根据主键删除管道系统泄漏性/真空试验条件确认与试验记录 + /// + /// + 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(); + } + } + } +} diff --git a/HJGL_DS/BLL/JGZL/LeakageVacuumTestRecordServic.cs b/HJGL_DS/BLL/JGZL/LeakageVacuumTestRecordServic.cs new file mode 100644 index 0000000..ab0f221 --- /dev/null +++ b/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 +{ + /// + /// 管道系统泄漏性/真空试验条件确认与试验记录 + /// + public class LeakageVacuumTestRecordServic + { + /// + /// 根据主键获取明细信息 + /// + /// + /// + public static List GetLeakageVacuumTestRecordByLeakageVacuumId(string leakageVacuumId) + { + return (from x in Funs.DB.JGZL_LeakageVacuumTestRecord where x.LeakageVacuumId == leakageVacuumId select x).ToList(); + } + + /// + /// 添加试验记录 + /// + /// + 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(); + } + + /// + /// 根据主键Id删除试验记录 + /// + /// + 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(); + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx new file mode 100644 index 0000000..880f831 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx @@ -0,0 +1,285 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + private void Table3_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + // print the table body + Table3.PrintRow(0); + Table3.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性试验记录.frx index 2a2cb0c..1cb41a1 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性试验记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性试验记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/管道系统泄漏性试验记录导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/管道系统泄漏性试验记录导出模板.docx new file mode 100644 index 0000000000000000000000000000000000000000..16286c1b8a5234ab66407e12d7b9195b37b09eba GIT binary patch literal 15913 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 literal 0 HcmV?d00001 diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 1f937f8..ea2bfce 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1408,6 +1408,7 @@ + @@ -7090,6 +7091,13 @@ InsulationAcceptanceRecordEdit.aspx + + LeakageVacuum.aspx + ASPXCodeBehind + + + LeakageVacuum.aspx + ModRepairQualityCertificate.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index e3436b8..6e29203 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs index dba223d..defdfa0 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs @@ -159,10 +159,16 @@ namespace FineUIPro.Web.JGZL else { this.CertificateId = string.Empty; - this.txtInstallationInspection.Text = "浙江省特种设备研究院"; + this.txtCertificateCode.Text = "0XXX-91330921MA2A2R3F6G-" + DateTime.Now.Year; + var insta = (from x in Funs.DB.Project_Installation where x.ProjectId == this.CurrUser.LoginProjectId select x).FirstOrDefault(); + if (insta != null) + { + this.txtDeliveryUnit.Text = insta.InstallationName; + this.txtDeliveryUnitCode.Text = insta.InstallationCode; + } + this.txtInstallationInspection.Text = "浙江省特种设备科学研究院"; this.txtConstructionUnit.Text = "浙江石油化工有限公司"; this.txtSpecialEquipmentProductionLicenseCode.Text = "TS3833339-2028"; - //this.txtRemark.Text = "GB50517-2023"; this.txtPipelineLength.Text = BLL.HJGL_PW_IsoInfoService.GetPipeLineLengthList(this.tvControlItem.SelectedNodeID).Value.ToString(".##"); } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs index 0687081..63165e4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs @@ -141,6 +141,13 @@ namespace FineUIPro.Web.JGZL else { this.CertificateId = string.Empty; + this.txtCertificateCode.Text = "0XXX-31330921MA2A2R3F6G-" + DateTime.Now.Year; + var insta = (from x in Funs.DB.Project_Installation where x.ProjectId == this.CurrUser.LoginProjectId select x).FirstOrDefault(); + if (insta != null) + { + this.txtDeliveryUnit.Text = insta.InstallationName; + this.txtDeliveryUnitCode.Text = insta.InstallationCode; + } this.txtInstallationInspection.Text = "浙江省特种设备科学研究院"; this.txtConstructionUnit.Text = "浙江石油化工有限公司"; this.txtSpecialEquipmentProductionLicenseCode.Text = "TS3833339-2028"; diff --git a/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx new file mode 100644 index 0000000..04be9f9 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx @@ -0,0 +1,225 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LeakageVacuum.aspx.cs" Inherits="FineUIPro.Web.JGZL.LeakageVacuum" %> + + + + + + + 管道系统泄漏性/真空试验条件确认与试验记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + + + --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.cs new file mode 100644 index 0000000..591bd50 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.cs @@ -0,0 +1,817 @@ +using Aspose.Words; +using Aspose.Words.Tables; +using BLL; +using FastReport.DevComponents.DotNetBar; +using Model; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.DirectoryServices.ActiveDirectory; +using System.IO; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JGZL +{ + public partial class LeakageVacuum : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string LeakageVacuumTestRecordId + { + get + { + return (string)ViewState["LeakageVacuumTestRecordId"]; + } + set + { + ViewState["LeakageVacuumTestRecordId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + /// + /// 外键—LeakageVacuumId + /// + public string LeakageVacuumId + { + get + { + return (string)ViewState["LeakageVacuumId"]; + } + set + { + ViewState["LeakageVacuumId"] = value; + } + } + + /// + /// 定义集合 + /// + private static List itemLists = new List(); + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + + this.drpProjectId.DataTextField = "ProjectCode"; + this.drpProjectId.DataValueField = "ProjectId"; + this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); + this.drpProjectId.DataBind(); + Funs.FineUIPleaseSelect(this.drpProjectId); + + this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; + this.InitTreeMenu();//加载树 + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.tvControlItem.SelectedNodeID; + + DataIsoInfo(); + } + } + + private void DataIsoInfo() + { + this.txtSystemCode.Text = string.Empty; + this.txtSystemName.Text = string.Empty; + this.drpCheckResult1.SelectedValue = "合格"; + this.drpCheckResult2.SelectedValue = "合格"; + this.drpCheckResult3.SelectedValue = "合格"; + this.drpCheckResult4.SelectedValue = "合格"; + this.drpCheckResult5.SelectedValue = "合格"; + itemLists.Clear(); + if (!string.IsNullOrEmpty(this.ProjectId)) + { + var record = BLL.LeakageVacuumService.GetLeakageVacuumByProjectId(this.ProjectId); + if (record != null) + { + this.LeakageVacuumId = record.LeakageVacuumId; + this.txtSystemCode.Text = record.SystemCode; + this.txtSystemName.Text = record.SystemName; + this.drpCheckResult1.SelectedValue = record.CheckItemResult1; + this.drpCheckResult2.SelectedValue = record.CheckItemResult2; + this.drpCheckResult3.SelectedValue = record.CheckItemResult3; + this.drpCheckResult4.SelectedValue = record.CheckItemResult4; + this.drpCheckResult5.SelectedValue = record.CheckItemResult5; + + var isoInfos = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId); + itemLists = BLL.LeakageVacuumTestRecordServic.GetLeakageVacuumTestRecordByLeakageVacuumId(this.LeakageVacuumId); + if (itemLists.Count > 0) + { + foreach (var item in isoInfos) + { + var iso = itemLists.Where(x => x.PipelineId != null && !string.IsNullOrEmpty(x.PipelineId) && x.PipelineId == item.ISO_ID).FirstOrDefault(); + if (iso == null) + { + Model.JGZL_LeakageVacuumTestRecord newIso = new JGZL_LeakageVacuumTestRecord(); + newIso.LeakageVacuumTestRecordId = SQLHelper.GetNewID(typeof(Model.JGZL_LeakageVacuumTestRecord)); + newIso.PipelineId = item.ISO_ID; + newIso.PipelineCode = item.ISO_IsoNo; + newIso.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##########") : ""; + newIso.DesignTem = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##########") : ""; + newIso.LeakPressure = item.LeakageTest.ToString(); + itemLists.Add(newIso); + } + } + } + else + { + foreach (var item in isoInfos) + { + Model.JGZL_LeakageVacuumTestRecord newItem = new JGZL_LeakageVacuumTestRecord(); + newItem.LeakageVacuumTestRecordId = SQLHelper.GetNewID(typeof(Model.JGZL_LeakageVacuumTestRecord)); + newItem.PipelineId = item.ISO_ID; + newItem.PipelineCode = item.ISO_IsoNo; + newItem.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##########") : ""; + newItem.DesignTem = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##########") : ""; + newItem.LeakPressure = item.LeakageTest.ToString(); + itemLists.Add(newItem); + } + } + this.Grid1.DataSource = itemLists; + this.Grid1.DataBind(); + } + } + } + #endregion + + #region 加载树项目 + /// + /// 加载树 + /// + private void InitTreeMenu() + { + this.tvControlItem.Nodes.Clear(); + TreeNode rootNode = new TreeNode(); + rootNode.Text = "项目"; + rootNode.ToolTip = "项目"; + rootNode.NodeID = "0"; + rootNode.Expanded = true; + this.tvControlItem.Nodes.Add(rootNode); + + List projects = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1"); + if (this.drpProjectId.SelectedValue != BLL.Const._Null) + { + projects = projects.Where(e => e.ProjectId == this.drpProjectId.SelectedValue).ToList(); + } + foreach (var item in projects) + { + TreeNode rootProjectNode = new TreeNode();//定义根节点 + rootProjectNode.Text = item.ProjectCode; + rootProjectNode.NodeID = item.ProjectId; + rootProjectNode.EnableClickEvent = true; + rootProjectNode.Expanded = true; + rootProjectNode.ToolTip = item.ProjectName; + rootProjectNode.CommandName = "项目名称"; + rootNode.Nodes.Add(rootProjectNode); + } + } + #endregion + + #region 点击TreeView + /// + /// 点击TreeView + /// + /// + /// + protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) + { + if (this.tvControlItem.SelectedNodeID != "0") + { + this.BindGrid(); + } + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid() + { + //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); + string strSql = @"SELECT * from JGZL_LeakageVacuumTestRecord m left join JGZL_LeakageVacuum b on b.LeakageVacuumId = m.LeakageVacuumId where 1=1"; + List listStr = new List(); + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + strSql += " AND b.ProjectId = @ProjectId"; + listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); + } + //else + //{ + // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; + // listStr.Add(new SqlParameter("@ProjectId", projectIds)); + //} + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + // 2.获取当前分页数据 + Grid1.RecordCount = tb.Rows.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, tb); + Grid1.DataSource = table; + Grid1.DataBind(); + } + #endregion + + #region 分页排序 + #region 页索引改变事件 + /// + /// 页索引改变事件 + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + #endregion + + #region 排序 + /// + /// 排序 + /// + /// + /// + protected void Grid1_Sort(object sender, GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + #region 分页选择下拉改变事件 + /// + /// 分页选择下拉改变事件 + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + #endregion + #endregion + + #region 查询 + /// + ///查询 + /// + /// + /// + protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) + { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.tvControlItem.SelectedNodeID; + this.InitTreeMenu(); + DataIsoInfo(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 维护 + /// + /// 增加 + /// + /// + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + JArray teamGroupData = Grid1.GetMergedData(); + List list = new List(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + list.Add(values); + } + + JObject defaultObj = new JObject + { + { "LeakageVacuumTestRecordId", Guid.NewGuid() }, + { "LeakageVacuumId", this.LeakageVacuumId }, + { "PipelineId", "" }, + { "PipelineCode", "" }, + { "DesignPressure", "" }, + { "DesignTem", "" }, + { "TestAmbientTemp", "" }, + { "TestMediumTemp", "" }, + { "LeakPressure", "" }, + { "LeakMedium", "" }, + { "VacuumPressure", "" }, + { "VacuumMedium", "" }, + { + "Delete3", + String.Format("", + GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) + } + }; + list.Add(defaultObj); + Grid1.DataSource = list; + Grid1.DataBind(); + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PressureTestOfPipelineSystemRecordEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + + protected void Grid1_PreDataBound(object sender, EventArgs e) + { + // 设置LinkButtonField的点击客户端事件 + LinkButtonField deleteField = Grid1.FindColumn("Delete3") as LinkButtonField; + deleteField.OnClientClick = GetDeleteScriptGrid1(); + } + + /// + /// 删除提示 + /// + /// + private string GetDeleteScriptGrid1() + { + return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, + Grid1.GetDeleteSelectedRowsReference(), String.Empty); + } + + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, + Const.JGZL_LeakageVacuumMenuId, Const.BtnSave)) + { + Model.JGZL_LeakageVacuum newRecord = new JGZL_LeakageVacuum(); + newRecord.SystemCode = this.txtSystemCode.Text; + newRecord.SystemName = this.txtSystemName.Text; + newRecord.CheckItemResult1 = this.drpCheckResult1.SelectedValue; + newRecord.CheckItemResult2 = this.drpCheckResult2.SelectedValue; + newRecord.CheckItemResult3 = this.drpCheckResult3.SelectedValue; + newRecord.CheckItemResult4 = this.drpCheckResult4.SelectedValue; + newRecord.CheckItemResult5 = this.drpCheckResult5.SelectedValue; + if (!string.IsNullOrEmpty(this.LeakageVacuumId)) + { + newRecord.LeakageVacuumId = this.LeakageVacuumId; + BLL.LeakageVacuumService.UpdateLeakageVacuum(newRecord); + } + else + { + newRecord.ProjectId = this.tvControlItem.SelectedNodeID; + newRecord.LeakageVacuumId = SQLHelper.GetNewID(typeof(Model.JGZL_LeakageVacuum)); + this.LeakageVacuumId = newRecord.LeakageVacuumId; + BLL.LeakageVacuumService.AddLeakageVacuum(newRecord); + } + saveItem(); + BindGrid(); + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + + void saveItem() + { + itemLists.Clear(); + BLL.LeakageVacuumTestRecordServic.DeleteLeakageVacuumTestRecordByLeakageVacuumId(this.LeakageVacuumId); + JArray teamGroupData = Grid1.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.JGZL_LeakageVacuumTestRecord newDetail = new Model.JGZL_LeakageVacuumTestRecord + { + LeakageVacuumTestRecordId = values.Value("LeakageVacuumTestRecordId"), + LeakageVacuumId = this.LeakageVacuumId, + PipelineId = values.Value("PipelineId"), + PipelineCode = values.Value("PipelineCode"), + DesignPressure = values.Value("DesignPressure"), + DesignTem = values.Value("DesignTem"), + TestAmbientTemp = values.Value("TestAmbientTemp"), + TestMediumTemp = values.Value("TestMediumTemp"), + LeakPressure = values.Value("LeakPressure"), + LeakMedium = values.Value("LeakMedium"), + VacuumPressure = values.Value("VacuumPressure"), + VacuumMedium = values.Value("VacuumMedium"), + }; + itemLists.Add(newDetail); + } + try + { + if (itemLists.Count > 0) + { + Funs.DB.JGZL_LeakageVacuumTestRecord.InsertAllOnSubmit(itemLists); + } + Funs.DB.SubmitChanges(); + } + catch (Exception) + { + return; + } + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + string projectId = this.tvControlItem.SelectedNodeID; + + if (projectId != null) + { + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); + + var report = BLL.LeakageVacuumService.GetLeakageVacuumByProjectId(projectId); + if (report != null) + { + DataTable dt = new DataTable(); + dt.TableName = "MainData"; + dt.Columns.Add("ProjectName"); + dt.Columns.Add("SystemName"); + dt.Columns.Add("SystemCode"); + dt.Columns.Add("CheckItemResult1"); + dt.Columns.Add("CheckItemResult2"); + dt.Columns.Add("CheckItemResult3"); + dt.Columns.Add("CheckItemResult4"); + dt.Columns.Add("CheckItemResult5"); + dt.Columns.Add("Conclusion"); + + var newRow = dt.NewRow(); + newRow["ProjectName"] = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName; + newRow["SystemName"] = this.txtSystemName.Text.Trim(); + newRow["SystemCode"] = this.txtSystemCode.Text.Trim(); + newRow["CheckItemResult1"] = report.CheckItemResult1; + newRow["CheckItemResult2"] = report.CheckItemResult2; + newRow["CheckItemResult3"] = report.CheckItemResult3; + newRow["CheckItemResult4"] = report.CheckItemResult4; + newRow["CheckItemResult5"] = report.CheckItemResult5; + newRow["Conclusion"] = report.Conclusion; + dt.Rows.Add(newRow); + BLL.Common.FastReportService.AddFastreportTable(dt); + + var recordLists = BLL.LeakageVacuumTestRecordServic.GetLeakageVacuumTestRecordByLeakageVacuumId(report.LeakageVacuumId); + if (recordLists.Count == Grid1.GetMergedData().Count) + { + DataTable itemdt = new DataTable(); + itemdt.TableName = "Data"; + itemdt.Columns.Add("PipelineNo"); + itemdt.Columns.Add("DesignPressure"); + itemdt.Columns.Add("DesignTem"); + itemdt.Columns.Add("TestAmbientTemp"); + itemdt.Columns.Add("TestMediumTemp"); + itemdt.Columns.Add("LeakPressure"); + itemdt.Columns.Add("LeakMedium"); + itemdt.Columns.Add("VacuumPressure"); + itemdt.Columns.Add("VacuumMedium"); + + foreach (var item in recordLists) + { + var newRow2 = itemdt.NewRow(); + newRow2["PipelineNo"] = item.PipelineCode; + newRow2["DesignPressure"] = item.DesignPressure; + newRow2["DesignTem"] = item.DesignTem; + newRow2["TestAmbientTemp"] = item.TestAmbientTemp; + newRow2["TestMediumTemp"] = item.TestMediumTemp; + newRow2["LeakPressure"] = item.LeakPressure; + newRow2["LeakMedium"] = item.LeakMedium; + newRow2["VacuumPressure"] = item.VacuumPressure; + newRow2["VacuumMedium"] = item.VacuumMedium; + itemdt.Rows.Add(newRow2); + } + BLL.Common.FastReportService.AddFastreportTable(itemdt); + + Dictionary keyValuePairs = new Dictionary(); + //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + initTemplatePath = "File\\Fastreport\\JGZL\\管道系统泄漏性、真空试验条件确认与试验记录.frx"; + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + } + } + else + { + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + #endregion + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = string.Empty; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + string filePath = string.Empty; + + //每页显示的固定数据行数 + int rowsPerPage = 8; + + string projectId = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(projectId)) + { + var report = BLL.LeakageVacuumService.GetLeakageVacuumByProjectId(projectId); + if (report != null) + { + initTemplatePath = Const.JGZL_LeakageVacuumUrl; + uploadfilepath = rootPath + initTemplatePath; + + newUrl = uploadfilepath.Replace("管道系统泄漏性试验记录导出模板", "管道系统泄漏性试验记录"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); + } + File.Copy(uploadfilepath, newUrl); + //更新书签内容 + Document doc = new Aspose.Words.Document(newUrl); + DocumentBuilder builder = new DocumentBuilder(doc); + + Aspose.Words.Tables.Table table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, 0, true); + + Bookmark projectName = doc.Range.Bookmarks["ProjectName"]; + if (projectName != null) + { + projectName.Text = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName; + } + Bookmark systemName = doc.Range.Bookmarks["SystemName"]; + if (systemName != null) + { + systemName.Text = report.SystemName; + } + Bookmark systemCode = doc.Range.Bookmarks["SystemCode"]; + if (systemCode != null) + { + systemCode.Text = report.SystemCode; + } + Bookmark checkItemResult1 = doc.Range.Bookmarks["CheckItemResult1"]; + if (checkItemResult1 != null) + { + checkItemResult1.Text = report.CheckItemResult1; + } + Bookmark checkItemResult2 = doc.Range.Bookmarks["CheckItemResult2"]; + if (checkItemResult2 != null) + { + checkItemResult2.Text = report.CheckItemResult2; + } + Bookmark checkItemResult3 = doc.Range.Bookmarks["CheckItemResult3"]; + if (checkItemResult3 != null) + { + checkItemResult3.Text = report.CheckItemResult3; + } + Bookmark checkItemResult4 = doc.Range.Bookmarks["CheckItemResult4"]; + if (checkItemResult4 != null) + { + checkItemResult4.Text = report.CheckItemResult4; + } + Bookmark checkItemResult5 = doc.Range.Bookmarks["CheckItemResult5"]; + if (checkItemResult5 != null) + { + checkItemResult5.Text = report.CheckItemResult5; + } + + // 设置表头行重复显示 + table.Rows[0].RowFormat.HeadingFormat = true; + table.Rows[1].RowFormat.HeadingFormat = true; + table.Rows[2].RowFormat.HeadingFormat = true; + table.Rows[3].RowFormat.HeadingFormat = true; + table.Rows[4].RowFormat.HeadingFormat = true; + table.Rows[5].RowFormat.HeadingFormat = true; + table.Rows[6].RowFormat.HeadingFormat = true; + table.Rows[7].RowFormat.HeadingFormat = true; + table.Rows[8].RowFormat.HeadingFormat = true; + table.Rows[9].RowFormat.HeadingFormat = true; + table.Rows[10].RowFormat.HeadingFormat = true; + + // ====固定表格布局===== + table.AutoFit(AutoFitBehavior.FixedColumnWidths); + table.AllowAutoFit = false; + table.Alignment = TableAlignment.Center; + + // 先记录页尾行，并从表格中移除 + //Row footerRow = table.Rows[table.Rows.Count - 1]; + //table.Rows.RemoveAt(table.Rows.Count - 1); + + var recordLists = BLL.LeakageVacuumTestRecordServic.GetLeakageVacuumTestRecordByLeakageVacuumId(report.LeakageVacuumId); + if (recordLists.Count == Grid1.GetMergedData().Count) + { + int i = 0; + foreach (var item in recordLists) + { + //创建行 + Aspose.Words.Tables.Row row = new Aspose.Words.Tables.Row(doc); + row.Cells.Add(CreateCell(item.PipelineCode, doc, 128.42, "", ""));//管道编号/单线号 + row.Cells.Add(CreateCell(item.DesignPressure, doc, 35.72, "", ""));//设计压力 + row.Cells.Add(CreateCell(item.DesignTem, doc, 41.96, "", ""));//设计温度 + row.Cells.Add(CreateCell(item.TestAmbientTemp, doc, 52.73, "", ""));//试验环境温度℃ + row.Cells.Add(CreateCell(item.TestMediumTemp, doc, 41.96, "", ""));//试验介质温度℃ + row.Cells.Add(CreateCell(item.LeakPressure, doc, 39.4, "", ""));//泄漏性试验-压力 + row.Cells.Add(CreateCell(item.LeakMedium, doc, 41.96, "", ""));//泄漏性试验-介质 + row.Cells.Add(CreateCell(item.VacuumPressure, doc, 45.07, "", ""));//真空试验-压力 + row.Cells.Add(CreateCell(item.VacuumMedium, doc, 41.39, "", ""));//真空试验-介质 + + table.Rows.Insert(i + 11, row); + } + + // 计算并插入空白行，填满整页 + // 计算总数据行数 + int totalDataRows = recordLists.Count; + // 计算需要补充的空白行数量 + int remainder = totalDataRows % rowsPerPage; + int needBlankRows = remainder == 0 ? 0 : rowsPerPage - remainder; + + // 插入空白行（和数据行格式保持一致，仅内容为空） + //for (int i = 0; i < needBlankRows - 1; i++) + //{ + // Aspose.Words.Tables.Row blankRow = new Aspose.Words.Tables.Row(doc); + // 空白行的单元格宽度和数据行保持一致 + //blankRow.Cells.Add(CreateCell("", doc, 22.68, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 65.49, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 37.14, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 27.78, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 28.06, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 28, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 34.87, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 43.66, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 59.82, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 34.58, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 33.74, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 27, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 45.93, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 37.14, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 30.62, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 48.76, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 25.23, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 28.92, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 48.76, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 26.08, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 56.7, "", "")); + //blankRow.Cells.Add(CreateCell("", doc, 22.11, "", "")); + // 插入到表格最后一行 + // table.Rows.Add(blankRow); + //} + //把页尾行重新加回表格最后 + //table.Rows.Add(footerRow); + + doc.Save(newUrl); + } + else + { + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; + } + + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); + } + else + { + Alert.ShowInTop("没有要导出的数据！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + + public static Cell CreateCell(String value, Document doc, double cellWidth, string cellMerge = "", string CenterPage = "", string cellUnitLeft = "") + { + Cell cell = new Cell(doc); + Paragraph p = new Paragraph(doc); + if (!string.IsNullOrEmpty(cellMerge)) + { + if (cellMerge == "0") + { + cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.First;//竖直方向合并的第一个单元格 + } + else + { + cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.Previous;//竖直方向合并的第一个单元格 + } + + } + else + { + cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; + } + if (!string.IsNullOrEmpty(CenterPage)) + { + //序号 + value = " " + value; + } + if (!string.IsNullOrEmpty(cellUnitLeft)) + { + p.ParagraphFormat.Alignment = ParagraphAlignment.Left;//表格中字体居左 + } + else + { + p.ParagraphFormat.Alignment = ParagraphAlignment.Center;//表格中字体居中 + } + + + p.AppendChild(new Run(doc, value)); + + cell.CellFormat.Width = cellWidth; + + cell.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center; + + cell.CellFormat.Borders.LineWidth = 0.75; + + cell.AppendChild(p); + return cell; + } + + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs new file mode 100644 index 0000000..16b8b8a --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs @@ -0,0 +1,341 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class LeakageVacuum + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// panelLeftRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelLeftRegion; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// drpProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpProjectId; + + /// + /// tvControlItem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvControlItem; + + /// + /// panelCenterRegion 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel panelCenterRegion; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnAdd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAdd; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtSystemName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSystemName; + + /// + /// txtSystemCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSystemCode; + + /// + /// drpCheckResult1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckResult1; + + /// + /// drpCheckResult2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckResult2; + + /// + /// drpCheckResult3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckResult3; + + /// + /// drpCheckResult4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckResult4; + + /// + /// drpCheckResult5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCheckResult5; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// txtPipelineCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPipelineCode; + + /// + /// txtDesignPressure 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDesignPressure; + + /// + /// txtDesignTem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDesignTem; + + /// + /// txtTestAmbientTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTestAmbientTemp; + + /// + /// txtTestMediumTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTestMediumTemp; + + /// + /// txtLeakPressure 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtLeakPressure; + + /// + /// txtLeakMedium 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtLeakMedium; + + /// + /// txtVacuumPressure 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtVacuumPressure; + + /// + /// txtVacuumMedium 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtVacuumMedium; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx index e37c8ec..5b13c26 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx @@ -81,16 +81,21 @@ - + - + <%----%> + + + + + - + @@ -138,7 +143,7 @@ - + <%-- @@ -149,7 +154,7 @@ - + --%> <%-- - /// txtPipeCategory 控件。 + /// drpPipeCategory 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtPipeCategory; + protected global::FineUIPro.DropDownList drpPipeCategory; /// /// cblConCategory 控件。 @@ -347,42 +347,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.DatePicker txtCompletionDate; - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label2; - - /// - /// txtQC_Inspector 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtQC_Inspector; - - /// - /// Label3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label3; - - /// - /// txtQA_Engineer 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtQA_Engineer; - /// /// WindowPrint 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 3c98f31..557f12f 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 449453e..8f1b68e 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -431,6 +431,12 @@ namespace Model partial void InsertJGZL_InsulationAcceptanceRecordItem(JGZL_InsulationAcceptanceRecordItem instance); partial void UpdateJGZL_InsulationAcceptanceRecordItem(JGZL_InsulationAcceptanceRecordItem instance); partial void DeleteJGZL_InsulationAcceptanceRecordItem(JGZL_InsulationAcceptanceRecordItem instance); + partial void InsertJGZL_LeakageVacuum(JGZL_LeakageVacuum instance); + partial void UpdateJGZL_LeakageVacuum(JGZL_LeakageVacuum instance); + partial void DeleteJGZL_LeakageVacuum(JGZL_LeakageVacuum instance); + partial void InsertJGZL_LeakageVacuumTestRecord(JGZL_LeakageVacuumTestRecord instance); + partial void UpdateJGZL_LeakageVacuumTestRecord(JGZL_LeakageVacuumTestRecord instance); + partial void DeleteJGZL_LeakageVacuumTestRecord(JGZL_LeakageVacuumTestRecord instance); partial void InsertJGZL_LeakTestOfPipelineSystemRecord(JGZL_LeakTestOfPipelineSystemRecord instance); partial void UpdateJGZL_LeakTestOfPipelineSystemRecord(JGZL_LeakTestOfPipelineSystemRecord instance); partial void DeleteJGZL_LeakTestOfPipelineSystemRecord(JGZL_LeakTestOfPipelineSystemRecord instance); @@ -2084,6 +2090,22 @@ namespace Model } } + public System.Data.Linq.Table JGZL_LeakageVacuum + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table JGZL_LeakageVacuumTestRecord + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table JGZL_LeakTestOfPipelineSystemRecord { get @@ -5011,6 +5033,8 @@ namespace Model private EntitySet _JGZL_InsulationAcceptanceRecord; + private EntitySet _JGZL_LeakageVacuum; + private EntitySet _JGZL_LeakTestOfPipelineSystemRecord; private EntitySet _JGZL_MaterialIdentificationInspectionRecord; @@ -5210,6 +5234,7 @@ namespace Model this._JGZL_IndustrialPipelineInstallationQualityCertificate = new EntitySet(new Action(this.attach_JGZL_IndustrialPipelineInstallationQualityCertificate), new Action(this.detach_JGZL_IndustrialPipelineInstallationQualityCertificate)); this._JGZL_IndustrialPipelineInstallationSummary = new EntitySet(new Action(this.attach_JGZL_IndustrialPipelineInstallationSummary), new Action(this.detach_JGZL_IndustrialPipelineInstallationSummary)); this._JGZL_InsulationAcceptanceRecord = new EntitySet(new Action(this.attach_JGZL_InsulationAcceptanceRecord), new Action(this.detach_JGZL_InsulationAcceptanceRecord)); + this._JGZL_LeakageVacuum = new EntitySet(new Action(this.attach_JGZL_LeakageVacuum), new Action(this.detach_JGZL_LeakageVacuum)); this._JGZL_LeakTestOfPipelineSystemRecord = new EntitySet(new Action(this.attach_JGZL_LeakTestOfPipelineSystemRecord), new Action(this.detach_JGZL_LeakTestOfPipelineSystemRecord)); this._JGZL_MaterialIdentificationInspectionRecord = new EntitySet(new Action(this.attach_JGZL_MaterialIdentificationInspectionRecord), new Action(this.detach_JGZL_MaterialIdentificationInspectionRecord)); this._JGZL_MaterialQualityCertificateDoc = new EntitySet(new Action(this.attach_JGZL_MaterialQualityCertificateDoc), new Action(this.detach_JGZL_MaterialQualityCertificateDoc)); @@ -6540,6 +6565,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_LeakageVacuum_Base_Project", Storage="_JGZL_LeakageVacuum", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet JGZL_LeakageVacuum + { + get + { + return this._JGZL_LeakageVacuum; + } + set + { + this._JGZL_LeakageVacuum.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_LeakTestOfPipelineSystemRecord_Base_Project", Storage="_JGZL_LeakTestOfPipelineSystemRecord", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet JGZL_LeakTestOfPipelineSystemRecord { @@ -7742,6 +7780,18 @@ namespace Model entity.Base_Project = null; } + private void attach_JGZL_LeakageVacuum(JGZL_LeakageVacuum entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_JGZL_LeakageVacuum(JGZL_LeakageVacuum entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_JGZL_LeakTestOfPipelineSystemRecord(JGZL_LeakTestOfPipelineSystemRecord entity) { this.SendPropertyChanging(); @@ -90909,6 +90959,720 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_LeakageVacuum")] + public partial class JGZL_LeakageVacuum : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _LeakageVacuumId; + + private string _ProjectId; + + private string _SystemName; + + private string _SystemCode; + + private string _CheckItemResult1; + + private string _CheckItemResult2; + + private string _CheckItemResult3; + + private string _CheckItemResult4; + + private string _CheckItemResult5; + + private string _Conclusion; + + private EntityRef _Base_Project; + + private EntitySet _JGZL_LeakageVacuumTestRecord; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnLeakageVacuumIdChanging(string value); + partial void OnLeakageVacuumIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnSystemNameChanging(string value); + partial void OnSystemNameChanged(); + partial void OnSystemCodeChanging(string value); + partial void OnSystemCodeChanged(); + partial void OnCheckItemResult1Changing(string value); + partial void OnCheckItemResult1Changed(); + partial void OnCheckItemResult2Changing(string value); + partial void OnCheckItemResult2Changed(); + partial void OnCheckItemResult3Changing(string value); + partial void OnCheckItemResult3Changed(); + partial void OnCheckItemResult4Changing(string value); + partial void OnCheckItemResult4Changed(); + partial void OnCheckItemResult5Changing(string value); + partial void OnCheckItemResult5Changed(); + partial void OnConclusionChanging(string value); + partial void OnConclusionChanged(); + #endregion + + public JGZL_LeakageVacuum() + { + this._Base_Project = default(EntityRef); + this._JGZL_LeakageVacuumTestRecord = new EntitySet(new Action(this.attach_JGZL_LeakageVacuumTestRecord), new Action(this.detach_JGZL_LeakageVacuumTestRecord)); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeakageVacuumId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string LeakageVacuumId + { + get + { + return this._LeakageVacuumId; + } + set + { + if ((this._LeakageVacuumId != value)) + { + this.OnLeakageVacuumIdChanging(value); + this.SendPropertyChanging(); + this._LeakageVacuumId = value; + this.SendPropertyChanged("LeakageVacuumId"); + this.OnLeakageVacuumIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemName", DbType="NVarChar(50)")] + public string SystemName + { + get + { + return this._SystemName; + } + set + { + if ((this._SystemName != value)) + { + this.OnSystemNameChanging(value); + this.SendPropertyChanging(); + this._SystemName = value; + this.SendPropertyChanged("SystemName"); + this.OnSystemNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemCode", DbType="NVarChar(50)")] + public string SystemCode + { + get + { + return this._SystemCode; + } + set + { + if ((this._SystemCode != value)) + { + this.OnSystemCodeChanging(value); + this.SendPropertyChanging(); + this._SystemCode = value; + this.SendPropertyChanged("SystemCode"); + this.OnSystemCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemResult1", DbType="NVarChar(50)")] + public string CheckItemResult1 + { + get + { + return this._CheckItemResult1; + } + set + { + if ((this._CheckItemResult1 != value)) + { + this.OnCheckItemResult1Changing(value); + this.SendPropertyChanging(); + this._CheckItemResult1 = value; + this.SendPropertyChanged("CheckItemResult1"); + this.OnCheckItemResult1Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemResult2", DbType="NVarChar(50)")] + public string CheckItemResult2 + { + get + { + return this._CheckItemResult2; + } + set + { + if ((this._CheckItemResult2 != value)) + { + this.OnCheckItemResult2Changing(value); + this.SendPropertyChanging(); + this._CheckItemResult2 = value; + this.SendPropertyChanged("CheckItemResult2"); + this.OnCheckItemResult2Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemResult3", DbType="NVarChar(50)")] + public string CheckItemResult3 + { + get + { + return this._CheckItemResult3; + } + set + { + if ((this._CheckItemResult3 != value)) + { + this.OnCheckItemResult3Changing(value); + this.SendPropertyChanging(); + this._CheckItemResult3 = value; + this.SendPropertyChanged("CheckItemResult3"); + this.OnCheckItemResult3Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemResult4", DbType="NVarChar(50)")] + public string CheckItemResult4 + { + get + { + return this._CheckItemResult4; + } + set + { + if ((this._CheckItemResult4 != value)) + { + this.OnCheckItemResult4Changing(value); + this.SendPropertyChanging(); + this._CheckItemResult4 = value; + this.SendPropertyChanged("CheckItemResult4"); + this.OnCheckItemResult4Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckItemResult5", DbType="NVarChar(50)")] + public string CheckItemResult5 + { + get + { + return this._CheckItemResult5; + } + set + { + if ((this._CheckItemResult5 != value)) + { + this.OnCheckItemResult5Changing(value); + this.SendPropertyChanging(); + this._CheckItemResult5 = value; + this.SendPropertyChanged("CheckItemResult5"); + this.OnCheckItemResult5Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Conclusion", DbType="NVarChar(500)")] + public string Conclusion + { + get + { + return this._Conclusion; + } + set + { + if ((this._Conclusion != value)) + { + this.OnConclusionChanging(value); + this.SendPropertyChanging(); + this._Conclusion = value; + this.SendPropertyChanged("Conclusion"); + this.OnConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_LeakageVacuum_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.JGZL_LeakageVacuum.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.JGZL_LeakageVacuum.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_LeakageVacuumTestRecord_JGZL_LeakageVacuum", Storage="_JGZL_LeakageVacuumTestRecord", ThisKey="LeakageVacuumId", OtherKey="LeakageVacuumId", DeleteRule="NO ACTION")] + public EntitySet JGZL_LeakageVacuumTestRecord + { + get + { + return this._JGZL_LeakageVacuumTestRecord; + } + set + { + this._JGZL_LeakageVacuumTestRecord.Assign(value); + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + + private void attach_JGZL_LeakageVacuumTestRecord(JGZL_LeakageVacuumTestRecord entity) + { + this.SendPropertyChanging(); + entity.JGZL_LeakageVacuum = this; + } + + private void detach_JGZL_LeakageVacuumTestRecord(JGZL_LeakageVacuumTestRecord entity) + { + this.SendPropertyChanging(); + entity.JGZL_LeakageVacuum = null; + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_LeakageVacuumTestRecord")] + public partial class JGZL_LeakageVacuumTestRecord : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _LeakageVacuumTestRecordId; + + private string _LeakageVacuumId; + + private string _PipelineId; + + private string _PipelineCode; + + private string _DesignPressure; + + private string _DesignTem; + + private string _TestAmbientTemp; + + private string _TestMediumTemp; + + private string _LeakPressure; + + private string _LeakMedium; + + private string _VacuumPressure; + + private string _VacuumMedium; + + private EntityRef _JGZL_LeakageVacuum; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnLeakageVacuumTestRecordIdChanging(string value); + partial void OnLeakageVacuumTestRecordIdChanged(); + partial void OnLeakageVacuumIdChanging(string value); + partial void OnLeakageVacuumIdChanged(); + partial void OnPipelineIdChanging(string value); + partial void OnPipelineIdChanged(); + partial void OnPipelineCodeChanging(string value); + partial void OnPipelineCodeChanged(); + partial void OnDesignPressureChanging(string value); + partial void OnDesignPressureChanged(); + partial void OnDesignTemChanging(string value); + partial void OnDesignTemChanged(); + partial void OnTestAmbientTempChanging(string value); + partial void OnTestAmbientTempChanged(); + partial void OnTestMediumTempChanging(string value); + partial void OnTestMediumTempChanged(); + partial void OnLeakPressureChanging(string value); + partial void OnLeakPressureChanged(); + partial void OnLeakMediumChanging(string value); + partial void OnLeakMediumChanged(); + partial void OnVacuumPressureChanging(string value); + partial void OnVacuumPressureChanged(); + partial void OnVacuumMediumChanging(string value); + partial void OnVacuumMediumChanged(); + #endregion + + public JGZL_LeakageVacuumTestRecord() + { + this._JGZL_LeakageVacuum = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeakageVacuumTestRecordId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string LeakageVacuumTestRecordId + { + get + { + return this._LeakageVacuumTestRecordId; + } + set + { + if ((this._LeakageVacuumTestRecordId != value)) + { + this.OnLeakageVacuumTestRecordIdChanging(value); + this.SendPropertyChanging(); + this._LeakageVacuumTestRecordId = value; + this.SendPropertyChanged("LeakageVacuumTestRecordId"); + this.OnLeakageVacuumTestRecordIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeakageVacuumId", DbType="NVarChar(50)")] + public string LeakageVacuumId + { + get + { + return this._LeakageVacuumId; + } + set + { + if ((this._LeakageVacuumId != value)) + { + if (this._JGZL_LeakageVacuum.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnLeakageVacuumIdChanging(value); + this.SendPropertyChanging(); + this._LeakageVacuumId = value; + this.SendPropertyChanged("LeakageVacuumId"); + this.OnLeakageVacuumIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")] + public string PipelineId + { + get + { + return this._PipelineId; + } + set + { + if ((this._PipelineId != value)) + { + this.OnPipelineIdChanging(value); + this.SendPropertyChanging(); + this._PipelineId = value; + this.SendPropertyChanged("PipelineId"); + this.OnPipelineIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(50)")] + public string PipelineCode + { + get + { + return this._PipelineCode; + } + set + { + if ((this._PipelineCode != value)) + { + this.OnPipelineCodeChanging(value); + this.SendPropertyChanging(); + this._PipelineCode = value; + this.SendPropertyChanged("PipelineCode"); + this.OnPipelineCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignPressure", DbType="NVarChar(50)")] + public string DesignPressure + { + get + { + return this._DesignPressure; + } + set + { + if ((this._DesignPressure != value)) + { + this.OnDesignPressureChanging(value); + this.SendPropertyChanging(); + this._DesignPressure = value; + this.SendPropertyChanged("DesignPressure"); + this.OnDesignPressureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignTem", DbType="NVarChar(50)")] + public string DesignTem + { + get + { + return this._DesignTem; + } + set + { + if ((this._DesignTem != value)) + { + this.OnDesignTemChanging(value); + this.SendPropertyChanging(); + this._DesignTem = value; + this.SendPropertyChanged("DesignTem"); + this.OnDesignTemChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestAmbientTemp", DbType="NVarChar(50)")] + public string TestAmbientTemp + { + get + { + return this._TestAmbientTemp; + } + set + { + if ((this._TestAmbientTemp != value)) + { + this.OnTestAmbientTempChanging(value); + this.SendPropertyChanging(); + this._TestAmbientTemp = value; + this.SendPropertyChanged("TestAmbientTemp"); + this.OnTestAmbientTempChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestMediumTemp", DbType="NVarChar(50)")] + public string TestMediumTemp + { + get + { + return this._TestMediumTemp; + } + set + { + if ((this._TestMediumTemp != value)) + { + this.OnTestMediumTempChanging(value); + this.SendPropertyChanging(); + this._TestMediumTemp = value; + this.SendPropertyChanged("TestMediumTemp"); + this.OnTestMediumTempChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeakPressure", DbType="NVarChar(50)")] + public string LeakPressure + { + get + { + return this._LeakPressure; + } + set + { + if ((this._LeakPressure != value)) + { + this.OnLeakPressureChanging(value); + this.SendPropertyChanging(); + this._LeakPressure = value; + this.SendPropertyChanged("LeakPressure"); + this.OnLeakPressureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LeakMedium", DbType="NVarChar(50)")] + public string LeakMedium + { + get + { + return this._LeakMedium; + } + set + { + if ((this._LeakMedium != value)) + { + this.OnLeakMediumChanging(value); + this.SendPropertyChanging(); + this._LeakMedium = value; + this.SendPropertyChanged("LeakMedium"); + this.OnLeakMediumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VacuumPressure", DbType="NVarChar(50)")] + public string VacuumPressure + { + get + { + return this._VacuumPressure; + } + set + { + if ((this._VacuumPressure != value)) + { + this.OnVacuumPressureChanging(value); + this.SendPropertyChanging(); + this._VacuumPressure = value; + this.SendPropertyChanged("VacuumPressure"); + this.OnVacuumPressureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VacuumMedium", DbType="NVarChar(50)")] + public string VacuumMedium + { + get + { + return this._VacuumMedium; + } + set + { + if ((this._VacuumMedium != value)) + { + this.OnVacuumMediumChanging(value); + this.SendPropertyChanging(); + this._VacuumMedium = value; + this.SendPropertyChanged("VacuumMedium"); + this.OnVacuumMediumChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_LeakageVacuumTestRecord_JGZL_LeakageVacuum", Storage="_JGZL_LeakageVacuum", ThisKey="LeakageVacuumId", OtherKey="LeakageVacuumId", IsForeignKey=true)] + public JGZL_LeakageVacuum JGZL_LeakageVacuum + { + get + { + return this._JGZL_LeakageVacuum.Entity; + } + set + { + JGZL_LeakageVacuum previousValue = this._JGZL_LeakageVacuum.Entity; + if (((previousValue != value) + || (this._JGZL_LeakageVacuum.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._JGZL_LeakageVacuum.Entity = null; + previousValue.JGZL_LeakageVacuumTestRecord.Remove(this); + } + this._JGZL_LeakageVacuum.Entity = value; + if ((value != null)) + { + value.JGZL_LeakageVacuumTestRecord.Add(this); + this._LeakageVacuumId = value.LeakageVacuumId; + } + else + { + this._LeakageVacuumId = default(string); + } + this.SendPropertyChanged("JGZL_LeakageVacuum"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_LeakTestOfPipelineSystemRecord")] public partial class JGZL_LeakTestOfPipelineSystemRecord : INotifyPropertyChanging, INotifyPropertyChanged { diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 8cd7f1f..ef14066 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile true From b4874d3399ba8cc533a65ad2dc5c6a4e89471b9e Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 17 Sep 2026 08:31:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?20260917=20=E7=AE=A1=E9=81=93=E5=AE=89?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user | 4 ++-- ...dustrialPipelineInstallationQualityCertificate.aspx.cs | 8 ++++++-- .../JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs | 6 +++++- HJGL_DS/FineUIPro.Web/Web.config | 4 ++-- HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index abef49a..e3436b8 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,8 +1,8 @@ - + true - Debug|Any CPU + Release|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs index defdfa0..821eb08 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineInstallationQualityCertificate.aspx.cs @@ -169,8 +169,12 @@ namespace FineUIPro.Web.JGZL this.txtInstallationInspection.Text = "浙江省特种设备科学研究院"; this.txtConstructionUnit.Text = "浙江石油化工有限公司"; this.txtSpecialEquipmentProductionLicenseCode.Text = "TS3833339-2028"; - this.txtPipelineLength.Text = BLL.HJGL_PW_IsoInfoService.GetPipeLineLengthList(this.tvControlItem.SelectedNodeID).Value.ToString(".##"); - } + var pipeLineLength = BLL.HJGL_PW_IsoInfoService.GetPipeLineLengthList(this.tvControlItem.SelectedNodeID); + if (pipeLineLength != null) + { + this.txtPipelineLength.Text = pipeLineLength.Value.ToString(".##"); + } + } } } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs index 63165e4..ac22b8b 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/IndustrialPipelineQualityCertificate2020.aspx.cs @@ -151,7 +151,11 @@ namespace FineUIPro.Web.JGZL this.txtInstallationInspection.Text = "浙江省特种设备科学研究院"; this.txtConstructionUnit.Text = "浙江石油化工有限公司"; this.txtSpecialEquipmentProductionLicenseCode.Text = "TS3833339-2028"; - this.txtPipelineLength.Text = BLL.HJGL_PW_IsoInfoService.GetPipeLineLengthList(this.tvControlItem.SelectedNodeID).Value.ToString(".##"); + var pipeLineLength = BLL.HJGL_PW_IsoInfoService.GetPipeLineLengthList(this.tvControlItem.SelectedNodeID); + if (pipeLineLength != null) + { + this.txtPipelineLength.Text = pipeLineLength.Value.ToString(".##"); + } } } } diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index f469b13..3c98f31 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index ef14066..8cd7f1f 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Debug|Any CPU + Release|Any CPU FolderProfile true From 5a8271ef135e33e9608107d6707dbd031716bb6a Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 17 Sep 2026 13:18:56 +0800 Subject: [PATCH 3/5] 20260917 1 --- .../JGZL/ModRepairQualityCertificate.aspx.cs | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs index f3a2394..7fe67fd 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs @@ -801,16 +801,16 @@ namespace FineUIPro.Web.JGZL { completionDate.Text = report.CompletionDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.CompletionDate) : ""; } - Bookmark inspector = doc.Range.Bookmarks["QC_Inspector"]; - if (inspector != null) - { - inspector.Text = report.QC_Inspector; - } - Bookmark engineer = doc.Range.Bookmarks["QA_Engineer"]; - if (engineer != null) - { - engineer.Text = report.QA_Engineer; - } + //Bookmark inspector = doc.Range.Bookmarks["QC_Inspector"]; + //if (inspector != null) + //{ + // inspector.Text = report.QC_Inspector; + //} + //Bookmark engineer = doc.Range.Bookmarks["QA_Engineer"]; + //if (engineer != null) + //{ + // engineer.Text = report.QA_Engineer; + //} doc.Save(newUrl); From 2a50577412add317da9b2b4fe13bf1087dcecdc1 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 17 Sep 2026 14:50:16 +0800 Subject: [PATCH 4/5] 20260917 --- .../JGZL/ModRepairQualityCertificate.aspx.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs index 7fe67fd..3f67d6e 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ModRepairQualityCertificate.aspx.cs @@ -150,7 +150,13 @@ namespace FineUIPro.Web.JGZL this.txtNotificationCode.Text = "0XXX-91330921MA2A2R3F6G-" + DateTime.Now.Year; this.txtUseUnit.Text = "浙江石油化工有限公司"; this.txtUseUSCC.Text = "913309003440581426"; - this.txtUseAddress.Text = pro.ProjectName; + string installationName = string.Empty; + var install = Funs.DB.Project_Installation.FirstOrDefault(x => x.ProjectId == projectId); + if(install!=null) + { + installationName = install.InstallationName; + } + this.txtUseAddress.Text = "浙江石油化工有限公司4000万吨/年炼化本项目" + installationName; this.txtModRepairProject.Text = "压力管道(" + pro.ProjectName + ")"; } } From 2b3539cd85d268a9748b7121860b16c01aa6f040 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 18 Sep 2026 11:31:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?20260918=20=E7=AE=A1=E9=81=93=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=B3=84=E6=BC=8F=E6=80=A7=E8=AF=95=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...系统泄漏性、真空试验条件确认与试验记录.frx | 4 +- .../JGZL/管道系统泄漏性试验记录导出模板.docx | Bin 15913 -> 16256 bytes HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx | 122 +++--- .../FineUIPro.Web/JGZL/LeakageVacuum.aspx.cs | 351 +++++++++--------- .../JGZL/LeakageVacuum.aspx.designer.cs | 18 + 5 files changed, 255 insertions(+), 240 deletions(-) diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx index 880f831..9436882 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性、真空试验条件确认与试验记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Word/JGZL/管道系统泄漏性试验记录导出模板.docx b/HJGL_DS/FineUIPro.Web/File/Word/JGZL/管道系统泄漏性试验记录导出模板.docx index 16286c1b8a5234ab66407e12d7b9195b37b09eba..69f35f5d9f00b4427f9f51ffde2c01b66f8ab183 100644 GIT binary patch delta 7392 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 f|MS59-tezD4Z#1`?cbGv2oyn*4)s{+r`$^ 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 diff --git a/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx index 04be9f9..e83cbd7 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx @@ -45,7 +45,7 @@ @@ -62,62 +62,74 @@ - - - <%-- - - - --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- - - - --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0) { @@ -143,7 +143,7 @@ namespace FineUIPro.Web.JGZL } } else - { + { foreach (var item in isoInfos) { Model.JGZL_LeakageVacuumTestRecord newItem = new JGZL_LeakageVacuumTestRecord(); @@ -156,9 +156,23 @@ namespace FineUIPro.Web.JGZL itemLists.Add(newItem); } } - this.Grid1.DataSource = itemLists; - this.Grid1.DataBind(); } + else + { + foreach (var item in isoInfos) + { + Model.JGZL_LeakageVacuumTestRecord newItem = new JGZL_LeakageVacuumTestRecord(); + newItem.LeakageVacuumTestRecordId = SQLHelper.GetNewID(typeof(Model.JGZL_LeakageVacuumTestRecord)); + newItem.PipelineId = item.ISO_ID; + newItem.PipelineCode = item.ISO_IsoNo; + newItem.DesignPressure = item.ISO_DesignPress.HasValue ? item.ISO_DesignPress.Value.ToString("0.##########") : ""; + newItem.DesignTem = item.ISO_DesignTemperature.HasValue ? item.ISO_DesignTemperature.Value.ToString("0.##########") : ""; + newItem.LeakPressure = item.LeakageTest.ToString(); + itemLists.Add(newItem); + } + } + this.Grid1.DataSource = itemLists; + this.Grid1.DataBind(); } } #endregion @@ -579,192 +593,163 @@ namespace FineUIPro.Web.JGZL protected void btnOut_Click(object sender, EventArgs e) { string rootPath = Server.MapPath("~/"); - string initTemplatePath = string.Empty; - string uploadfilepath = string.Empty; - string newUrl = string.Empty; - string filePath = string.Empty; - - //每页显示的固定数据行数 - int rowsPerPage = 8; - + string initTemplatePath = Const.JGZL_LeakageVacuumUrl; string projectId = this.tvControlItem.SelectedNodeID; - if (!string.IsNullOrEmpty(projectId)) - { - var report = BLL.LeakageVacuumService.GetLeakageVacuumByProjectId(projectId); - if (report != null) - { - initTemplatePath = Const.JGZL_LeakageVacuumUrl; - uploadfilepath = rootPath + initTemplatePath; - newUrl = uploadfilepath.Replace("管道系统泄漏性试验记录导出模板", "管道系统泄漏性试验记录"); - if (File.Exists(newUrl)) - { - File.Delete(newUrl); - } - File.Copy(uploadfilepath, newUrl); - //更新书签内容 - Document doc = new Aspose.Words.Document(newUrl); - DocumentBuilder builder = new DocumentBuilder(doc); - - Aspose.Words.Tables.Table table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, 0, true); - - Bookmark projectName = doc.Range.Bookmarks["ProjectName"]; - if (projectName != null) - { - projectName.Text = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName; - } - Bookmark systemName = doc.Range.Bookmarks["SystemName"]; - if (systemName != null) - { - systemName.Text = report.SystemName; - } - Bookmark systemCode = doc.Range.Bookmarks["SystemCode"]; - if (systemCode != null) - { - systemCode.Text = report.SystemCode; - } - Bookmark checkItemResult1 = doc.Range.Bookmarks["CheckItemResult1"]; - if (checkItemResult1 != null) - { - checkItemResult1.Text = report.CheckItemResult1; - } - Bookmark checkItemResult2 = doc.Range.Bookmarks["CheckItemResult2"]; - if (checkItemResult2 != null) - { - checkItemResult2.Text = report.CheckItemResult2; - } - Bookmark checkItemResult3 = doc.Range.Bookmarks["CheckItemResult3"]; - if (checkItemResult3 != null) - { - checkItemResult3.Text = report.CheckItemResult3; - } - Bookmark checkItemResult4 = doc.Range.Bookmarks["CheckItemResult4"]; - if (checkItemResult4 != null) - { - checkItemResult4.Text = report.CheckItemResult4; - } - Bookmark checkItemResult5 = doc.Range.Bookmarks["CheckItemResult5"]; - if (checkItemResult5 != null) - { - checkItemResult5.Text = report.CheckItemResult5; - } - - // 设置表头行重复显示 - table.Rows[0].RowFormat.HeadingFormat = true; - table.Rows[1].RowFormat.HeadingFormat = true; - table.Rows[2].RowFormat.HeadingFormat = true; - table.Rows[3].RowFormat.HeadingFormat = true; - table.Rows[4].RowFormat.HeadingFormat = true; - table.Rows[5].RowFormat.HeadingFormat = true; - table.Rows[6].RowFormat.HeadingFormat = true; - table.Rows[7].RowFormat.HeadingFormat = true; - table.Rows[8].RowFormat.HeadingFormat = true; - table.Rows[9].RowFormat.HeadingFormat = true; - table.Rows[10].RowFormat.HeadingFormat = true; - - // ====固定表格布局===== - table.AutoFit(AutoFitBehavior.FixedColumnWidths); - table.AllowAutoFit = false; - table.Alignment = TableAlignment.Center; - - // 先记录页尾行，并从表格中移除 - //Row footerRow = table.Rows[table.Rows.Count - 1]; - //table.Rows.RemoveAt(table.Rows.Count - 1); - - var recordLists = BLL.LeakageVacuumTestRecordServic.GetLeakageVacuumTestRecordByLeakageVacuumId(report.LeakageVacuumId); - if (recordLists.Count == Grid1.GetMergedData().Count) - { - int i = 0; - foreach (var item in recordLists) - { - //创建行 - Aspose.Words.Tables.Row row = new Aspose.Words.Tables.Row(doc); - row.Cells.Add(CreateCell(item.PipelineCode, doc, 128.42, "", ""));//管道编号/单线号 - row.Cells.Add(CreateCell(item.DesignPressure, doc, 35.72, "", ""));//设计压力 - row.Cells.Add(CreateCell(item.DesignTem, doc, 41.96, "", ""));//设计温度 - row.Cells.Add(CreateCell(item.TestAmbientTemp, doc, 52.73, "", ""));//试验环境温度℃ - row.Cells.Add(CreateCell(item.TestMediumTemp, doc, 41.96, "", ""));//试验介质温度℃ - row.Cells.Add(CreateCell(item.LeakPressure, doc, 39.4, "", ""));//泄漏性试验-压力 - row.Cells.Add(CreateCell(item.LeakMedium, doc, 41.96, "", ""));//泄漏性试验-介质 - row.Cells.Add(CreateCell(item.VacuumPressure, doc, 45.07, "", ""));//真空试验-压力 - row.Cells.Add(CreateCell(item.VacuumMedium, doc, 41.39, "", ""));//真空试验-介质 - - table.Rows.Insert(i + 11, row); - } - - // 计算并插入空白行，填满整页 - // 计算总数据行数 - int totalDataRows = recordLists.Count; - // 计算需要补充的空白行数量 - int remainder = totalDataRows % rowsPerPage; - int needBlankRows = remainder == 0 ? 0 : rowsPerPage - remainder; - - // 插入空白行（和数据行格式保持一致，仅内容为空） - //for (int i = 0; i < needBlankRows - 1; i++) - //{ - // Aspose.Words.Tables.Row blankRow = new Aspose.Words.Tables.Row(doc); - // 空白行的单元格宽度和数据行保持一致 - //blankRow.Cells.Add(CreateCell("", doc, 22.68, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 65.49, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 37.14, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 27.78, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 28.06, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 28, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 34.87, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 43.66, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 59.82, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 34.58, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 33.74, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 27, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 45.93, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 37.14, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 30.62, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 48.76, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 25.23, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 28.92, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 48.76, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 26.08, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 56.7, "", "")); - //blankRow.Cells.Add(CreateCell("", doc, 22.11, "", "")); - // 插入到表格最后一行 - // table.Rows.Add(blankRow); - //} - //把页尾行重新加回表格最后 - //table.Rows.Add(footerRow); - - doc.Save(newUrl); - } - else - { - Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); - return; - } - - string fileName = Path.GetFileName(newUrl); - FileInfo info = new FileInfo(newUrl); - long fileSize = info.Length; - Response.Clear(); - Response.ContentType = "application/x-zip-compressed"; - Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); - Response.AddHeader("Content-Length", fileSize.ToString()); - Response.TransmitFile(newUrl, 0, fileSize); - Response.Flush(); - Response.Close(); - File.Delete(newUrl); - } - else - { - Alert.ShowInTop("没有要导出的数据！", MessageBoxIcon.Warning); - return; - } - } - else + if (string.IsNullOrEmpty(projectId)) { Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); return; } + var report = BLL.LeakageVacuumService.GetLeakageVacuumByProjectId(projectId); + if (report == null) + { + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; + } + else + { + var lists = BLL.LeakageVacuumTestRecordServic.GetLeakageVacuumTestRecordByLeakageVacuumId(report.LeakageVacuumId); + if (lists.Count != Grid1.GetMergedData().Count) + { + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; + } + } + string templateFullPath = Path.Combine(rootPath, initTemplatePath); + if (!File.Exists(templateFullPath)) + { + Alert.ShowInTop("导出模板文件不存在！", MessageBoxIcon.Warning); + return; + } + Document doc = new Aspose.Words.Document(templateFullPath); + Aspose.Words.Tables.Table table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, 0, true); + + #region 顶层书签赋值（工程名称、系统、检查项） + SafeSetBookmarkText(doc, "ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId)?.ProjectName); + SafeSetBookmarkText(doc, "SystemName", report.SystemName); + SafeSetBookmarkText(doc, "SystemCode", report.SystemCode); + SafeSetBookmarkText(doc, "CheckItemResult1", report.CheckItemResult1); + SafeSetBookmarkText(doc, "CheckItemResult2", report.CheckItemResult2); + SafeSetBookmarkText(doc, "CheckItemResult3", report.CheckItemResult3); + SafeSetBookmarkText(doc, "CheckItemResult4", report.CheckItemResult4); + SafeSetBookmarkText(doc, "CheckItemResult5", report.CheckItemResult5); + #endregion + + #region 表头跨页重复设置 + for (int r = 0; r <= 10; r++) + { + table.Rows[r].RowFormat.HeadingFormat = true; + } + table.AutoFit(AutoFitBehavior.FixedColumnWidths); + table.AllowAutoFit = false; + table.Alignment = TableAlignment.Center; + #endregion + + var recordLists = BLL.LeakageVacuumTestRecordServic.GetLeakageVacuumTestRecordByLeakageVacuumId(report.LeakageVacuumId); + Aspose.Words.Tables.Row templateDataRow = table.Rows[11]; + + if (recordLists.Count > 0) + { + foreach (var item in recordLists) + { + Aspose.Words.Tables.Row newDataRow = (Aspose.Words.Tables.Row)templateDataRow.Clone(true); + + SafeSetRowBookmarkText(newDataRow, "Bk_PipelineCode", item.PipelineCode); + SafeSetRowBookmarkText(newDataRow, "Bk_DesignPressure", item.DesignPressure); + SafeSetRowBookmarkText(newDataRow, "Bk_DesignTem", item.DesignTem); + SafeSetRowBookmarkText(newDataRow, "Bk_TestAmbientTemp", item.TestAmbientTemp); + SafeSetRowBookmarkText(newDataRow, "Bk_TestMediumTemp", item.TestMediumTemp); + SafeSetRowBookmarkText(newDataRow, "Bk_LeakPressure", item.LeakPressure); + SafeSetRowBookmarkText(newDataRow, "Bk_LeakMedium", item.LeakMedium); + SafeSetRowBookmarkText(newDataRow, "Bk_VacuumPressure", item.VacuumPressure); + SafeSetRowBookmarkText(newDataRow, "Bk_VacuumMedium", item.VacuumMedium); + + table.InsertBefore(newDataRow, templateDataRow); + } + } + + #region 补充空白行填满每页8行 + int rowsPerPage = 8; + int totalDataRows = recordLists.Count; + int remainder = totalDataRows % rowsPerPage; + int needBlankRows = remainder == 0 ? 0 : rowsPerPage - remainder; + + for (int i = 0; i < needBlankRows; i++) + { + Aspose.Words.Tables.Row blankRow = (Aspose.Words.Tables.Row)templateDataRow.Clone(true); + SafeSetRowBookmarkText(blankRow, "Bk_PipelineCode", ""); + SafeSetRowBookmarkText(blankRow, "Bk_DesignPressure", ""); + SafeSetRowBookmarkText(blankRow, "Bk_DesignTem", ""); + SafeSetRowBookmarkText(blankRow, "Bk_TestAmbientTemp", ""); + SafeSetRowBookmarkText(blankRow, "Bk_TestMediumTemp", ""); + SafeSetRowBookmarkText(blankRow, "Bk_LeakPressure", ""); + SafeSetRowBookmarkText(blankRow, "Bk_LeakMedium", ""); + SafeSetRowBookmarkText(blankRow, "Bk_VacuumPressure", ""); + SafeSetRowBookmarkText(blankRow, "Bk_VacuumMedium", ""); + + table.InsertBefore(blankRow, templateDataRow); + } + #endregion + + templateDataRow.Remove(); + + using (MemoryStream ms = new MemoryStream()) + { + doc.Save(ms, Aspose.Words.SaveFormat.Docx); + ms.Position = 0; + + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + string downloadFileName = "管道系统泄漏性试验记录.docx"; + Response.AddHeader("Content-Disposition", $"attachment;filename={System.Web.HttpUtility.UrlEncode(downloadFileName, System.Text.Encoding.UTF8)}"); + Response.BinaryWrite(ms.ToArray()); + Response.Flush(); + Response.End(); + } } + /// + /// 设置文档全局书签文本 + /// + private static void SafeSetBookmarkText(Document doc, string bookmarkName, string text) + { + Bookmark bm = doc.Range.Bookmarks[bookmarkName]; + if (bm == null) return; + bm.Text = text ?? ""; + } + + /// + /// 在指定Row行节点范围内查找书签并赋值 + /// + private static void SafeSetRowBookmarkText(Row row, string bookmarkName, string text) + { + text = text ?? ""; + BookmarkStart bkStart = null; + NodeCollection childNodes = row.GetChildNodes(NodeType.BookmarkStart, true); + foreach (Node childNode in childNodes) + { + BookmarkStart bs = childNode as BookmarkStart; + if (bs != null && bs.Name == bookmarkName) + { + bkStart = bs; + break; + } + } + if (bkStart == null) return; + + Node cur = bkStart.NextSibling; + while (cur != null && cur.NodeType != NodeType.BookmarkEnd) + { + Node next = cur.NextSibling; + cur.Remove(); + cur = next; + } + Run run = new Run(row.Document, text); + bkStart.ParentNode.InsertAfter(run, bkStart); + } + + public static Cell CreateCell(String value, Document doc, double cellWidth, string cellMerge = "", string CenterPage = "", string cellUnitLeft = "") { Cell cell = new Cell(doc); diff --git a/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs index 16b8b8a..1c5565d 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/LeakageVacuum.aspx.designer.cs @@ -167,6 +167,24 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.TextBox txtSystemCode; + /// + /// SimpleForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.SimpleForm SimpleForm2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + /// /// drpCheckResult1 控件。 ///