diff --git a/DataBase/版本日志/HJGLDB_DS_2026-02-02_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-02-02_bwj.sql new file mode 100644 index 0000000..65376f5 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-02-02_bwj.sql @@ -0,0 +1,102 @@ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('4622EDCD-6313-4736-852C-CF8B3D2CAB3B','','JGZL/Cover.aspx',1,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('35901831-D34A-4248-ADC2-55B11F72C7E8','4622EDCD-6313-4736-852C-CF8B3D2CAB3B','',1) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('C3330C1C-5009-43C2-AEA1-997C0677C808','4622EDCD-6313-4736-852C-CF8B3D2CAB3B','޸',2) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('9504E17E-D25F-4BE0-9069-10BBCF88FAEC','4622EDCD-6313-4736-852C-CF8B3D2CAB3B','ɾ',3) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('100901FA-21CB-4714-8B5C-EA0CA3ADE1DC','4622EDCD-6313-4736-852C-CF8B3D2CAB3B','',4) +go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('81B9A521-A077-48C5-98A8-3A44C0B0D803','ļ˵','JGZL/DocumentDescription.aspx',5,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('157E0A36-3D83-43CD-99F4-972471B95E41','81B9A521-A077-48C5-98A8-3A44C0B0D803','',1) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('7CED6294-82EB-4A27-AB04-95B4A20564B0','81B9A521-A077-48C5-98A8-3A44C0B0D803','޸',2) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('916161C5-AFE2-4343-8EE6-2D7E9FBADF4E','81B9A521-A077-48C5-98A8-3A44C0B0D803','ɾ',3) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('CBAB663D-CAB1-4D8B-A5FE-01B6AFF6719D','81B9A521-A077-48C5-98A8-3A44C0B0D803','',4) +go + +CREATE TABLE [dbo].[JGZL_DocumentDescription]( + [DocumentDescriptionId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [ProjectOverview] [nvarchar](2000) NULL, + [ConstructionUnit] [nvarchar](50) NULL, + [DesigningUnit] [nvarchar](50) NULL, + [TestingUnit] [nvarchar](50) NULL, + [ConstructionCompany] [nvarchar](50) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [Reviewer] [nvarchar](50) NULL, + [ReviewDate] [datetime] NULL, + CONSTRAINT [PK_JGZL_DocumentDescription] PRIMARY KEY CLUSTERED +( + [DocumentDescriptionId] 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_DocumentDescription] WITH CHECK ADD CONSTRAINT [FK_JGZL_DocumentDescription_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[JGZL_DocumentDescription] CHECK CONSTRAINT [FK_JGZL_DocumentDescription_Base_Project] +GO + +ALTER TABLE [dbo].[JGZL_DocumentDescription] WITH CHECK ADD CONSTRAINT [FK_JGZL_DocumentDescription_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[JGZL_DocumentDescription] CHECK CONSTRAINT [FK_JGZL_DocumentDescription_Sys_User] +GO + +ALTER TABLE [dbo].[JGZL_DocumentDescription] WITH CHECK ADD CONSTRAINT [FK_JGZL_DocumentDescription_Sys_User1] FOREIGN KEY([Reviewer]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[JGZL_DocumentDescription] CHECK CONSTRAINT [FK_JGZL_DocumentDescription_Sys_User1] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'DocumentDescriptionId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @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_DocumentDescription', @level2type=N'COLUMN',@level2name=N'ProjectOverview' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'赥λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'ConstructionUnit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƶλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'DesigningUnit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ⵥλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'TestingUnit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'ConstructionCompany' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'Reviewer' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription', @level2type=N'COLUMN',@level2name=N'ReviewDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ˵' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_DocumentDescription' +GO + + diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index b07f9b6..860e83e 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -247,6 +247,7 @@ + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index e1b6194..33b6004 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -1895,6 +1895,11 @@ namespace BLL /// public const string JGZL_ValveInspectionTestRecordMenuId = "A787D641-92EB-4C97-809D-7947C750338E"; + /// + /// 交工技术文件说明 + /// + public const string JGZL_DocumentDescriptionMenuId = "81B9A521-A077-48C5-98A8-3A44C0B0D803"; + #endregion diff --git a/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs b/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs new file mode 100644 index 0000000..b2d2cdf --- /dev/null +++ b/HJGL_DS/BLL/JGZL/DocumentDescriptionService.cs @@ -0,0 +1,83 @@ +using Model; +using NPOI.POIFS.FileSystem; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 交工技术文件说明 + /// + public class DocumentDescriptionService + { + /// + /// 根据项目Id获取交工技术文件说明 + /// + /// + /// + public static Model.JGZL_DocumentDescription GetDocumentDescriptionByProjectId(string projectId) + { + return Funs.DB.JGZL_DocumentDescription.FirstOrDefault(e => e.ProjectId == projectId); + } + + /// + /// 添加 + /// + /// + public static void AddDocumentDescription(Model.JGZL_DocumentDescription documentDescription) + { + SGGLDB db = Funs.DB; + Model.JGZL_DocumentDescription newDocumentDescription = new JGZL_DocumentDescription(); + newDocumentDescription.DocumentDescriptionId = documentDescription.DocumentDescriptionId; + newDocumentDescription.ProjectId = documentDescription.ProjectId; + newDocumentDescription.ProjectOverview = documentDescription.ProjectOverview; + newDocumentDescription.ConstructionUnit = documentDescription.ConstructionUnit; + newDocumentDescription.DesigningUnit = documentDescription.DesigningUnit; + newDocumentDescription.TestingUnit = documentDescription.TestingUnit; + newDocumentDescription.ConstructionCompany = documentDescription.ConstructionCompany; + newDocumentDescription.CompileMan = documentDescription.CompileMan; + newDocumentDescription.CompileDate = documentDescription.CompileDate; + newDocumentDescription.Reviewer = documentDescription.Reviewer; + newDocumentDescription.ReviewDate = documentDescription.ReviewDate; + db.JGZL_DocumentDescription.InsertOnSubmit(newDocumentDescription); + db.SubmitChanges(); + } + + /// + /// 修改 + /// + /// + public static void UpdateDocumentDescription(Model.JGZL_DocumentDescription documentDescription) + { + SGGLDB db = Funs.DB; + Model.JGZL_DocumentDescription newDocumentDescription = db.JGZL_DocumentDescription.FirstOrDefault(e => e.DocumentDescriptionId == documentDescription.DocumentDescriptionId); + if (newDocumentDescription != null) + { + newDocumentDescription.ProjectOverview = documentDescription.ProjectOverview; + newDocumentDescription.ConstructionUnit = documentDescription.ConstructionUnit; + newDocumentDescription.DesigningUnit = documentDescription.DesigningUnit; + newDocumentDescription.TestingUnit = documentDescription.TestingUnit; + newDocumentDescription.ConstructionCompany = documentDescription.ConstructionCompany; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除交工技术文件说明 + /// + /// + public static void DeleteDocumentDescriptionById(string documentDescriptionId) + { + SGGLDB db = Funs.DB; + Model.JGZL_DocumentDescription documentDescription = db.JGZL_DocumentDescription.FirstOrDefault(e => e.DocumentDescriptionId == documentDescriptionId); + if (documentDescription != null) + { + db.JGZL_DocumentDescription.DeleteOnSubmit(documentDescription); + db.SubmitChanges(); + } + } + } +} diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx new file mode 100644 index 0000000..43ae73a --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/交工技术文件说明.frx @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/周期检定计量器具清单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/周期检定计量器具清单.frx index 5d60bcb..b5e6abc 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 } - + @@ -57,7 +57,7 @@ namespace FastReport - + @@ -134,28 +134,28 @@ namespace FastReport - - - - - - - - - + + + + + + + + + - - - - - + + + + + - + 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..a7f06a7 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/封面.frx @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程交工验收证书.frx index 63d5278..6bd8d63 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; @@ -17,22 +17,7 @@ using FastReport.Utils; namespace FastReport { public class ReportScript - { - - private void Cell26_AfterData(object sender, EventArgs e) - { - //Table table = sender as Cell26; - //foreach (TableRow row in table.Rows) - //{ - //foreach (TableCell cell in row.Cells) - //{ - // 获取内容高度 - float contentHeight = cell26.TextHeight; - // 行高 = 内容高度 + 上下边距（例如4mm） - row6.Height = contentHeight + Units.Millimeters * 4; - // } - // } - } + { } } @@ -47,8 +32,8 @@ namespace FastReport - - + + @@ -89,8 +74,8 @@ namespace FastReport - - + + @@ -103,7 +88,7 @@ namespace FastReport - + @@ -124,7 +109,7 @@ namespace FastReport - + @@ -140,8 +125,8 @@ namespace FastReport - - + + @@ -152,17 +137,17 @@ namespace FastReport - - - - - + + + + + - - - - - + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx index c933556..178852d 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/工程联络单.frx @@ -1,5 +1,5 @@  - + @@ -17,8 +17,8 @@ - - + + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -154,7 +154,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx index bcea7c1..c5753d2 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/特种设备安装改造维修告知书.frx @@ -1,7 +1,7 @@  - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx index 7609f4e..2d38e72 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; @@ -50,7 +50,7 @@ namespace FastReport } - + @@ -66,9 +66,9 @@ namespace FastReport - - - + + + @@ -90,10 +90,12 @@ namespace FastReport - - - - + + + + + + @@ -188,10 +190,10 @@ namespace FastReport - - - - + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx index 1c60815..afaa881 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/Fastreport/JGZL/管道系统压力试验条件确认记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx new file mode 100644 index 0000000..044e7f2 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx new file mode 100644 index 0000000..af55b54 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验记录.frx @@ -0,0 +1,221 @@ + + + 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 new file mode 100644 index 0000000..0c3d520 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统泄漏性试验记录.frx @@ -0,0 +1,213 @@ + + + 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/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 5b74757..67ab95f 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1243,6 +1243,8 @@ + + @@ -6602,6 +6604,20 @@ AcceptanceCertificateEdit.aspx + + Cover.aspx + ASPXCodeBehind + + + Cover.aspx + + + DocumentDescription.aspx + ASPXCodeBehind + + + DocumentDescription.aspx + PressureTestOfPipelineSystemConfirmationRecord.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx index e174755..b2e7435 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeRecovery.aspx @@ -19,7 +19,7 @@ diff --git a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificateEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificateEdit.aspx.cs index ccf6eac..2950acd 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificateEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/AcceptanceCertificateEdit.aspx.cs @@ -70,31 +70,11 @@ namespace FineUIPro.Web.JGZL } else { - //string steNames = string.Empty; - //List steelLists = new List(); - //var isoInfos = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId select x).ToList(); - //foreach (var item in isoInfos) - //{ - // if (!string.IsNullOrEmpty(item.STE_ID)) - // { - // steelLists.Add(item.STE_ID); - // } - //} - //foreach (var item in steelLists.Distinct()) - //{ - // var ste = BLL.HJGL_MaterialService.GetSteelBySteID(item); - // if (ste != null) - // { - // steNames += ste.STE_Code + "、"; - // } - //} - //if (!string.IsNullOrEmpty(steNames)) - //{ - // steNames = steNames.Substring(0, steNames.LastIndexOf('、')); - //} - //double SumSize = Convert.ToDouble((from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == this.ProjectId select x.JOT_Size).Sum()); this.txtContractNumber.Text = BLL.Base_ProjectService.GetProjectCode(this.ProjectId); - //this.txtProjectContent.Text = "本次" + BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName + "，已完成100米" + steNames + "材质管道的预制与安装工作。项目配套的支架、阀门、三通等各类管道组成件，安装质量均符合设计及规范要求。共完成管道焊缝" + isoInfos.Count + "道，其中20%焊缝经射线或超声波检测，合格等级全部满足设计标准。目前，管道系统已顺利完成水压试验及压缩空气吹扫工序，试验压力降与管道洁净度指标均达到设计规定。"; + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId); + var isoInfo = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(this.ProjectId); + var jointCount = (from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == this.ProjectId select x).Count(); + this.txtProjectContent.Text = "本次" + project.ProjectName + "于" + string.Format("{0:yyyy年MM月dd日}", project.StartDate) + "开工，到" + string.Format("{0:yyyy年MM月dd日}", project.EndDate) + "施工结束。该项目共计安装管道" + isoInfo.Count + "条，管道焊缝共计" + jointCount + "道，已按图纸要求的比例进行焊缝无损检测，检测结果均符合设计规定的合格等级。该项目配套的各类管道组成件、支撑件安装质量均满足设计文件以及标准规范要求。目前，管道系统已完成水压试验及压缩空气吹扫工序，试验压力降、管道洁净度等关键指标均符合标准规范的规定标准并已通过业主方验收。"; } } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx index 3830d98..7273ee4 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerification.aspx @@ -61,9 +61,9 @@ - - + --%> @@ -73,15 +73,15 @@ - - + --%> - - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx index fbff4e6..8f05194 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx @@ -32,20 +32,21 @@ - - - - - - + <%----%> + - + <%-- + + + + --%> + <%-- - + --%> @@ -58,16 +59,17 @@ - + <%----%> - - - - - + <%-- + + + + + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs index e75d5e0..b9c7b37 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.cs @@ -61,15 +61,15 @@ namespace FineUIPro.Web.JGZL { this.txtDesignUnit.Text = report.DesignUnit; this.txtProfessional.Text = report.Professional; - this.txtHost.Text = report.Host; + //this.txtHost.Text = report.Host; this.txtVerificationDate.Text = report.VerificationDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.VerificationDate) : ""; this.txtConDrawingCode.Text = report.ConDrawingCode; - this.txtPersonnel.Text = report.Personnel; + //this.txtPersonnel.Text = report.Personnel; this.txtContents.Text= report.Contents; this.txtProblems.Text = report.Problems; - this.txtRecorder.Text = report.Recorder; + //this.txtRecorder.Text = report.Recorder; this.txtRecordDate.Text = report.RecordDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.RecordDate) : ""; - this.txtReviewer.Text = report.Reviewer; + //this.txtReviewer.Text = report.Reviewer; this.txtReviewDate.Text = report.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReviewDate) : ""; } } @@ -95,15 +95,15 @@ namespace FineUIPro.Web.JGZL Model.JGZL_ConDrawingVerification newReport = new Model.JGZL_ConDrawingVerification(); newReport.DesignUnit = this.txtDesignUnit.Text.Trim(); newReport.Professional=this.txtProfessional.Text.Trim(); - newReport.Host = this.txtHost.Text.Trim(); + //newReport.Host = this.txtHost.Text.Trim(); newReport.VerificationDate = Funs.GetNewDateTime(this.txtVerificationDate.Text); newReport.ConDrawingCode = txtConDrawingCode.Text.Trim(); - newReport.Personnel = this.txtPersonnel.Text; + //newReport.Personnel = this.txtPersonnel.Text; newReport.Contents = this.txtContents.Text; newReport.Problems = this.txtProblems.Text; - newReport.Recorder = this.txtRecorder.Text.Trim(); + //newReport.Recorder = this.txtRecorder.Text.Trim(); newReport.RecordDate = Funs.GetNewDateTime(this.txtRecordDate.Text.Trim()); - newReport.Reviewer=this.txtReviewer.Text.Trim(); + //newReport.Reviewer=this.txtReviewer.Text.Trim(); newReport.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text.Trim()); if (!string.IsNullOrEmpty(this.ConDrawingVerificationId)) { diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs index 883d5a3..c5a4730 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ConDrawingVerificationEidt.aspx.designer.cs @@ -86,15 +86,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.TextBox txtProfessional; - /// - /// txtHost 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtHost; - /// /// txtVerificationDate 控件。 /// @@ -113,15 +104,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.TextBox txtConDrawingCode; - /// - /// txtPersonnel 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtPersonnel; - /// /// txtContents 控件。 /// @@ -140,15 +122,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.TextArea txtProblems; - /// - /// txtRecorder 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtRecorder; - /// /// txtRecordDate 控件。 /// @@ -158,15 +131,6 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.DatePicker txtRecordDate; - /// - /// txtReviewer 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtReviewer; - /// /// txtReviewDate 控件。 /// diff --git a/HJGL_DS/FineUIPro.Web/JGZL/ContactEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/ContactEdit.aspx.cs index 3be7df8..9bff752 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/ContactEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/ContactEdit.aspx.cs @@ -76,31 +76,15 @@ namespace FineUIPro.Web.JGZL } else { - //string steNames = string.Empty; - //List steelLists = new List(); - //var isoInfos = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId select x).ToList(); - //foreach (var item in isoInfos) - //{ - // if (!string.IsNullOrEmpty(item.STE_ID)) - // { - // steelLists.Add(item.STE_ID); - // } - //} - //foreach (var item in steelLists.Distinct()) - //{ - // var ste = BLL.HJGL_MaterialService.GetSteelBySteID(item); - // if (ste != null) - // { - // steNames += ste.STE_Code + "、"; - // } - //} - //if (!string.IsNullOrEmpty(steNames)) - //{ - // steNames = steNames.Substring(0, steNames.LastIndexOf('、')); - //} - //double SumSize = Convert.ToDouble((from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == this.ProjectId select x.JOT_Size).Sum()); - this.txtContractNumber.Text = BLL.Base_ProjectService.GetProjectCode(this.ProjectId); - this.txtSubjectMatter.Text = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId).ProjectName + "，以下问题请设计单位审核："; + int isoCount = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.ProjectId select x).Count(); + int jointCount = (from x in Funs.DB.HJGL_PW_JointInfo where x.ProjectId == this.ProjectId select x).Count(); + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId); + if (project != null) + { + this.txtContractNumber.Text = project.ProjectCode; + this.txtSubjectMatter.Text = project.ProjectName + "，以下问题请设计单位审核："; + this.txtContents.Text = "本次" + project.ProjectName + "于" + string.Format("{0:yyyy年MM月dd日}", project.StartDate) + "开工，到" + string.Format("{0:yyyy年MM月dd日}", project.EndDate) + "施工结束。该项目共计安装管道" + isoCount + "条，管道焊缝共计" + jointCount + "道，已按图纸要求的比例进行焊缝无损检测，检测结果均符合设计规定的合格等级。该项目配套的各类管道组成件、支撑件安装质量均满足设计文件以及标准规范要求。目前，管道系统已完成水压试验及压缩空气吹扫工序，试验压力降、管道洁净度等关键指标均符合标准规范的规定标准并已通过业主方验收。"; + } } } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx new file mode 100644 index 0000000..aed11b6 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx @@ -0,0 +1,60 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Cover.aspx.cs" Inherits="FineUIPro.Web.JGZL.Cover" %> + + + + + + + 封面 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs new file mode 100644 index 0000000..dcca34b --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs @@ -0,0 +1,146 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using System.IO; + +namespace FineUIPro.Web.JGZL +{ + public partial class Cover : PageBase + { + #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.BindGrid(); + } + } + #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 查询 + /// + ///查询 + /// + /// + /// + protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + string projectId = this.tvControlItem.SelectedNodeID; + + if (projectId != null) + { + if (!string.IsNullOrEmpty(this.txtCode.Text.Trim())) + { + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); + + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("Code", this.txtCode.Text.Trim()); + 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; + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.designer.cs new file mode 100644 index 0000000..45f6e8d --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class Cover + { + + /// + /// 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; + + /// + /// txtCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCode; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx new file mode 100644 index 0000000..b62503e --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx @@ -0,0 +1,83 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocumentDescription.aspx.cs" Inherits="FineUIPro.Web.JGZL.DocumentDescription" %> + + + + + + + 交工技术文件说明 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs new file mode 100644 index 0000000..6c31e39 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.cs @@ -0,0 +1,244 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data.SqlClient; +using System.Data; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using System.IO; + +namespace FineUIPro.Web.JGZL +{ + public partial class DocumentDescription : PageBase + { + #region 定义变量 + /// + /// 主键 + /// + private string DocumentDescriptionId + { + get + { + return (string)ViewState["DocumentDescriptionId"]; + } + set + { + ViewState["DocumentDescriptionId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + 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; + PageData(); + } + } + #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.PageData(); + } + } + #endregion + + #region 查询 + /// + ///查询 + /// + /// + /// + protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) + { + this.InitTreeMenu(); + } + #endregion + + + + private void PageData() + { + string projectId = this.tvControlItem.SelectedNodeID; + if (!string.IsNullOrEmpty(projectId)) + { + var report = BLL.DocumentDescriptionService.GetDocumentDescriptionByProjectId(projectId); + if (report != null) + { + this.DocumentDescriptionId = report.DocumentDescriptionId; + this.txtProjectOverview.Text = report.ProjectOverview; + this.txtConstructionUnit.Text = report.ConstructionUnit; + this.txtDesigningUnit.Text = report.DesigningUnit; + this.txtTestingUnit.Text = report.TestingUnit; + this.txtConstructionCompany.Text = report.ConstructionCompany; + } + else + { + //var project = BLL.Base_ProjectService.GetProjectByProjectId(projectId); + //var isoLists = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByProjectId(projectId); + //string isoInfos = string.Empty; + //foreach (var item in isoLists) + //{ + // int hdCount = 0; + // int gdCount = 0; + // var joitInfos = (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == item.ISO_ID select x); + // if (joitInfos.Count() > 0) + // { + // hdCount = joitInfos.Where(x => x.JOT_JointAttribute == "活动").Count(); + // gdCount = joitInfos.Where(x => x.JOT_JointAttribute == "固定").Count(); + // } + // isoInfos += "管线编号" + item.ISO_IsoNo + "，其中活动焊口" + hdCount + "道，固定焊口" + gdCount + "道；"; + //} + //if (!string.IsNullOrEmpty(isoInfos)) + //{ + // isoInfos = isoInfos.Substring(0, isoInfos.LastIndexOf('；')); + //} + //this.txtProjectOverview.Text = "本文件为" + project.ProjectName + "，" + string.Format("{0:yyyy年MM月dd日}", project.StartDate) + "开工，到" + string.Format("{0:yyyy年MM月dd日}", project.EndDate) + "施工结束，主要施工内容：" + isoInfos; + this.txtConstructionUnit.Text = "浙江石油化工有限公司"; + this.txtConstructionCompany.Text = "浙江鼎盛石化工程有限公司"; + } + } + } + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_DocumentDescriptionMenuId, BLL.Const.BtnSave)) + { + Model.JGZL_DocumentDescription newDocumentDescription = new Model.JGZL_DocumentDescription(); + newDocumentDescription.ProjectOverview = this.txtProjectOverview.Text; + newDocumentDescription.ConstructionUnit = this.txtConstructionUnit.Text; + newDocumentDescription.DesigningUnit = this.txtDesigningUnit.Text; + newDocumentDescription.TestingUnit = this.txtTestingUnit.Text; + newDocumentDescription.ConstructionCompany = this.txtConstructionCompany.Text; + if (!string.IsNullOrEmpty(this.DocumentDescriptionId)) + { + newDocumentDescription.DocumentDescriptionId = this.DocumentDescriptionId; + BLL.DocumentDescriptionService.UpdateDocumentDescription(newDocumentDescription); + ShowNotify("修改成功！", MessageBoxIcon.Success); + } + else + { + newDocumentDescription.CompileMan = this.CurrUser.UserId; + newDocumentDescription.CompileDate = DateTime.Now; + newDocumentDescription.Reviewer = this.CurrUser.UserId; + newDocumentDescription.ReviewDate = DateTime.Now; + newDocumentDescription.ProjectId = this.tvControlItem.SelectedNodeID; + newDocumentDescription.DocumentDescriptionId = SQLHelper.GetNewID(typeof(Model.JGZL_DocumentDescription)); + this.DocumentDescriptionId = newDocumentDescription.DocumentDescriptionId; + BLL.DocumentDescriptionService.AddDocumentDescription(newDocumentDescription); + ShowNotify("保存成功！", MessageBoxIcon.Success); + } + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + #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(); + + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("ProjectOverview", this.txtProjectOverview.Text); + keyValuePairs.Add("ConstructionUnit", this.txtConstructionUnit.Text); + keyValuePairs.Add("DesigningUnit", this.txtDesigningUnit.Text); + keyValuePairs.Add("TestingUnit", this.txtTestingUnit.Text); + keyValuePairs.Add("ConstructionCompany", this.txtConstructionCompany.Text); + 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; + } + } + #endregion + + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs new file mode 100644 index 0000000..c24cc3e --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/DocumentDescription.aspx.designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class DocumentDescription + { + + /// + /// 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; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtConstructionUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConstructionUnit; + + /// + /// txtDesigningUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDesigningUnit; + + /// + /// txtTestingUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTestingUnit; + + /// + /// txtConstructionCompany 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtConstructionCompany; + + /// + /// txtProjectOverview 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtProjectOverview; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs index 3ba5b14..1b6c623 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/LeakTestOfPipelineSystemRecord.aspx.cs @@ -210,6 +210,37 @@ namespace FineUIPro.Web.JGZL var report = BLL.LeakTestOfPipelineSystemRecordService.GetLeakTestOfPipelineSystemRecordById(this.Grid1.SelectedRowID); if (report != null) { + string strSql = @"SELECT * from JGZL_LeakTestOfPipelineSystemRecordItem where RecordId=@recordId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@recordId", this.Grid1.SelectedRowID)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("PipelineNo"); + dt.Columns.Add("DesignPressure"); + dt.Columns.Add("DesignTemperature"); + dt.Columns.Add("TestTemperature"); + dt.Columns.Add("TestMediumTemperature"); + dt.Columns.Add("TestPressure"); + dt.Columns.Add("VoltageStabilizationTime"); + + DataRow[] rows = tb.DefaultView.ToTable().Select(); + foreach (var row in rows) + { + var newRow = dt.NewRow(); + newRow["PipelineNo"] = row["PipelineNo"].ToString(); + newRow["DesignPressure"] = row["DesignPressure"].ToString(); + newRow["DesignTemperature"] = row["DesignTemperature"].ToString(); + newRow["TestTemperature"] = row["TestTemperature"].ToString(); + newRow["TestMediumTemperature"] = row["TestMediumTemperature"].ToString(); + newRow["TestPressure"] = row["TestPressure"].ToString(); + newRow["VoltageStabilizationTime"] = row["VoltageStabilizationTime"].ToString(); + dt.Rows.Add(newRow); + } + BLL.Common.FastReportService.AddFastreportTable(dt); + Dictionary keyValuePairs = new Dictionary(); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("SystemName", report.SystemName); diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs index 033c79b..6687df6 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs @@ -63,12 +63,19 @@ namespace FineUIPro.Web.JGZL this.txtMeasuringInstrumentsCode.Text = report.MeasuringInstrumentsCode; this.txtSpecification.Text = report.Specification; this.txtAccuracyLevel.Text = report.AccuracyLevel; - this.txtCertificateNumber.Text =report.CertificateNumber; + this.txtCertificateNumber.Text = report.CertificateNumber; this.txtVerificationDate.Text = report.VerificationDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.VerificationDate) : ""; this.txtValidityPeriod.Text = report.ValidityPeriod; this.txtRemark.Text = report.Remark; } } + else + { + this.txtMeasuringInstrumentsName.Text = "压力表"; + this.txtSpecification.Text = "(?-?)Mpa"; + this.txtAccuracyLevel.Text = "1.6级"; + this.txtValidityPeriod.Text = "半年"; + } } } #endregion diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs index a015da3..bacf7a3 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/PressureTestOfPipelineSystemRecord.aspx.cs @@ -210,6 +210,40 @@ namespace FineUIPro.Web.JGZL var report = BLL.PressureTestOfPipelineSystemRecordService.GetPressureTestOfPipelineSystemRecordById(this.Grid1.SelectedRowID); if (report != null) { + string strSql = @"SELECT * from JGZL_PressureTestOfPipelineSystemRecordItem where RecordId=@recordId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@recordId", this.Grid1.SelectedRowID)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("PipelineNo"); + dt.Columns.Add("DesignPressure"); + dt.Columns.Add("DesignTemperature"); + dt.Columns.Add("TestTemperature"); + dt.Columns.Add("TestMedium"); + dt.Columns.Add("TestMediumTemperature"); + dt.Columns.Add("TestPressure"); + dt.Columns.Add("VoltageStabilizationTime"); + + DataRow[] rows = tb.DefaultView.ToTable().Select(); + foreach (var row in rows) + { + var newRow = dt.NewRow(); + newRow["PipelineNo"] = row["PipelineNo"].ToString(); + newRow["DesignPressure"] = row["DesignPressure"].ToString(); + newRow["DesignTemperature"] = row["DesignTemperature"].ToString(); + newRow["TestTemperature"] = row["TestTemperature"].ToString(); + newRow["TestMedium"] = row["TestMedium"].ToString(); + newRow["TestMediumTemperature"] = row["TestMediumTemperature"].ToString(); + newRow["TestPressure"] = row["TestPressure"].ToString(); + newRow["VoltageStabilizationTime"] = row["VoltageStabilizationTime"].ToString(); + dt.Rows.Add(newRow); + } + BLL.Common.FastReportService.AddFastreportTable(dt); + + Dictionary keyValuePairs = new Dictionary(); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("SystemName", report.SystemName); diff --git a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspectionEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspectionEdit.aspx.cs index 56f2b4b..2589384 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspectionEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/QualityControlPointInspectionEdit.aspx.cs @@ -71,7 +71,7 @@ namespace FineUIPro.Web.JGZL else { this.txtProfessional.Text = "管道安装工程"; - this.txtConstructionStandards.Text = "SH/T 3501/2011《石油化工有毒、可燃介质钢制管道工程施工及验收规范》"; + this.txtConstructionStandards.Text = "SH/T3501-2021"; } } } diff --git a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenanceEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenanceEdit.aspx.cs index 881dc00..a921704 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenanceEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenanceEdit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using FineUIPro.Web.common.BaseInfo; using System; using System.Collections.Generic; using System.Linq; @@ -88,7 +89,21 @@ namespace FineUIPro.Web.JGZL else { this.txtConUnit.Text = "浙江鼎盛石化工程有限公司"; - this.txtEquipmentName.Text = "压力管道（" + BLL.Base_ProjectService.GetProjectByProjectId(ProjectId).ProjectName + "）"; + if (!string.IsNullOrEmpty(ProjectId)) + { + var pro = BLL.Base_ProjectService.GetProjectByProjectId(ProjectId); + if (pro != null) + { + this.txtEquipmentName.Text = "压力管道（" + pro.ProjectName + "）"; + this.txtEquipmentLocation.Text = pro.ProjectName; + this.txtConstructionDate.Text = pro.StartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pro.StartDate) : ""; + this.txtLicenseNumber.Text = "TS3833339-2028"; + this.txtLicenseValidityDate.Text = string.Format("{0:yyyy-MM-dd}", "2028-8-20"); + this.txtConAddress.Text = "浙江省舟山市岱山县经济技术开发区徐福大道988号810室（岱西片区）"; + this.txtUseUnit.Text = "浙江石油化工有限公司"; + this.txtUseAddress.Text = "浙江省舟山市定海区临城街道翁山路555号大宗商品交易中心5201室（自贸试验区内）"; + } + } } } } diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 3f81ed7..6bfb6c8 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/Model/Model.cs b/HJGL_DS/Model/Model.cs index e8a2187..aa710e4 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -398,6 +398,9 @@ namespace Model partial void InsertJGZL_Contact(JGZL_Contact instance); partial void UpdateJGZL_Contact(JGZL_Contact instance); partial void DeleteJGZL_Contact(JGZL_Contact instance); + partial void InsertJGZL_DocumentDescription(JGZL_DocumentDescription instance); + partial void UpdateJGZL_DocumentDescription(JGZL_DocumentDescription instance); + partial void DeleteJGZL_DocumentDescription(JGZL_DocumentDescription instance); partial void InsertJGZL_ElectrostaticGrounding(JGZL_ElectrostaticGrounding instance); partial void UpdateJGZL_ElectrostaticGrounding(JGZL_ElectrostaticGrounding instance); partial void DeleteJGZL_ElectrostaticGrounding(JGZL_ElectrostaticGrounding instance); @@ -1904,6 +1907,14 @@ namespace Model } } + public System.Data.Linq.Table JGZL_DocumentDescription + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table JGZL_ElectrostaticGrounding { get @@ -4715,6 +4726,8 @@ namespace Model private EntitySet _JGZL_Contact; + private EntitySet _JGZL_DocumentDescription; + private EntitySet _JGZL_ElectrostaticGrounding; private EntitySet _JGZL_HandoverCertificate; @@ -4888,6 +4901,7 @@ namespace Model this._JGZL_ConcealedWorksInspectionRecord = new EntitySet(new Action(this.attach_JGZL_ConcealedWorksInspectionRecord), new Action(this.detach_JGZL_ConcealedWorksInspectionRecord)); this._JGZL_ConDrawingVerification = new EntitySet(new Action(this.attach_JGZL_ConDrawingVerification), new Action(this.detach_JGZL_ConDrawingVerification)); this._JGZL_Contact = new EntitySet(new Action(this.attach_JGZL_Contact), new Action(this.detach_JGZL_Contact)); + this._JGZL_DocumentDescription = new EntitySet(new Action(this.attach_JGZL_DocumentDescription), new Action(this.detach_JGZL_DocumentDescription)); this._JGZL_ElectrostaticGrounding = new EntitySet(new Action(this.attach_JGZL_ElectrostaticGrounding), new Action(this.detach_JGZL_ElectrostaticGrounding)); this._JGZL_HandoverCertificate = new EntitySet(new Action(this.attach_JGZL_HandoverCertificate), new Action(this.detach_JGZL_HandoverCertificate)); this._JGZL_IndustrialPipelineInstallationQualityCertificate = new EntitySet(new Action(this.attach_JGZL_IndustrialPipelineInstallationQualityCertificate), new Action(this.detach_JGZL_IndustrialPipelineInstallationQualityCertificate)); @@ -6067,6 +6081,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_Base_Project", Storage="_JGZL_DocumentDescription", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet JGZL_DocumentDescription + { + get + { + return this._JGZL_DocumentDescription; + } + set + { + this._JGZL_DocumentDescription.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ElectrostaticGrounding_Base_Project", Storage="_JGZL_ElectrostaticGrounding", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet JGZL_ElectrostaticGrounding { @@ -7082,6 +7109,18 @@ namespace Model entity.Base_Project = null; } + private void attach_JGZL_DocumentDescription(JGZL_DocumentDescription entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_JGZL_DocumentDescription(JGZL_DocumentDescription entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_JGZL_ElectrostaticGrounding(JGZL_ElectrostaticGrounding entity) { this.SendPropertyChanging(); @@ -83868,6 +83907,431 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_DocumentDescription")] + public partial class JGZL_DocumentDescription : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _DocumentDescriptionId; + + private string _ProjectId; + + private string _ProjectOverview; + + private string _ConstructionUnit; + + private string _DesigningUnit; + + private string _TestingUnit; + + private string _ConstructionCompany; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private string _Reviewer; + + private System.Nullable _ReviewDate; + + private EntityRef _Base_Project; + + private EntityRef _Sys_User; + + private EntityRef _ReviewerSys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnDocumentDescriptionIdChanging(string value); + partial void OnDocumentDescriptionIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnProjectOverviewChanging(string value); + partial void OnProjectOverviewChanged(); + partial void OnConstructionUnitChanging(string value); + partial void OnConstructionUnitChanged(); + partial void OnDesigningUnitChanging(string value); + partial void OnDesigningUnitChanged(); + partial void OnTestingUnitChanging(string value); + partial void OnTestingUnitChanged(); + partial void OnConstructionCompanyChanging(string value); + partial void OnConstructionCompanyChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileDateChanging(System.Nullable value); + partial void OnCompileDateChanged(); + partial void OnReviewerChanging(string value); + partial void OnReviewerChanged(); + partial void OnReviewDateChanging(System.Nullable value); + partial void OnReviewDateChanged(); + #endregion + + public JGZL_DocumentDescription() + { + this._Base_Project = default(EntityRef); + this._Sys_User = default(EntityRef); + this._ReviewerSys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DocumentDescriptionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string DocumentDescriptionId + { + get + { + return this._DocumentDescriptionId; + } + set + { + if ((this._DocumentDescriptionId != value)) + { + this.OnDocumentDescriptionIdChanging(value); + this.SendPropertyChanging(); + this._DocumentDescriptionId = value; + this.SendPropertyChanged("DocumentDescriptionId"); + this.OnDocumentDescriptionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + 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="_ProjectOverview", DbType="NVarChar(2000)")] + public string ProjectOverview + { + get + { + return this._ProjectOverview; + } + set + { + if ((this._ProjectOverview != value)) + { + this.OnProjectOverviewChanging(value); + this.SendPropertyChanging(); + this._ProjectOverview = value; + this.SendPropertyChanged("ProjectOverview"); + this.OnProjectOverviewChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionUnit", DbType="NVarChar(50)")] + public string ConstructionUnit + { + get + { + return this._ConstructionUnit; + } + set + { + if ((this._ConstructionUnit != value)) + { + this.OnConstructionUnitChanging(value); + this.SendPropertyChanging(); + this._ConstructionUnit = value; + this.SendPropertyChanged("ConstructionUnit"); + this.OnConstructionUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesigningUnit", DbType="NVarChar(50)")] + public string DesigningUnit + { + get + { + return this._DesigningUnit; + } + set + { + if ((this._DesigningUnit != value)) + { + this.OnDesigningUnitChanging(value); + this.SendPropertyChanging(); + this._DesigningUnit = value; + this.SendPropertyChanged("DesigningUnit"); + this.OnDesigningUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestingUnit", DbType="NVarChar(50)")] + public string TestingUnit + { + get + { + return this._TestingUnit; + } + set + { + if ((this._TestingUnit != value)) + { + this.OnTestingUnitChanging(value); + this.SendPropertyChanging(); + this._TestingUnit = value; + this.SendPropertyChanged("TestingUnit"); + this.OnTestingUnitChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionCompany", DbType="NVarChar(50)")] + public string ConstructionCompany + { + get + { + return this._ConstructionCompany; + } + set + { + if ((this._ConstructionCompany != value)) + { + this.OnConstructionCompanyChanging(value); + this.SendPropertyChanging(); + this._ConstructionCompany = value; + this.SendPropertyChanged("ConstructionCompany"); + this.OnConstructionCompanyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + if (this._Sys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileDate", DbType="DateTime")] + public System.Nullable CompileDate + { + get + { + return this._CompileDate; + } + set + { + if ((this._CompileDate != value)) + { + this.OnCompileDateChanging(value); + this.SendPropertyChanging(); + this._CompileDate = value; + this.SendPropertyChanged("CompileDate"); + this.OnCompileDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reviewer", DbType="NVarChar(50)")] + public string Reviewer + { + get + { + return this._Reviewer; + } + set + { + if ((this._Reviewer != value)) + { + if (this._ReviewerSys_User.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnReviewerChanging(value); + this.SendPropertyChanging(); + this._Reviewer = value; + this.SendPropertyChanged("Reviewer"); + this.OnReviewerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")] + public System.Nullable ReviewDate + { + get + { + return this._ReviewDate; + } + set + { + if ((this._ReviewDate != value)) + { + this.OnReviewDateChanging(value); + this.SendPropertyChanging(); + this._ReviewDate = value; + this.SendPropertyChanged("ReviewDate"); + this.OnReviewDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_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_DocumentDescription.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.JGZL_DocumentDescription.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] + public Sys_User Sys_User + { + get + { + return this._Sys_User.Entity; + } + set + { + Sys_User previousValue = this._Sys_User.Entity; + if (((previousValue != value) + || (this._Sys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Sys_User.Entity = null; + previousValue.JGZL_DocumentDescription.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.JGZL_DocumentDescription.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("Sys_User"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_Sys_User1", Storage="_ReviewerSys_User", ThisKey="Reviewer", OtherKey="UserId", IsForeignKey=true)] + public Sys_User ReviewerSys_User + { + get + { + return this._ReviewerSys_User.Entity; + } + set + { + Sys_User previousValue = this._ReviewerSys_User.Entity; + if (((previousValue != value) + || (this._ReviewerSys_User.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._ReviewerSys_User.Entity = null; + previousValue.JGZL_DocumentDescription_Sys_User1.Remove(this); + } + this._ReviewerSys_User.Entity = value; + if ((value != null)) + { + value.JGZL_DocumentDescription_Sys_User1.Add(this); + this._Reviewer = value.UserId; + } + else + { + this._Reviewer = default(string); + } + this.SendPropertyChanged("ReviewerSys_User"); + } + } + } + + 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_ElectrostaticGrounding")] public partial class JGZL_ElectrostaticGrounding : INotifyPropertyChanging, INotifyPropertyChanged { @@ -117320,6 +117784,10 @@ namespace Model private EntitySet _JGZL_Contact; + private EntitySet _JGZL_DocumentDescription; + + private EntitySet _JGZL_DocumentDescription_Sys_User1; + private EntitySet _JGZL_ElectrostaticGrounding; private EntitySet _JGZL_HandoverCertificate; @@ -117450,6 +117918,8 @@ namespace Model this._JGZL_ConcealedWorksInspectionRecord = new EntitySet(new Action(this.attach_JGZL_ConcealedWorksInspectionRecord), new Action(this.detach_JGZL_ConcealedWorksInspectionRecord)); this._JGZL_ConDrawingVerification = new EntitySet(new Action(this.attach_JGZL_ConDrawingVerification), new Action(this.detach_JGZL_ConDrawingVerification)); this._JGZL_Contact = new EntitySet(new Action(this.attach_JGZL_Contact), new Action(this.detach_JGZL_Contact)); + this._JGZL_DocumentDescription = new EntitySet(new Action(this.attach_JGZL_DocumentDescription), new Action(this.detach_JGZL_DocumentDescription)); + this._JGZL_DocumentDescription_Sys_User1 = new EntitySet(new Action(this.attach_JGZL_DocumentDescription_Sys_User1), new Action(this.detach_JGZL_DocumentDescription_Sys_User1)); this._JGZL_ElectrostaticGrounding = new EntitySet(new Action(this.attach_JGZL_ElectrostaticGrounding), new Action(this.detach_JGZL_ElectrostaticGrounding)); this._JGZL_HandoverCertificate = new EntitySet(new Action(this.attach_JGZL_HandoverCertificate), new Action(this.detach_JGZL_HandoverCertificate)); this._JGZL_IndustrialPipelineInstallationQualityCertificate = new EntitySet(new Action(this.attach_JGZL_IndustrialPipelineInstallationQualityCertificate), new Action(this.detach_JGZL_IndustrialPipelineInstallationQualityCertificate)); @@ -118200,6 +118670,32 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_Sys_User", Storage="_JGZL_DocumentDescription", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] + public EntitySet JGZL_DocumentDescription + { + get + { + return this._JGZL_DocumentDescription; + } + set + { + this._JGZL_DocumentDescription.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_DocumentDescription_Sys_User1", Storage="_JGZL_DocumentDescription_Sys_User1", ThisKey="UserId", OtherKey="Reviewer", DeleteRule="NO ACTION")] + public EntitySet JGZL_DocumentDescription_Sys_User1 + { + get + { + return this._JGZL_DocumentDescription_Sys_User1; + } + set + { + this._JGZL_DocumentDescription_Sys_User1.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_ElectrostaticGrounding_Sys_User", Storage="_JGZL_ElectrostaticGrounding", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet JGZL_ElectrostaticGrounding { @@ -118924,6 +119420,30 @@ namespace Model entity.Sys_User = null; } + private void attach_JGZL_DocumentDescription(JGZL_DocumentDescription entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_JGZL_DocumentDescription(JGZL_DocumentDescription entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + + private void attach_JGZL_DocumentDescription_Sys_User1(JGZL_DocumentDescription entity) + { + this.SendPropertyChanging(); + entity.ReviewerSys_User = this; + } + + private void detach_JGZL_DocumentDescription_Sys_User1(JGZL_DocumentDescription entity) + { + this.SendPropertyChanging(); + entity.ReviewerSys_User = null; + } + private void attach_JGZL_ElectrostaticGrounding(JGZL_ElectrostaticGrounding entity) { this.SendPropertyChanging();