From 37824c70d5feb41cab1d600055774d7fbe88e7bc Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 5 Jan 2026 15:49:33 +0800 Subject: [PATCH] =?UTF-8?q?20260105=20=E4=BA=A4=E5=B7=A5=E8=B5=84=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/HJGLDB_DS_2026-1-5_bwj.sql | 100 ++++ HJGL_DS/BLL/BLL.csproj | 1 + HJGL_DS/BLL/Common/Const.cs | 5 + .../BLL/JGZL/MeasuringInstrumentsService.cs | 88 +++ .../Fastreport/JGZL/周期检定计量器具清单.frx | 165 ++++++ .../JGZL/特种设备安装改造维修告知书.frx | 4 +- .../File/Fastreport/JGZL/管道焊接工作记录.frx | 223 ++++++++ .../JGZL/管道焊接接头报检检查记录.frx | 278 +++++++++ HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj | 32 ++ .../FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../ElectrodeBakeRecordNewSelect.aspx | 2 +- .../JGZL/MeasuringInstruments.aspx | 130 +++++ .../JGZL/MeasuringInstruments.aspx.cs | 405 +++++++++++++ .../MeasuringInstruments.aspx.designer.cs | 206 +++++++ .../JGZL/MeasuringInstrumentsEdit.aspx | 71 +++ .../JGZL/MeasuringInstrumentsEdit.aspx.cs | 123 ++++ .../MeasuringInstrumentsEdit.aspx.designer.cs | 143 +++++ .../JGZL/PipeWeldingWorkRecord.aspx | 113 ++++ .../JGZL/PipeWeldingWorkRecord.aspx.cs | 281 +++++++++ .../PipeWeldingWorkRecord.aspx.designer.cs | 170 ++++++ .../SpecialEquipmentMaintenanceEdit.aspx.cs | 5 + .../JGZL/WeldInspectionCheckRecord.aspx | 106 ++++ .../JGZL/WeldInspectionCheckRecord.aspx.cs | 337 +++++++++++ ...WeldInspectionCheckRecord.aspx.designer.cs | 242 ++++++++ HJGL_DS/FineUIPro.Web/Web.config | 4 +- HJGL_DS/Model/Model.cs | 535 +++++++++++++++++- HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +- 27 files changed, 3760 insertions(+), 13 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-1-5_bwj.sql create mode 100644 HJGL_DS/BLL/JGZL/MeasuringInstrumentsService.cs create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/周期检定计量器具清单.frx create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx create mode 100644 HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.designer.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs create mode 100644 HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs diff --git a/DataBase/版本日志/HJGLDB_DS_2026-1-5_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-1-5_bwj.sql new file mode 100644 index 0000000..91deac9 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-1-5_bwj.sql @@ -0,0 +1,100 @@ +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('AA56E986-CDB6-438E-B4AA-F1A7DE373C8B','ڼ춨嵥','JGZL/MeasuringInstruments.aspx',130,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('AA5266FC-2C5D-49ED-84F5-40FAE2B812B4','AA56E986-CDB6-438E-B4AA-F1A7DE373C8B','',1) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('CF349B4B-554F-44D9-A850-485B715E6C54','AA56E986-CDB6-438E-B4AA-F1A7DE373C8B','޸',2) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('2C99524B-36AE-4FC6-8553-371EEB8E26DE','AA56E986-CDB6-438E-B4AA-F1A7DE373C8B','ɾ',3) +insert into ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +values('8FB66A2E-6F6D-456E-AE41-31C9511FDDC8','AA56E986-CDB6-438E-B4AA-F1A7DE373C8B','',4) +go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('91E5673F-AB5C-41D6-A675-274733D4D9A4','ܵӹ¼','JGZL/PipeWeldingWorkRecord.aspx',170,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuModule) +values('763FE5A3-0B2D-4A77-A663-F5B3C024F21E','ܵӽͷ/¼','JGZL/WeldInspectionCheckRecord.aspx',180,'2A84FA58-8B20-48ED-A621-3EC98CF4AD28','3') +go +CREATE TABLE [dbo].[JGZL_MeasuringInstruments]( + [MeasuringInstrumentsId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [MeasuringInstrumentsName] [nvarchar](50) NULL, + [MeasuringInstrumentsCode] [nvarchar](50) NULL, + [Specification] [nvarchar](50) NULL, + [AccuracyLevel] [nvarchar](50) NULL, + [CertificateNumber] [nvarchar](50) NULL, + [VerificationDate] [datetime] NULL, + [ValidityPeriod] [nvarchar](50) NULL, + [Remark] [nvarchar](500) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [Reviewer] [nvarchar](50) NULL, + [RevieweDate] [datetime] NULL, + CONSTRAINT [PK_JGZL_MeasuringInstruments] PRIMARY KEY CLUSTERED +( + [MeasuringInstrumentsId] 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_MeasuringInstruments] WITH CHECK ADD CONSTRAINT [FK_JGZL_MeasuringInstruments_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[JGZL_MeasuringInstruments] CHECK CONSTRAINT [FK_JGZL_MeasuringInstruments_Base_Project] +GO + +ALTER TABLE [dbo].[JGZL_MeasuringInstruments] WITH CHECK ADD CONSTRAINT [FK_JGZL_MeasuringInstruments_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +GO + +ALTER TABLE [dbo].[JGZL_MeasuringInstruments] CHECK CONSTRAINT [FK_JGZL_MeasuringInstruments_Sys_User] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'MeasuringInstrumentsId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @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_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'MeasuringInstrumentsName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'MeasuringInstrumentsCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'Specification' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȵȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'AccuracyLevel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'춨/У׼֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'CertificateNumber' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'춨/У׼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'VerificationDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ч' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'ValidityPeriod' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'Remark' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments', @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_MeasuringInstruments', @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_MeasuringInstruments', @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_MeasuringInstruments', @level2type=N'COLUMN',@level2name=N'RevieweDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڼ춨嵥' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JGZL_MeasuringInstruments' +GO + + diff --git a/HJGL_DS/BLL/BLL.csproj b/HJGL_DS/BLL/BLL.csproj index 9817d76..77582ac 100644 --- a/HJGL_DS/BLL/BLL.csproj +++ b/HJGL_DS/BLL/BLL.csproj @@ -250,6 +250,7 @@ + diff --git a/HJGL_DS/BLL/Common/Const.cs b/HJGL_DS/BLL/Common/Const.cs index 9ee3c2f..5516ec9 100644 --- a/HJGL_DS/BLL/Common/Const.cs +++ b/HJGL_DS/BLL/Common/Const.cs @@ -1790,6 +1790,11 @@ namespace BLL /// 施工图核查记录 /// public const string JGZL_ConDrawingVerificationMenuId = "E6221F7D-9A68-44FB-974D-6857EC9CC5E8"; + + /// + /// 周期检定计量器具清单 + /// + public const string JGZL_MeasuringInstrumentsMenuId = "AA56E986-CDB6-438E-B4AA-F1A7DE373C8B"; #endregion #region 报表对应ID diff --git a/HJGL_DS/BLL/JGZL/MeasuringInstrumentsService.cs b/HJGL_DS/BLL/JGZL/MeasuringInstrumentsService.cs new file mode 100644 index 0000000..4ed4e55 --- /dev/null +++ b/HJGL_DS/BLL/JGZL/MeasuringInstrumentsService.cs @@ -0,0 +1,88 @@ +using Model; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BLL +{ + /// + /// 周期检定计量器具清单 + /// + public class MeasuringInstrumentsService + { + /// + /// 根据主键获取周期检定计量器具清单 + /// + /// + /// + public static Model.JGZL_MeasuringInstruments GetMeasuringInstrumentsById(string measuringInstrumentsId) + { + return Funs.DB.JGZL_MeasuringInstruments.FirstOrDefault(e => e.MeasuringInstrumentsId == measuringInstrumentsId); + } + + /// + /// 添加周期检定计量器具清单 + /// + /// + public static void AddMeasuringInstruments(Model.JGZL_MeasuringInstruments measuringInstruments) + { + SGGLDB db = Funs.DB; + Model.JGZL_MeasuringInstruments newMeasuringInstruments = new JGZL_MeasuringInstruments(); + newMeasuringInstruments.MeasuringInstrumentsId = measuringInstruments.MeasuringInstrumentsId; + newMeasuringInstruments.ProjectId = measuringInstruments.ProjectId; + newMeasuringInstruments.MeasuringInstrumentsName = measuringInstruments.MeasuringInstrumentsName; + newMeasuringInstruments.MeasuringInstrumentsCode = measuringInstruments.MeasuringInstrumentsCode; + newMeasuringInstruments.Specification = measuringInstruments.Specification; + newMeasuringInstruments.AccuracyLevel = measuringInstruments.AccuracyLevel; + newMeasuringInstruments.CertificateNumber = measuringInstruments.CertificateNumber; + newMeasuringInstruments.VerificationDate = measuringInstruments.VerificationDate; + newMeasuringInstruments.ValidityPeriod = measuringInstruments.ValidityPeriod; + newMeasuringInstruments.Remark = measuringInstruments.Remark; + newMeasuringInstruments.CompileMan = measuringInstruments.CompileMan; + newMeasuringInstruments.CompileDate = measuringInstruments.CompileDate; + newMeasuringInstruments.Reviewer = measuringInstruments.Reviewer; + newMeasuringInstruments.RevieweDate = measuringInstruments.RevieweDate; + db.JGZL_MeasuringInstruments.InsertOnSubmit(newMeasuringInstruments); + db.SubmitChanges(); + } + + /// + /// 修改周期检定计量器具清单 + /// + /// + public static void UpdateMeasuringInstruments(Model.JGZL_MeasuringInstruments measuringInstruments) + { + SGGLDB db = Funs.DB; + Model.JGZL_MeasuringInstruments newMeasuringInstruments = db.JGZL_MeasuringInstruments.FirstOrDefault(e => e.MeasuringInstrumentsId == measuringInstruments.MeasuringInstrumentsId); + if (newMeasuringInstruments != null) + { + newMeasuringInstruments.MeasuringInstrumentsName = measuringInstruments.MeasuringInstrumentsName; + newMeasuringInstruments.MeasuringInstrumentsCode = measuringInstruments.MeasuringInstrumentsCode; + newMeasuringInstruments.Specification = measuringInstruments.Specification; + newMeasuringInstruments.AccuracyLevel = measuringInstruments.AccuracyLevel; + newMeasuringInstruments.CertificateNumber = measuringInstruments.CertificateNumber; + newMeasuringInstruments.VerificationDate = measuringInstruments.VerificationDate; + newMeasuringInstruments.ValidityPeriod = measuringInstruments.ValidityPeriod; + newMeasuringInstruments.Remark = measuringInstruments.Remark; + db.SubmitChanges(); + } + } + + /// + /// 根据主键删除周期检定计量器具清单 + /// + /// + public static void DeleteMeasuringInstrumentsById(string measuringInstrumentsId) + { + SGGLDB db = Funs.DB; + Model.JGZL_MeasuringInstruments measuringInstruments = db.JGZL_MeasuringInstruments.FirstOrDefault(e => e.MeasuringInstrumentsId == measuringInstrumentsId); + if (measuringInstruments != null) + { + db.JGZL_MeasuringInstruments.DeleteOnSubmit(measuringInstruments); + 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..5d60bcb --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/周期检定计量器具清单.frx @@ -0,0 +1,165 @@ + + + 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 e55d813..bcea7c1 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 new file mode 100644 index 0000000..7609f4e --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接工作记录.frx @@ -0,0 +1,223 @@ + + + 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 int x; + private string header=""; + + private void Table2_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + // print the table body + Table2.PrintRow(0); + Table2.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + + private void Cell3_BeforePrint(object sender, EventArgs e) + { + if (Report.Engine.PageNo>1) + { + header="(续)"; + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..1c60815 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊接接头报检检查记录.frx @@ -0,0 +1,278 @@ + + + using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel; +using System.Windows.Forms; +using System.Drawing; +using System.Data; +using FastReport; +using FastReport.Data; +using FastReport.Dialog; +using FastReport.Barcode; +using FastReport.Table; +using FastReport.Utils; + +namespace FastReport +{ + public class ReportScript + { + + private void Table2_ManualBuild(object sender, EventArgs e) + { + DataSourceBase rowData = Report.GetDataSource("Data"); + // init the data source + rowData.Init(); + + // print the first table row - it is a header + + // now enumerate the data source and print the table body + while (rowData.HasMoreRows) + { + // print the table body + Table2.PrintRow(0); + Table2.PrintColumns(); + + // go next data source row + rowData.Next(); + } + } + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index 1eb3e7f..6b8d385 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1251,11 +1251,15 @@ + + + + @@ -6605,6 +6609,20 @@ HandoverCertificateEdit.aspx + + MeasuringInstruments.aspx + ASPXCodeBehind + + + MeasuringInstruments.aspx + + + MeasuringInstrumentsEdit.aspx + ASPXCodeBehind + + + MeasuringInstrumentsEdit.aspx + NDTPerson.aspx ASPXCodeBehind @@ -6619,6 +6637,13 @@ NDTPersonEdit.aspx + + PipeWeldingWorkRecord.aspx + ASPXCodeBehind + + + PipeWeldingWorkRecord.aspx + QualifiedWelder.aspx ASPXCodeBehind @@ -6640,6 +6665,13 @@ SpecialEquipmentMaintenanceEdit.aspx + + WeldInspectionCheckRecord.aspx + ASPXCodeBehind + + + WeldInspectionCheckRecord.aspx + Login.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index a1d9585..72b6a27 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/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx index 21e9685..0b405c8 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/MaterialManage/ElectrodeBakeRecordNewSelect.aspx @@ -57,7 +57,7 @@ HeaderText="规格mm" HeaderTextAlign="Center" TextAlign="Center"> + HeaderText="数量kg" HeaderTextAlign="Center" TextAlign="Center"> <%-- diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx new file mode 100644 index 0000000..a8acaf9 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx @@ -0,0 +1,130 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeasuringInstruments.aspx.cs" Inherits="FineUIPro.Web.JGZL.MeasuringInstruments" %> + + + + + + + 周期检定计量器具清单 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs new file mode 100644 index 0000000..992d36a --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.cs @@ -0,0 +1,405 @@ +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 System.IO; + +namespace FineUIPro.Web.JGZL +{ + public partial class MeasuringInstruments : 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.InitTreeMenu();//加载树 + } + } + #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_MeasuringInstruments where 1=1"; + List listStr = new List(); + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + strSql += " AND 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.InitTreeMenu(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #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(); + + string strSql = @"SELECT * from JGZL_MeasuringInstruments where ProjectId = @ProjectId order by MeasuringInstrumentsCode desc"; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", projectId)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("Num"); + dt.Columns.Add("MeasuringInstrumentsName"); + dt.Columns.Add("MeasuringInstrumentsCode"); + dt.Columns.Add("Specification"); + dt.Columns.Add("AccuracyLevel"); + dt.Columns.Add("CertificateNumber"); + dt.Columns.Add("VerificationDate"); + dt.Columns.Add("ValidityPeriod"); + dt.Columns.Add("Remark"); + + DataRow[] rows = tb.DefaultView.ToTable().Select(); + int i = 0; + foreach (var row in rows) + { + var newRow = dt.NewRow(); + newRow["Num"] = (i + 1).ToString(); + newRow["MeasuringInstrumentsName"] = row["MeasuringInstrumentsName"].ToString(); + newRow["MeasuringInstrumentsCode"] = row["MeasuringInstrumentsCode"].ToString(); + newRow["Specification"] = row["Specification"].ToString(); + newRow["AccuracyLevel"] = row["AccuracyLevel"].ToString(); + newRow["CertificateNumber"] = row["CertificateNumber"].ToString(); + string ValidityDate = string.Format("{0:yyyy-MM-dd}", row["VerificationDate"]); + newRow["VerificationDate"] = ValidityDate; + newRow["ValidityPeriod"] = row["ValidityPeriod"].ToString(); + newRow["Remark"] = row["Remark"].ToString(); + dt.Rows.Add(newRow); + i++; + } + BLL.Common.FastReportService.AddFastreportTable(dt); + + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + 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 + + #region 维护 + /// + /// 增加 + /// + /// + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MeasuringInstrumentsEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + + /// + /// 双击编辑 + /// + /// + /// + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_MeasuringInstrumentsMenuId, BLL.Const.BtnModify)) + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MeasuringInstrumentsEdit.aspx?measuringInstrumentsId={0}", this.Grid1.SelectedRowID, "编辑 - "))); + } + else + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + } + else + { + Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + return; + } + } + else + { + ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 右键编辑 + /// + /// + /// + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_MeasuringInstrumentsMenuId, BLL.Const.BtnModify)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MeasuringInstrumentsEdit.aspx?measuringInstrumentsId={0}", Grid1.SelectedRowID, "维护 - "))); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + /// + /// 右键删除 + /// + /// + /// + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_MeasuringInstrumentsMenuId, Const.BtnDelete)) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + + bool isShow = true; + if (Grid1.SelectedRowIndexArray.Length > 1) + { + isShow = false; + } + bool isDelete = false; + foreach (int rowIndex in Grid1.SelectedRowIndexArray) + { + string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + if (judgementDelete(rowID, isShow)) + { + isDelete = true; + BLL.MeasuringInstrumentsService.DeleteMeasuringInstrumentsById(rowID); + BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除周期检定计量器具清单"); + } + } + if (isDelete) + { + ShowNotify("删除成功！", MessageBoxIcon.Success); + } + this.BindGrid(); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + } + } + + #region 判断是否可删除 + /// + /// 判断是否可以删除 + /// + /// + private bool judgementDelete(string id, bool isShow) + { + string content = string.Empty; + + if (string.IsNullOrEmpty(content)) + { + return true; + } + else + { + if (isShow) + { + Alert.ShowInTop(content, MessageBoxIcon.Error); + } + return false; + } + } + #endregion + #endregion + + #region 关闭弹出窗口及刷新页面 + /// + /// 关闭弹出窗口 + /// + /// + /// + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.InitTreeMenu();//加载树 + this.BindGrid(); + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.designer.cs new file mode 100644 index 0000000..a79a010 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstruments.aspx.designer.cs @@ -0,0 +1,206 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class MeasuringInstruments + { + + /// + /// 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; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// WindowPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowPrint; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx new file mode 100644 index 0000000..8c0b055 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx @@ -0,0 +1,71 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeasuringInstrumentsEdit.aspx.cs" Inherits="FineUIPro.Web.JGZL.MeasuringInstrumentsEdit" %> + + + + + + + 编辑周期检定计量器具清单 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs new file mode 100644 index 0000000..033c79b --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.cs @@ -0,0 +1,123 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.JGZL +{ + public partial class MeasuringInstrumentsEdit : PageBase + { + #region 定义项 + /// + /// 主键 + /// + private string MeasuringInstrumentsId + { + get + { + return (string)ViewState["MeasuringInstrumentsId"]; + } + set + { + ViewState["MeasuringInstrumentsId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.ProjectId = Request.Params["projectId"]; + this.MeasuringInstrumentsId = Request.Params["measuringInstrumentsId"]; + if (!string.IsNullOrEmpty(this.MeasuringInstrumentsId)) + { + var report = BLL.MeasuringInstrumentsService.GetMeasuringInstrumentsById(this.MeasuringInstrumentsId); + if (report != null) + { + this.txtMeasuringInstrumentsName.Text = report.MeasuringInstrumentsName; + this.txtMeasuringInstrumentsCode.Text = report.MeasuringInstrumentsCode; + this.txtSpecification.Text = report.Specification; + this.txtAccuracyLevel.Text = report.AccuracyLevel; + 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; + } + } + } + } + #endregion + + #region 提交按钮 + /// + /// 提交按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_MeasuringInstrumentsMenuId, Const.BtnSave)) + { + Model.JGZL_MeasuringInstruments newReport = new Model.JGZL_MeasuringInstruments(); + newReport.MeasuringInstrumentsName = this.txtMeasuringInstrumentsName.Text.Trim(); + newReport.MeasuringInstrumentsCode = this.txtMeasuringInstrumentsCode.Text.Trim(); + newReport.Specification = this.txtSpecification.Text.Trim(); + newReport.AccuracyLevel = this.txtAccuracyLevel.Text.Trim(); + newReport.CertificateNumber = this.txtCertificateNumber.Text.Trim(); + newReport.VerificationDate = Funs.GetNewDateTime(this.txtVerificationDate.Text.Trim()); + newReport.ValidityPeriod = this.txtValidityPeriod.Text.Trim(); + newReport.Remark = this.txtRemark.Text.Trim(); + + if (!string.IsNullOrEmpty(this.MeasuringInstrumentsId)) + { + newReport.MeasuringInstrumentsId = this.MeasuringInstrumentsId; + BLL.MeasuringInstrumentsService.UpdateMeasuringInstruments(newReport); + } + else + { + newReport.ProjectId = this.ProjectId; + newReport.CompileMan = this.CurrUser.UserId; + newReport.CompileDate = DateTime.Now; + newReport.Reviewer = this.CurrUser.UserId; + newReport.RevieweDate = DateTime.Now; + newReport.MeasuringInstrumentsId = SQLHelper.GetNewID(typeof(Model.JGZL_MeasuringInstruments)); + this.MeasuringInstrumentsId = newReport.MeasuringInstrumentsId; + BLL.MeasuringInstrumentsService.AddMeasuringInstruments(newReport); + } + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.designer.cs new file mode 100644 index 0000000..af87d59 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/MeasuringInstrumentsEdit.aspx.designer.cs @@ -0,0 +1,143 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class MeasuringInstrumentsEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// txtMeasuringInstrumentsName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMeasuringInstrumentsName; + + /// + /// txtMeasuringInstrumentsCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMeasuringInstrumentsCode; + + /// + /// txtSpecification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSpecification; + + /// + /// txtAccuracyLevel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccuracyLevel; + + /// + /// txtCertificateNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCertificateNumber; + + /// + /// txtVerificationDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtVerificationDate; + + /// + /// txtValidityPeriod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValidityPeriod; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + } +} diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx new file mode 100644 index 0000000..d7636bf --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx @@ -0,0 +1,113 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PipeWeldingWorkRecord.aspx.cs" Inherits="FineUIPro.Web.JGZL.PipeWeldingWorkRecord" %> + + + + + + + 管道焊接工作记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs new file mode 100644 index 0000000..fb2c97b --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.cs @@ -0,0 +1,281 @@ +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 System.IO; + +namespace FineUIPro.Web.JGZL +{ + public partial class PipeWeldingWorkRecord : 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); + Funs.FineUIPleaseSelect(this.drpIsoId); + + this.InitTreeMenu();//加载树 + } + } + #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(); + this.Grid1.Items.Clear(); + this.Grid1.DataBind(); + this.drpIsoId.Items.Clear(); + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.tvControlItem.SelectedNodeID select x).ToList(); + this.drpIsoId.DataBind(); + Funs.FineUIPleaseSelect(this.drpIsoId); + this.drpIsoId.SelectedIndex = 0; + } + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid() + { + if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue)) + { + List listStr = new List(); + listStr.Add(new SqlParameter("@IsoId", this.drpIsoId.SelectedValue)); + listStr.Add(new SqlParameter("@Flag", "0")); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = BLL.SQLHelper.GetDataTableRunProc("HJGL_spJointWorkRecordNew", parameter); + + DataView dv = tb.DefaultView;//获取表视图 + dv.Sort = "JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5 ASC";//按照ID排序 + tb = dv.ToTable();//转为表 + + // 2.获取当前分页数据 + //var table = this.GetPagedDataTable(Grid1, tb1); + Grid1.RecordCount = tb.Rows.Count; + //this.Grid1.PageIndex = 0; + //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.InitTreeMenu(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + string projectId = this.tvControlItem.SelectedNodeID; + string isoId = string.Empty; + + if (projectId != null) + { + if (this.drpIsoId.SelectedValue!=BLL.Const._Null&&!string.IsNullOrEmpty(this.drpIsoId.SelectedValue)) + { + isoId = this.drpIsoId.SelectedValue; + } + if (!string.IsNullOrEmpty(isoId)) + { + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); + + List listStr = new List(); + listStr.Add(new SqlParameter("@IsoId", isoId)); + listStr.Add(new SqlParameter("@Flag", "0")); + SqlParameter[] parameter = listStr.ToArray(); + DataTable tb = BLL.SQLHelper.GetDataTableRunProc("HJGL_spJointWorkRecordNew", parameter); + + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("ISO_IsoNo"); + dt.Columns.Add("JOT_JointNo"); + dt.Columns.Add("WED_Code"); + dt.Columns.Add("JOT_JointDesc"); + dt.Columns.Add("STE_Code"); + dt.Columns.Add("weldLocal"); + dt.Columns.Add("WME_Name"); + dt.Columns.Add("WMT_MatName"); + dt.Columns.Add("JOT_PrepareTemp"); + dt.Columns.Add("WeldDate"); + + DataView dv = tb.DefaultView;//获取表视图 + dv.Sort = "JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5 ASC";//按照ID排序 + tb = dv.ToTable();//转为表 + DataRow[] rows = tb.DefaultView.ToTable().Select(); + foreach (var row in rows) + { + var newRow = dt.NewRow(); + newRow["ISO_IsoNo"] = row["ISO_IsoNo"].ToString(); + newRow["JOT_JointNo"] = row["JOT_JointNo"].ToString(); + newRow["WED_Code"] = row["WED_Code"].ToString(); + newRow["JOT_JointDesc"] = row["JOT_JointDesc"].ToString(); + newRow["STE_Code"] = row["STE_Code"].ToString(); + newRow["weldLocal"] = row["weldLocal"].ToString(); + newRow["WME_Name"] = row["WME_Name"].ToString(); + newRow["WMT_MatName"] = row["WMT_MatName"].ToString(); + newRow["JOT_PrepareTemp"] = row["JOT_PrepareTemp"].ToString(); + string WeldDate = string.Format("{0:yyyy-MM-dd}", row["WeldDate"]); + newRow["WeldDate"] = WeldDate; + dt.Rows.Add(newRow); + } + BLL.Common.FastReportService.AddFastreportTable(dt); + + 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; + } + } + #endregion + + protected void drpIsoId_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.designer.cs new file mode 100644 index 0000000..4b5eee5 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/PipeWeldingWorkRecord.aspx.designer.cs @@ -0,0 +1,170 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class PipeWeldingWorkRecord + { + + /// + /// 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; + + /// + /// drpIsoId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsoId; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// 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/SpecialEquipmentMaintenanceEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenanceEdit.aspx.cs index 2b85789..881dc00 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenanceEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/SpecialEquipmentMaintenanceEdit.aspx.cs @@ -85,6 +85,11 @@ namespace FineUIPro.Web.JGZL this.txtUseEmail.Text = report.UseEmail; } } + else + { + this.txtConUnit.Text = "浙江鼎盛石化工程有限公司"; + this.txtEquipmentName.Text = "压力管道（" + BLL.Base_ProjectService.GetProjectByProjectId(ProjectId).ProjectName + "）"; + } } } #endregion diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx new file mode 100644 index 0000000..98a955a --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx @@ -0,0 +1,106 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WeldInspectionCheckRecord.aspx.cs" Inherits="FineUIPro.Web.JGZL.WeldInspectionCheckRecord" %> + + + + + + + 管道焊接接头报检/检查记录 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs new file mode 100644 index 0000000..7f8f0c2 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.cs @@ -0,0 +1,337 @@ +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 System.IO; +using FineUIPro.Web.common.BaseInfo; + +namespace FineUIPro.Web.JGZL +{ + public partial class WeldInspectionCheckRecord : 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); + Funs.FineUIPleaseSelect(this.drpIsoId); + + this.InitTreeMenu();//加载树 + } + } + #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(); + //this.Grid1.Items.Clear(); + //this.Grid1.DataBind(); + this.drpIsoId.Items.Clear(); + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = (from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.tvControlItem.SelectedNodeID select x).ToList(); + this.drpIsoId.DataBind(); + Funs.FineUIPleaseSelect(this.drpIsoId); + this.drpIsoId.SelectedIndex = 0; + } + } + #endregion + + #region 数据绑定 + /// + /// 数据绑定 + /// + private void BindGrid() + { + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + { + string strSql = @" select distinct batch.ProjectId, + Project.ProjectCode, + Project.ProjectName, + weldReport.JOT_WeldDate, + (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝' + WHEN jointType.JOTY_Group='2' THEN '角焊缝' + WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType, + jointType.JOTY_Group, + rate.NDTR_ID, + rate.NDTR_Name, + isoInfo.ISO_ID, + isoInfo.ISO_IsoNo, + batch.BatchCode + from HJGL_BO_BatchDetail batchDetail + JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId + LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID + left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID + LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId + left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID + LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = batch.JOTY_ID + LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); + if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue)) + { + strSql += " AND isoInfo.ISO_ID=@isoId"; + listStr.Add(new SqlParameter("@isoId", this.drpIsoId.SelectedValue)); + } + if (!string.IsNullOrEmpty(this.txtWeldingDate.Text.Trim())) + { + strSql += " AND weldReport.JOT_WeldDate=@weldingDate"; + listStr.Add(new SqlParameter("@weldingDate", this.txtWeldingDate.Text.Trim())); + } + SqlParameter[] parameter = listStr.ToArray(); + Grid1.DataSource = SQLHelper.GetDataTableRunText(strSql, parameter); + 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.InitTreeMenu(); + } + + /// + /// 查询 + /// + /// + /// + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + #endregion + + #region 打印 + /// + /// 打印 + /// + /// + /// + protected void btnPrint_Click(object sender, EventArgs e) + { + string projectId = this.tvControlItem.SelectedNodeID; + if (projectId != null && !string.IsNullOrEmpty(projectId)) + { + if (Grid1.SelectedRowIndexArray.Length <= 0) + { + Alert.ShowInTop("最少选中一行！", MessageBoxIcon.Warning); + return; + } + if (Grid1.Rows.Count > 0) + { + for (int gi = 0; gi < Grid1.Rows.Count; gi++) + { + if (Grid1.SelectedRowIndex == gi) + { + string initTemplatePath = ""; + string rootPath = Server.MapPath("~/"); + BLL.Common.FastReportService.ResetData(); + + System.Web.UI.WebControls.HiddenField hidProjectId = Grid1.Rows[gi].FindControl("hidProjectId") as System.Web.UI.WebControls.HiddenField; + System.Web.UI.WebControls.HiddenField hidNDTR_ID = Grid1.Rows[gi].FindControl("hidNDTR_ID") as System.Web.UI.WebControls.HiddenField; + System.Web.UI.WebControls.HiddenField hidJOTY_Group = Grid1.Rows[gi].FindControl("hidJOTY_Group") as System.Web.UI.WebControls.HiddenField; + System.Web.UI.WebControls.HiddenField hidJOT_WeldDate = Grid1.Rows[gi].FindControl("hidJOT_WeldDate") as System.Web.UI.WebControls.HiddenField; + System.Web.UI.WebControls.HiddenField hidProjectName = Grid1.Rows[gi].FindControl("hidProjectName") as System.Web.UI.WebControls.HiddenField; + System.Web.UI.WebControls.HiddenField hidISO_ID = Grid1.Rows[gi].FindControl("hidISO_ID") as System.Web.UI.WebControls.HiddenField; + + var listStr = new List(); + listStr.Add(new SqlParameter("@ProjectId", hidProjectId.Value)); + listStr.Add(new SqlParameter("@NDTR_ID", hidNDTR_ID.Value)); + listStr.Add(new SqlParameter("@JOTY_Group", hidJOTY_Group.Value)); + listStr.Add(new SqlParameter("@WeldingDate", hidJOT_WeldDate.Value)); + listStr.Add(new SqlParameter("@ISO_ID", hidISO_ID.Value)); + + SqlParameter[] parameter = listStr.ToArray(); + var tb = SQLHelper.GetDataTableRunProc("HJGL_sp_WeldInspectionCheckRecordNew", parameter); + + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("Number"); + dt.Columns.Add("ISO_IsoNo"); + dt.Columns.Add("JOT_JointNo"); + dt.Columns.Add("WED_Code"); + dt.Columns.Add("JOT_JointDesc"); + dt.Columns.Add("STE_Code"); + dt.Columns.Add("JOT_Location"); + dt.Columns.Add("WME_Name"); + dt.Columns.Add("WMT_MatName"); + dt.Columns.Add("JOT_PrepareTemp"); + dt.Columns.Add("PassVI"); + dt.Columns.Add("NoPassVI"); + dt.Columns.Add("Remark"); + + DataView dv = tb.DefaultView;//获取表视图 + dv.Sort = "ISO_IsoNo,JOT_JointNo ASC";//按照ID倒序排序 + tb = dv.ToTable();//转为表 + DataRow[] rows = tb.DefaultView.ToTable().Select(); + int i = 0; + foreach (var row in rows) + { + var newRows = dt.NewRow(); + newRows["Number"] = (i + 1).ToString(); + newRows["ISO_IsoNo"] = row["ISO_IsoNo"].ToString(); + newRows["JOT_JointNo"] = row["JOT_JointNo"].ToString(); + newRows["WED_Code"] = row["WED_Code"].ToString(); + newRows["JOT_JointDesc"] = row["JOT_JointDesc"].ToString(); + newRows["STE_Code"] = row["STE_Code"].ToString(); + newRows["JOT_Location"] = row["JOT_Location"].ToString(); + newRows["WME_Name"] = row["WME_Name"].ToString(); + newRows["WMT_MatName"] = row["WMT_MatName"].ToString(); + newRows["JOT_PrepareTemp"] = row["JOT_PrepareTemp"].ToString(); + newRows["PassVI"] = row["PassVI"].ToString(); + newRows["NoPassVI"] = row["NoPassVI"].ToString(); + newRows["Remark"] = row["Remark"].ToString(); + dt.Rows.Add(newRows); + i++; + } + BLL.Common.FastReportService.AddFastreportTable(dt); + + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("InspectionCount", tb.Rows.Count.ToString()); + string nderName = string.Empty; + if (!string.IsNullOrEmpty(hidNDTR_ID.Value)) + { + var rate = BLL.HJGL_DetectionService.GetNDTRateByNDTRID(hidNDTR_ID.Value); + if (rate != null) + { + nderName = rate.NDTR_Name; + } + } + keyValuePairs.Add("NDTRName", nderName); + if (hidJOTY_Group.Value == "1") + { + keyValuePairs.Add("NDTType", "RT"); + } + else + { + keyValuePairs.Add("NDTType", "PT"); + } + 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 + + protected void drpIsoId_SelectedIndexChanged(object sender, EventArgs e) + { + BindGrid(); + } + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs new file mode 100644 index 0000000..19be546 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/JGZL/WeldInspectionCheckRecord.aspx.designer.cs @@ -0,0 +1,242 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.JGZL +{ + + + public partial class WeldInspectionCheckRecord + { + + /// + /// 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; + + /// + /// drpIsoId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsoId; + + /// + /// txtWeldingDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtWeldingDate; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnPrint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnPrint; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + + /// + /// hidProjectId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.HiddenField hidProjectId; + + /// + /// hidNDTR_ID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.HiddenField hidNDTR_ID; + + /// + /// hidJOTY_Group 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.HiddenField hidJOTY_Group; + + /// + /// hidJOT_WeldDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.HiddenField hidJOT_WeldDate; + + /// + /// hidProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.HiddenField hidProjectName; + + /// + /// hidISO_ID 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.HiddenField hidISO_ID; + + /// + /// 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/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 5c46a5b..6bfb6c8 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -16,7 +16,7 @@ - + @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 5cf7cfb..8ad3ddc 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -386,6 +386,9 @@ namespace Model partial void InsertJGZL_HandoverCertificate(JGZL_HandoverCertificate instance); partial void UpdateJGZL_HandoverCertificate(JGZL_HandoverCertificate instance); partial void DeleteJGZL_HandoverCertificate(JGZL_HandoverCertificate instance); + partial void InsertJGZL_MeasuringInstruments(JGZL_MeasuringInstruments instance); + partial void UpdateJGZL_MeasuringInstruments(JGZL_MeasuringInstruments instance); + partial void DeleteJGZL_MeasuringInstruments(JGZL_MeasuringInstruments instance); partial void InsertJGZL_NDTPerson(JGZL_NDTPerson instance); partial void UpdateJGZL_NDTPerson(JGZL_NDTPerson instance); partial void DeleteJGZL_NDTPerson(JGZL_NDTPerson instance); @@ -1788,6 +1791,14 @@ namespace Model } } + public System.Data.Linq.Table JGZL_MeasuringInstruments + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table JGZL_NDTPerson { get @@ -4403,6 +4414,8 @@ namespace Model private EntitySet _JGZL_HandoverCertificate; + private EntitySet _JGZL_MeasuringInstruments; + private EntitySet _JGZL_NDTPerson; private EntitySet _JGZL_SpecialEquipmentMaintenance; @@ -4536,6 +4549,7 @@ namespace Model 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_HandoverCertificate = new EntitySet(new Action(this.attach_JGZL_HandoverCertificate), new Action(this.detach_JGZL_HandoverCertificate)); + this._JGZL_MeasuringInstruments = new EntitySet(new Action(this.attach_JGZL_MeasuringInstruments), new Action(this.detach_JGZL_MeasuringInstruments)); this._JGZL_NDTPerson = new EntitySet(new Action(this.attach_JGZL_NDTPerson), new Action(this.detach_JGZL_NDTPerson)); this._JGZL_SpecialEquipmentMaintenance = new EntitySet(new Action(this.attach_JGZL_SpecialEquipmentMaintenance), new Action(this.detach_JGZL_SpecialEquipmentMaintenance)); this._Project_Installation = new EntitySet(new Action(this.attach_Project_Installation), new Action(this.detach_Project_Installation)); @@ -5670,6 +5684,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_MeasuringInstruments_Base_Project", Storage="_JGZL_MeasuringInstruments", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet JGZL_MeasuringInstruments + { + get + { + return this._JGZL_MeasuringInstruments; + } + set + { + this._JGZL_MeasuringInstruments.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_NDTPerson_Base_Project", Storage="_JGZL_NDTPerson", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet JGZL_NDTPerson { @@ -6414,6 +6441,18 @@ namespace Model entity.Base_Project = null; } + private void attach_JGZL_MeasuringInstruments(JGZL_MeasuringInstruments entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_JGZL_MeasuringInstruments(JGZL_MeasuringInstruments entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_JGZL_NDTPerson(JGZL_NDTPerson entity) { this.SendPropertyChanging(); @@ -27020,7 +27059,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatCode", DbType="VarChar(20) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatCode", DbType="VarChar(50) NOT NULL", CanBeNull=false)] public string WMT_MatCode { get @@ -57138,7 +57177,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatCode", DbType="VarChar(20)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatCode", DbType="VarChar(50)")] public string WMT_MatCode { get @@ -57170,7 +57209,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="hsCode", Storage="_HsCode", DbType="VarChar(20)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="hsCode", Storage="_HsCode", DbType="VarChar(50)")] public string HsCode { get @@ -63152,7 +63191,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatName", DbType="VarChar(41) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatName", DbType="VarChar(101) NOT NULL", CanBeNull=false)] public string WMT_MatName { get @@ -65025,7 +65064,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMat", DbType="VarChar(20)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMat", DbType="VarChar(50)")] public string WeldMat { get @@ -65041,7 +65080,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilk", DbType="VarChar(20)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilk", DbType="VarChar(50)")] public string WeldSilk { get @@ -81610,6 +81649,462 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.JGZL_MeasuringInstruments")] + public partial class JGZL_MeasuringInstruments : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _MeasuringInstrumentsId; + + private string _ProjectId; + + private string _MeasuringInstrumentsName; + + private string _MeasuringInstrumentsCode; + + private string _Specification; + + private string _AccuracyLevel; + + private string _CertificateNumber; + + private System.Nullable _VerificationDate; + + private string _ValidityPeriod; + + private string _Remark; + + private string _CompileMan; + + private System.Nullable _CompileDate; + + private string _Reviewer; + + private System.Nullable _RevieweDate; + + private EntityRef _Base_Project; + + private EntityRef _Sys_User; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnMeasuringInstrumentsIdChanging(string value); + partial void OnMeasuringInstrumentsIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnMeasuringInstrumentsNameChanging(string value); + partial void OnMeasuringInstrumentsNameChanged(); + partial void OnMeasuringInstrumentsCodeChanging(string value); + partial void OnMeasuringInstrumentsCodeChanged(); + partial void OnSpecificationChanging(string value); + partial void OnSpecificationChanged(); + partial void OnAccuracyLevelChanging(string value); + partial void OnAccuracyLevelChanged(); + partial void OnCertificateNumberChanging(string value); + partial void OnCertificateNumberChanged(); + partial void OnVerificationDateChanging(System.Nullable value); + partial void OnVerificationDateChanged(); + partial void OnValidityPeriodChanging(string value); + partial void OnValidityPeriodChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + 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 OnRevieweDateChanging(System.Nullable value); + partial void OnRevieweDateChanged(); + #endregion + + public JGZL_MeasuringInstruments() + { + this._Base_Project = default(EntityRef); + this._Sys_User = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeasuringInstrumentsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string MeasuringInstrumentsId + { + get + { + return this._MeasuringInstrumentsId; + } + set + { + if ((this._MeasuringInstrumentsId != value)) + { + this.OnMeasuringInstrumentsIdChanging(value); + this.SendPropertyChanging(); + this._MeasuringInstrumentsId = value; + this.SendPropertyChanged("MeasuringInstrumentsId"); + this.OnMeasuringInstrumentsIdChanged(); + } + } + } + + [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="_MeasuringInstrumentsName", DbType="NVarChar(50)")] + public string MeasuringInstrumentsName + { + get + { + return this._MeasuringInstrumentsName; + } + set + { + if ((this._MeasuringInstrumentsName != value)) + { + this.OnMeasuringInstrumentsNameChanging(value); + this.SendPropertyChanging(); + this._MeasuringInstrumentsName = value; + this.SendPropertyChanged("MeasuringInstrumentsName"); + this.OnMeasuringInstrumentsNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeasuringInstrumentsCode", DbType="NVarChar(50)")] + public string MeasuringInstrumentsCode + { + get + { + return this._MeasuringInstrumentsCode; + } + set + { + if ((this._MeasuringInstrumentsCode != value)) + { + this.OnMeasuringInstrumentsCodeChanging(value); + this.SendPropertyChanging(); + this._MeasuringInstrumentsCode = value; + this.SendPropertyChanged("MeasuringInstrumentsCode"); + this.OnMeasuringInstrumentsCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Specification", DbType="NVarChar(50)")] + public string Specification + { + get + { + return this._Specification; + } + set + { + if ((this._Specification != value)) + { + this.OnSpecificationChanging(value); + this.SendPropertyChanging(); + this._Specification = value; + this.SendPropertyChanged("Specification"); + this.OnSpecificationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccuracyLevel", DbType="NVarChar(50)")] + public string AccuracyLevel + { + get + { + return this._AccuracyLevel; + } + set + { + if ((this._AccuracyLevel != value)) + { + this.OnAccuracyLevelChanging(value); + this.SendPropertyChanging(); + this._AccuracyLevel = value; + this.SendPropertyChanged("AccuracyLevel"); + this.OnAccuracyLevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CertificateNumber", DbType="NVarChar(50)")] + public string CertificateNumber + { + get + { + return this._CertificateNumber; + } + set + { + if ((this._CertificateNumber != value)) + { + this.OnCertificateNumberChanging(value); + this.SendPropertyChanging(); + this._CertificateNumber = value; + this.SendPropertyChanged("CertificateNumber"); + this.OnCertificateNumberChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VerificationDate", DbType="DateTime")] + public System.Nullable VerificationDate + { + get + { + return this._VerificationDate; + } + set + { + if ((this._VerificationDate != value)) + { + this.OnVerificationDateChanging(value); + this.SendPropertyChanging(); + this._VerificationDate = value; + this.SendPropertyChanged("VerificationDate"); + this.OnVerificationDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ValidityPeriod", DbType="NVarChar(50)")] + public string ValidityPeriod + { + get + { + return this._ValidityPeriod; + } + set + { + if ((this._ValidityPeriod != value)) + { + this.OnValidityPeriodChanging(value); + this.SendPropertyChanging(); + this._ValidityPeriod = value; + this.SendPropertyChanged("ValidityPeriod"); + this.OnValidityPeriodChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [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)) + { + this.OnReviewerChanging(value); + this.SendPropertyChanging(); + this._Reviewer = value; + this.SendPropertyChanged("Reviewer"); + this.OnReviewerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RevieweDate", DbType="DateTime")] + public System.Nullable RevieweDate + { + get + { + return this._RevieweDate; + } + set + { + if ((this._RevieweDate != value)) + { + this.OnRevieweDateChanging(value); + this.SendPropertyChanging(); + this._RevieweDate = value; + this.SendPropertyChanged("RevieweDate"); + this.OnRevieweDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_MeasuringInstruments_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_MeasuringInstruments.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.JGZL_MeasuringInstruments.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_MeasuringInstruments_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_MeasuringInstruments.Remove(this); + } + this._Sys_User.Entity = value; + if ((value != null)) + { + value.JGZL_MeasuringInstruments.Add(this); + this._CompileMan = value.UserId; + } + else + { + this._CompileMan = default(string); + } + this.SendPropertyChanged("Sys_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_NDTPerson")] public partial class JGZL_NDTPerson : INotifyPropertyChanging, INotifyPropertyChanged { @@ -104197,6 +104692,8 @@ namespace Model private EntitySet _JGZL_HandoverCertificate; + private EntitySet _JGZL_MeasuringInstruments; + private EntitySet _JGZL_NDTPerson; private EntitySet _JGZL_SpecialEquipmentMaintenance; @@ -104287,6 +104784,7 @@ namespace Model 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_HandoverCertificate = new EntitySet(new Action(this.attach_JGZL_HandoverCertificate), new Action(this.detach_JGZL_HandoverCertificate)); + this._JGZL_MeasuringInstruments = new EntitySet(new Action(this.attach_JGZL_MeasuringInstruments), new Action(this.detach_JGZL_MeasuringInstruments)); this._JGZL_NDTPerson = new EntitySet(new Action(this.attach_JGZL_NDTPerson), new Action(this.detach_JGZL_NDTPerson)); this._JGZL_SpecialEquipmentMaintenance = new EntitySet(new Action(this.attach_JGZL_SpecialEquipmentMaintenance), new Action(this.detach_JGZL_SpecialEquipmentMaintenance)); this._Project_User = new EntitySet(new Action(this.attach_Project_User), new Action(this.detach_Project_User)); @@ -104992,6 +105490,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_MeasuringInstruments_Sys_User", Storage="_JGZL_MeasuringInstruments", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] + public EntitySet JGZL_MeasuringInstruments + { + get + { + return this._JGZL_MeasuringInstruments; + } + set + { + this._JGZL_MeasuringInstruments.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_JGZL_NDTPerson_Sys_User", Storage="_JGZL_NDTPerson", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet JGZL_NDTPerson { @@ -105445,6 +105956,18 @@ namespace Model entity.Sys_User = null; } + private void attach_JGZL_MeasuringInstruments(JGZL_MeasuringInstruments entity) + { + this.SendPropertyChanging(); + entity.Sys_User = this; + } + + private void detach_JGZL_MeasuringInstruments(JGZL_MeasuringInstruments entity) + { + this.SendPropertyChanging(); + entity.Sys_User = null; + } + private void attach_JGZL_NDTPerson(JGZL_NDTPerson entity) { this.SendPropertyChanging(); diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..a48b337 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