diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-30-yll.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-30-yll.sql new file mode 100644 index 00000000..35840c32 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-03-30-yll.sql @@ -0,0 +1,6 @@ +ALTER TABLE Comprehensive_NCRManagement ADD Problem varchar(50) +ALTER TABLE Comprehensive_NCRManagement ADD Measure varchar(100) + +ALTER TABLE Comprehensive_PressurePipe ADD ReportTime datetime + +ALTER TABLE Comprehensive_SpecialEquipment ADD ReportTime datetime \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-30_bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-30_bwj.sql new file mode 100644 index 00000000..1d4dcc08 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-03-30_bwj.sql @@ -0,0 +1,77 @@ +delete from Sys_ButtonToMenu where MenuId='420456A5-22E7-45BF-A4CA-8412F4C7D1B9' +delete from Sys_Menu where MenuId='420456A5-22E7-45BF-A4CA-8412F4C7D1B9' +go +update Sys_Menu set MenuName='鷢',Url='TestRun/Meeting/MeetingInitiate.aspx' where MenuId='2B42BDDA-0D24-4C68-9C35-DCCA4054736A' +update Sys_Menu set MenuName='Ҫ',Url='TestRun/Meeting/MeetingSummary.aspx' where MenuId='E453EEE9-9D6A-454B-AB17-A6E284B7A95F' +go + + +ALTER TABLE [dbo].[Driver_MeetingItem] DROP CONSTRAINT [FK_Driver_MeetingItem_Driver_Meeting] +GO + +DROP TABLE [dbo].[Driver_Meeting] +GO + +CREATE TABLE [dbo].[Driver_Meeting]( + [MeetingId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [MeetingName] [nvarchar](50) NULL, + [StartTime] [datetime] NULL, + [EndTime] [datetime] NULL, + [MeetingAddress] [nvarchar](100) NULL, + [MeetingUrl] [nvarchar](500) NULL, + [InitiationDate] [datetime] NULL, + [MeetingContent] [nvarchar](1000) NULL, + [MeetingType] [nchar](1) NULL, + CONSTRAINT [PK_Driver_Meeting] PRIMARY KEY CLUSTERED +( + [MeetingId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[Driver_Meeting] WITH CHECK ADD CONSTRAINT [FK_Driver_Meeting_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[Driver_Meeting] CHECK CONSTRAINT [FK_Driver_Meeting_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'MeetingId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @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'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'MeetingName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʼʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'StartTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'EndTime' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ַ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'MeetingAddress' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'MeetingUrl' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'InitiationDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'MeetingContent' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ1-Ȼᣬ2-ᣬ3-רᣩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Driver_Meeting', @level2type=N'COLUMN',@level2name=N'MeetingType' +GO + + +ALTER TABLE [dbo].[Driver_MeetingItem] WITH CHECK ADD CONSTRAINT [FK_Driver_MeetingItem_Driver_Meeting] FOREIGN KEY([MeetingId]) +REFERENCES [dbo].[Driver_Meeting] ([MeetingId]) +GO + +ALTER TABLE [dbo].[Driver_MeetingItem] CHECK CONSTRAINT [FK_Driver_MeetingItem_Driver_Meeting] +GO + diff --git a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs index fbf7b803..ea7fe758 100644 --- a/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/NCRManagementService.cs @@ -116,6 +116,8 @@ namespace BLL newNCRManagement.CompileMan = nCRManagement.CompileMan; newNCRManagement.UnitWorkId = nCRManagement.UnitWorkId; newNCRManagement.Status = nCRManagement.Status; + newNCRManagement.Problem = nCRManagement.Problem; + newNCRManagement.Measure = nCRManagement.Measure; db.Comprehensive_NCRManagement.InsertOnSubmit(newNCRManagement); db.SubmitChanges(); } @@ -144,6 +146,8 @@ namespace BLL newNCRManagement.ImplementationFrontState = nCRManagement.ImplementationFrontState; newNCRManagement.UnitWorkId = nCRManagement.UnitWorkId; newNCRManagement.Status = nCRManagement.Status; + newNCRManagement.Problem = nCRManagement.Problem; + newNCRManagement.Measure = nCRManagement.Measure; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs index f0707b19..61db5b1a 100644 --- a/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs +++ b/SGGL/BLL/CQMS/Comprehensive/PressurePipeService.cs @@ -101,6 +101,7 @@ namespace BLL newPressurePipe.IssuedReportNumber = PressurePipe.IssuedReportNumber; newPressurePipe.CompileMan = PressurePipe.CompileMan; newPressurePipe.Status = PressurePipe.Status; + newPressurePipe.ReportTime = PressurePipe.ReportTime; db.Comprehensive_PressurePipe.InsertOnSubmit(newPressurePipe); db.SubmitChanges(); } @@ -124,6 +125,7 @@ namespace BLL newPressurePipe.PressurePipeNumber = PressurePipe.PressurePipeNumber; newPressurePipe.IssuedReportNumber = PressurePipe.IssuedReportNumber; newPressurePipe.Status = PressurePipe.Status; + newPressurePipe.ReportTime = PressurePipe.ReportTime; db.SubmitChanges(); } } diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index 26bc8dd3..220d3ddc 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -337,7 +337,7 @@ namespace BLL } if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0") { - InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList(); + InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId==cNProfessionalId select x).ToList(); } if (isOnceQualified == true) { diff --git a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs index d4a6386f..ccea96cf 100644 --- a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs +++ b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs @@ -18,6 +18,16 @@ namespace BLL return Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId); } + /// + /// 获取最新一条月报信息 + /// + /// + /// + public static Model.TestRun_MonthReport GetReportByMaxDate(string projectId) + { + return (from x in Funs.DB.TestRun_MonthReport where x.ProjectId == projectId select x).OrderByDescending(e => e.MonthReportDate).FirstOrDefault(); + } + /// /// 根据月份获取开车月报告 /// diff --git a/SGGL/BLL/TestRun/Meeting/MeetingService.cs b/SGGL/BLL/TestRun/Meeting/MeetingService.cs index 47be8a98..597e85f2 100644 --- a/SGGL/BLL/TestRun/Meeting/MeetingService.cs +++ b/SGGL/BLL/TestRun/Meeting/MeetingService.cs @@ -26,20 +26,14 @@ namespace BLL Model.Driver_Meeting newMeeting = new Model.Driver_Meeting(); newMeeting.MeetingId = meeting.MeetingId; newMeeting.ProjectId = meeting.ProjectId; - newMeeting.MeetingTake = meeting.MeetingTake; - newMeeting.UnitWorkId = meeting.UnitWorkId; - newMeeting.MeetingUnit = meeting.MeetingUnit; + newMeeting.MeetingName = meeting.MeetingName; + newMeeting.StartTime = meeting.StartTime; + newMeeting.EndTime = meeting.EndTime; newMeeting.MeetingAddress = meeting.MeetingAddress; - newMeeting.MeetingDate = meeting.MeetingDate; + newMeeting.MeetingUrl = meeting.MeetingUrl; + newMeeting.InitiationDate = meeting.InitiationDate; newMeeting.MeetingContent = meeting.MeetingContent; - newMeeting.Number = meeting.Number; newMeeting.MeetingType = meeting.MeetingType; - newMeeting.AttachUrl = meeting.AttachUrl; - newMeeting.Remark = meeting.Remark; - newMeeting.MeetingCode = meeting.MeetingCode; - newMeeting.CompileMan = meeting.CompileMan; - newMeeting.CompileDate = meeting.CompileDate; - newMeeting.States = meeting.States; Funs.DB.Driver_Meeting.InsertOnSubmit(newMeeting); Funs.DB.SubmitChanges(); @@ -54,19 +48,14 @@ namespace BLL Model.Driver_Meeting newMeeting = Funs.DB.Driver_Meeting.FirstOrDefault(e => e.MeetingId == meeting.MeetingId); if (newMeeting != null) { - //newMeeting.ProjectId = meeting.ProjectId; - newMeeting.MeetingTake = meeting.MeetingTake; - newMeeting.UnitWorkId = meeting.UnitWorkId; - newMeeting.MeetingUnit = meeting.MeetingUnit; + newMeeting.MeetingName = meeting.MeetingName; + newMeeting.StartTime = meeting.StartTime; + newMeeting.EndTime = meeting.EndTime; newMeeting.MeetingAddress = meeting.MeetingAddress; - newMeeting.MeetingDate = meeting.MeetingDate; + newMeeting.MeetingUrl = meeting.MeetingUrl; + newMeeting.InitiationDate = meeting.InitiationDate; newMeeting.MeetingContent = meeting.MeetingContent; - newMeeting.Number = meeting.Number; - //newMeeting.MeetingType = meeting.MeetingType; - newMeeting.AttachUrl = meeting.AttachUrl; - newMeeting.Remark = meeting.Remark; - newMeeting.MeetingCode = meeting.MeetingCode; - newMeeting.States = meeting.States; + newMeeting.MeetingType = meeting.MeetingType; Funs.DB.SubmitChanges(); } @@ -81,9 +70,9 @@ namespace BLL Model.Driver_Meeting meeting = Funs.DB.Driver_Meeting.FirstOrDefault(e => e.MeetingId == meetingId); if (meeting != null) { - CommonService.DeleteAttachFileById(meetingId + "#1");//删除会议纪要附件 - CommonService.DeleteAttachFileById(meetingId + "#2");//删除签到表附件 - CommonService.DeleteFlowOperateByID(meetingId);//删除流程表 + //CommonService.DeleteAttachFileById(meetingId + "#1");//删除会议纪要附件 + //CommonService.DeleteAttachFileById(meetingId + "#2");//删除签到表附件 + //CommonService.DeleteFlowOperateByID(meetingId);//删除流程表 Funs.DB.Driver_Meeting.DeleteOnSubmit(meeting); Funs.DB.SubmitChanges(); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index 715392b9..1a44d148 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -32,6 +32,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index d6f4a005..0265053e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -79,6 +79,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", nCRManagement.CompleteDate); } + if (nCRManagement.Problem!=null) + { + this.ddlProblem.SelectedValue = nCRManagement.Problem; + } + this.txtMeasure.Text = nCRManagement.Measure; + + this.txtResponsibleMan.Text = nCRManagement.ResponsibleMan; this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState; @@ -143,7 +150,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpSendUnit.Readonly = true; this.drpUnitIds.Readonly = true; this.drpUnitWorkIds.Readonly = true; - this.drpAudit.Readonly = true; + this.drpAudit.Readonly = true; + this.ddlProblem.Readonly = true; //this.btnAttach.Enabled = false; @@ -207,6 +215,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive } nCRManagement.NCRCode = this.txtNCRCode.Text.Trim(); nCRManagement.Contents = this.txtContents.Text.Trim(); + + #region 新增2024-03-29 + if (this.ddlProblem.SelectedValue != BLL.Const._Null) + { + nCRManagement.Problem = this.ddlProblem.SelectedValue; + } + nCRManagement.Measure = this.txtMeasure.Text.Trim(); + #endregion + if (!string.IsNullOrEmpty(this.txtIssuedDate.Text)) { nCRManagement.IssuedDate = Convert.ToDateTime(this.txtIssuedDate.Text); @@ -318,6 +335,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive } nCRManagement.NCRCode = this.txtNCRCode.Text.Trim(); nCRManagement.Contents = this.txtContents.Text.Trim(); + #region 新增2024-03-29 + if (!string.IsNullOrEmpty(this.ddlProblem.SelectedValue)) + { + nCRManagement.Problem = this.ddlProblem.SelectedValue; + } + nCRManagement.Measure = this.txtMeasure.Text.Trim(); + #endregion + if (!string.IsNullOrEmpty(this.txtIssuedDate.Text)) { nCRManagement.IssuedDate = Convert.ToDateTime(this.txtIssuedDate.Text); diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs index 750d2e35..f844bd96 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class NCRManagementEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class NCRManagementEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpSendUnit 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSendUnit; - + /// /// drpCNProfessionalId 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// txtNCRCode 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtNCRCode; - + /// /// txtIssuedDate 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtIssuedDate; - + /// /// txtContents 控件。 /// @@ -85,7 +83,25 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtContents; - + + /// + /// ddlProblem 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlProblem; + + /// + /// txtMeasure 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtMeasure; + /// /// drpUnitWorkIds 控件。 /// @@ -94,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// drpUnitIds 控件。 /// @@ -103,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitIds; - + /// /// txtImplementationFrontState 控件。 /// @@ -112,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtImplementationFrontState; - + /// /// txtResponsibleMan 控件。 /// @@ -121,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtResponsibleMan; - + /// /// txtClosedDate 控件。 /// @@ -130,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtClosedDate; - + /// /// txtCompleteDate 控件。 /// @@ -139,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtCompleteDate; - + /// /// Panel2 控件。 /// @@ -148,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -157,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -166,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - + /// /// drpAudit 控件。 /// @@ -175,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpAudit; - + /// /// agree 控件。 /// @@ -184,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow agree; - + /// /// rblIsAgree 控件。 /// @@ -193,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsAgree; - + /// /// options 控件。 /// @@ -202,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow options; - + /// /// txtidea 控件。 /// @@ -211,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -220,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -229,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -238,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// btnSubmit 控件。 /// @@ -247,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx index b05676cd..4439355a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx @@ -9,7 +9,7 @@
- + @@ -20,7 +20,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -52,11 +52,14 @@ - + + + @@ -69,7 +72,7 @@ - + @@ -85,10 +88,10 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs index ee3f7e5e..60f22207 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs @@ -59,6 +59,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtPressurePipeNumber.Text = pressurePipe.PressurePipeNumber.HasValue ? pressurePipe.PressurePipeNumber.ToString() : ""; this.txtIssuedReportNumber.Text = pressurePipe.IssuedReportNumber.HasValue ? pressurePipe.IssuedReportNumber.ToString() : ""; + if (pressurePipe.ReportTime != null) + { + this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", pressurePipe.ReportTime); + } var currApprove = PressurePipeApproveService.GetCurrentApprove(pressurePipe.PressurePipeId); if (currApprove != null) @@ -94,6 +98,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } else { + this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; this.btnSubmit.Hidden = false; } @@ -113,6 +118,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtPackageNumber.Readonly = true; this.txtPressurePipeNumber.Readonly = true; this.drpUnit.Readonly = true; + this.txtReportTime.Readonly = true; this.drpAudit.Readonly = true; @@ -191,6 +197,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { pressurePipe.IssuedReportNumber = Convert.ToInt32(this.txtIssuedReportNumber.Text); } + if (!string.IsNullOrEmpty(this.txtReportTime.Text)) + { + pressurePipe.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); + } + if (string.IsNullOrEmpty(this.PressurePipeId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -277,6 +288,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { pressurePipe.IssuedReportNumber = Convert.ToInt32(this.txtIssuedReportNumber.Text); } + if (!string.IsNullOrEmpty(this.txtReportTime.Text)) + { + pressurePipe.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); + } if (string.IsNullOrEmpty(this.PressurePipeId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs index b88bc8b1..c04b9621 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs @@ -140,6 +140,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected global::FineUIPro.DropDownList drpAudit; + /// + /// txtReportTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtReportTime; + /// /// agree 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx index 683ffd57..8893694e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx @@ -51,6 +51,9 @@ + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs index f8741790..329bcbca 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs @@ -61,8 +61,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtMonitoringReportNumber.Text = specialEquipment.MonitoringReportNumber.HasValue ? specialEquipment.MonitoringReportNumber.ToString() : ""; this.txtSubmitDataNumber.Text = specialEquipment.SubmitDataNumber.HasValue ? specialEquipment.SubmitDataNumber.ToString() : ""; this.txtSunNumber.Text = specialEquipment.SunNumber.HasValue ? specialEquipment.SunNumber.ToString() : ""; - - + if (specialEquipment.ReportTime != null) + { + this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", specialEquipment.ReportTime); + } var currApprove = SpecialEquipmentApproveService.GetCurrentApprove(specialEquipment.SpecialEquipmentId); if (currApprove != null) @@ -98,6 +100,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive } else { + this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; this.btnSubmit.Hidden = false; @@ -192,6 +195,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive { specialEquipment.InformNumber = Convert.ToInt32(this.txtInformNumber.Text); } + if (!string.IsNullOrEmpty(this.txtReportTime.Text)) + { + specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); + } + if (string.IsNullOrEmpty(this.SpecialEquipmentId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) @@ -273,6 +281,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive { specialEquipment.InformNumber = Convert.ToInt32(this.txtInformNumber.Text); } + if (!string.IsNullOrEmpty(this.txtReportTime.Text)) + { + specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); + } if (string.IsNullOrEmpty(this.SpecialEquipmentId)) { if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs index 5ad26ed9..3e34b1c5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs @@ -131,6 +131,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// protected global::FineUIPro.DropDownList drpAudit; + /// + /// txtReportTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtReportTime; + /// /// agree 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs index 151d173a..fc303876 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs @@ -104,10 +104,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew string rowID = Grid1.DataKeys[rowIndex][0].ToString(); //本月质量目标管理情况 CqmsTargetService.Delete(rowID); - TextBoxContentService.Delete(rowID); - - + Report_CQMS_MonthReportItemService.DeleteReportItemByReportId(rowID); WeekAndMonthReportNewService.Delete(rowID); } BindGrid(); @@ -154,7 +152,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew * @param doc Document对象 * @return */ - public static Cell CreateCell(String value, Document doc, double cellWidth,string cellMerge="") + public static Cell CreateCell(String value, Document doc, double cellWidth, string cellMerge = "") { Cell cell = new Cell(doc); Paragraph p = new Paragraph(doc); @@ -164,21 +162,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.First;//竖直方向合并的第一个单元格 } - else { + else + { cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.Previous;//竖直方向合并的第一个单元格 } - + } - else { + else + { cell.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None; } - + p.AppendChild(new Run(doc, value)); - + cell.CellFormat.Width = cellWidth; - + cell.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center; - + cell.AppendChild(p); return cell; } @@ -341,30 +341,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText; } - - bkmark = doc.Range.Bookmarks["Content8"]; - if (bkmark != null) - { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText; - } - - bkmark = doc.Range.Bookmarks["Content20"]; - if (bkmark != null) - { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText; - } - - bkmark = doc.Range.Bookmarks["Content21"]; - if (bkmark != null) - { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText; - } - - bkmark = doc.Range.Bookmarks["Content22"]; - if (bkmark != null) - { - bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText; - } #endregion var ContuructionAllList = db.Report_Construction_Plan.Where(x => x.ReportId == Id).OrderBy(x=>x.UnitOrMajor).ToList(); @@ -938,10 +914,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew var NondestructiveTestlist = new List(); //加载所有施工分包单位 units = from x in Funs.DB.Project_ProjectUnit - join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId - where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2) - orderby y.UnitCode - select new { x.UnitId, y.UnitName }; + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; int? totalNum0 = 0, totalNum1 = 0;//拍片数量合计 @@ -1093,7 +1069,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew NondestructiveTestlist.Add(model); } } - if (NondestructiveTestlist.Count>0) + if (NondestructiveTestlist.Count > 0) { isYm = true; whileIndex += 1; @@ -1116,22 +1092,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew var Unitname = ""; foreach (var item in NondestructiveTestlist) { - + //创建行 Row row = new Row(doc); row.Cells.Add(CreateCell((numberIndex).ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width)); //如果是第一列，或者 - if (numberIndex==1 || Unitname!= item.CreateMan) + if (numberIndex == 1 || Unitname != item.CreateMan) { - row.Cells.Add(CreateCell(item.CreateMan, doc, table.Rows[0].Cells[1].CellFormat.Width,"0")); + row.Cells.Add(CreateCell(item.CreateMan, doc, table.Rows[0].Cells[1].CellFormat.Width, "0")); Unitname = item.CreateMan; } - else { + else + { row.Cells.Add(CreateCell(item.CreateMan, doc, table.Rows[0].Cells[1].CellFormat.Width, "1")); Unitname = item.CreateMan; } - + row.Cells.Add(CreateCell(item.ProfessionalName.ToString(), doc, table.Rows[0].Cells[2].CellFormat.Width)); @@ -1164,17 +1141,36 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #endregion - #region 8.设备材料报验管理情况 - var sbclbyList = ContuructionAllList.Where(x => x.ReType == "6").ToList(); - if (pqrList.Count > 0) + var reportItem = db.Report_CQMS_MonthReportItem.Where(x => x.ReportId == Id).OrderBy(x => x.ContentName).ToList(); + #region 9.计量器具报验管理情况 + #endregion + + #region 10.现场质量共检数据 + #endregion + + #region 11.压力管道监检情况 + #endregion + + #region 12.管道试压包管理情况 + #endregion + + #region 13.特种设备监检情况 + #endregion + + #region 14.NCR管理情况 + #endregion + + #region 15.质量巡检情况 + var qualityInspections = reportItem.Where(x => x.ReType == "1").ToList(); + if (qualityInspections.Count > 0) { isYm = true; - whileIndex += 1; + //whileIndex += 1; + whileIndex = 26; table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); //跳过页眉的表头 while (isYm) { - //获取到第一列是序号的列 if (table.Range.Text.Substring(0, 2) != "序号") { whileIndex += 1; @@ -1187,25 +1183,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } numberIndex = 1; int? num1 = 0, num2 = 0; - foreach (var item in sbclbyList) + foreach (var item in qualityInspections) { //创建行 Row row = new Row(doc); row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width)); - row.Cells.Add(CreateCell(item.UnitOrMajor, doc, table.FirstRow.Cells[1].CellFormat.Width)); - row.Cells.Add(CreateCell(item.Quantity1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width)); - row.Cells.Add(CreateCell(item.Quantity2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width)); - row.Cells.Add(CreateCell(item.QuaRate.ToString(), doc, table.FirstRow.Cells[4].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width)); + row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width)); + row.Cells.Add(CreateCell(item.RectificationRate, doc, table.FirstRow.Cells[4].CellFormat.Width)); row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[5].CellFormat.Width)); table.Rows.Insert(numberIndex, row); - num1 += item.Quantity1; - num2 += item.Quantity2; + num1 += item.MonthsCount; + num2 += item.ProjectCount; numberIndex += 1; } //自动设置表格样式 table.AutoFit(AutoFitBehavior.FixedColumnWidths); //创建合计 - //创建行 Row rowhj = new Row(doc); rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[0].CellFormat.Width)); rowhj.Cells.Add(CreateCell("合计", doc, table.FirstRow.Cells[1].CellFormat.Width)); @@ -1218,7 +1213,249 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //自动设置表格样式 table.AutoFit(AutoFitBehavior.FixedColumnWidths); } + #endregion + #region 16.质量专项检查情况 + var specialChecks = reportItem.Where(x => x.ReType == "2").ToList(); + if (specialChecks.Count > 0) + { + isYm = true; + //whileIndex += 1; + whileIndex = 27; + table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + //跳过页眉的表头 + while (isYm) + { + if (table.Range.Text.Substring(0, 2) != "序号") + { + whileIndex += 1; + table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + } + else + { + isYm = false; + } + } + numberIndex = 1; + int? num1 = 0, num2 = 0; + foreach (var item in specialChecks) + { + //创建行 + Row row = new Row(doc); + row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width)); + row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width)); + row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[4].CellFormat.Width)); + table.Rows.Insert(numberIndex, row); + num1 += item.MonthsCount; + num2 += item.ProjectCount; + numberIndex += 1; + } + //自动设置表格样式 + table.AutoFit(AutoFitBehavior.FixedColumnWidths); + //创建合计 + Row rowhj = new Row(doc); + rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[0].CellFormat.Width)); + rowhj.Cells.Add(CreateCell("合计", doc, table.FirstRow.Cells[1].CellFormat.Width)); + rowhj.Cells.Add(CreateCell(num1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width)); + rowhj.Cells.Add(CreateCell(num2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width)); + rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[4].CellFormat.Width)); + table.Rows.Insert(numberIndex, rowhj); + + //自动设置表格样式 + table.AutoFit(AutoFitBehavior.FixedColumnWidths); + } + #endregion + + #region 17.质量文件上报情况 + var fileReports = reportItem.Where(x => x.ReType == "3").ToList(); + if (fileReports.Count > 0) + { + isYm = true; + //whileIndex += 1; + whileIndex = 28; + table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + //跳过页眉的表头 + while (isYm) + { + if (table.Range.Text.Substring(0, 2) != "序号") + { + whileIndex += 1; + table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + } + else + { + isYm = false; + } + } + numberIndex = 1; + int? num1 = 0, num2 = 0, num3 = 0, num4 = 0; + foreach (var item in fileReports) + { + //创建行 + Row row = new Row(doc); + row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width)); + row.Cells.Add(CreateCell(item.MonthsCount.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ProjectCount.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width)); + row.Cells.Add(CreateCell(item.MonthsBackCount.ToString(), doc, table.FirstRow.Cells[4].CellFormat.Width)); + row.Cells.Add(CreateCell(item.TotalNoBackCount.ToString(), doc, table.FirstRow.Cells[5].CellFormat.Width)); + table.Rows.Insert(numberIndex, row); + num1 += item.MonthsCount; + num2 += item.ProjectCount; + num3 += item.MonthsBackCount; + num4 += item.TotalNoBackCount; + numberIndex += 1; + } + //自动设置表格样式 + table.AutoFit(AutoFitBehavior.FixedColumnWidths); + //创建合计 + Row rowhj = new Row(doc); + rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[0].CellFormat.Width)); + rowhj.Cells.Add(CreateCell("合计", doc, table.FirstRow.Cells[1].CellFormat.Width)); + rowhj.Cells.Add(CreateCell(num1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width)); + rowhj.Cells.Add(CreateCell(num2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width)); + rowhj.Cells.Add(CreateCell(num3.ToString(), doc, table.FirstRow.Cells[4].CellFormat.Width)); + rowhj.Cells.Add(CreateCell(num4.ToString(), doc, table.FirstRow.Cells[5].CellFormat.Width)); + table.Rows.Insert(numberIndex, rowhj); + + //自动设置表格样式 + table.AutoFit(AutoFitBehavior.FixedColumnWidths); + } + #endregion + + #region 18.本月质量问题处理情况 + #region (1)原材料问题 + whileIndex = 29; + Aspose.Words.Tables.Table table18_1 = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + bool isYm18_1 = true; + //跳过页眉的表头 + while (isYm18_1) + { + if (table18_1.Range.Text.Substring(0, 2) != "序号") + { + whileIndex += 1; + table18_1 = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + } + else + { + isYm18_1 = false; + } + } + var rowMaterialProblems = db.Report_RowMaterialProblem.Where(x => x.ReportId == Id); + int numberIndex18_1 = 1; + foreach (var item in rowMaterialProblems) + { + //创建行 + Row row = new Row(doc); + row.Cells.Add(CreateCell(numberIndex18_1.ToString(), doc, table18_1.FirstRow.Cells[0].CellFormat.Width)); + row.Cells.Add(CreateCell(item.UnitId, doc, table18_1.FirstRow.Cells[1].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ProblemDesrioption, doc, table18_1.FirstRow.Cells[2].CellFormat.Width)); + row.Cells.Add(CreateCell(item.TreatmentMeasures, doc, table18_1.FirstRow.Cells[3].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ProcessingResults, doc, table18_1.FirstRow.Cells[4].CellFormat.Width)); + row.Cells.Add(CreateCell(item.Remark, doc, table18_1.FirstRow.Cells[5].CellFormat.Width)); + table18_1.Rows.Insert(numberIndex18_1, row); + + numberIndex18_1 += 1; + } + //自动设置表格样式 + table18_1.AutoFit(AutoFitBehavior.FixedColumnWidths); + #endregion + + #region (2)施工过程问题 + whileIndex = 30; + Aspose.Words.Tables.Table table18_2 = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + bool isYm18_2 = true; + //跳过页眉的表头 + while (isYm18_2) + { + if (table18_2.Range.Text.Substring(0, 2) != "序号") + { + whileIndex += 1; + table18_2 = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + } + else + { + isYm18_2 = false; + } + } + var constructionProblems = db.Report_ConstructionProblems.Where(x => x.ReportId == Id); + int numberIndex18_2 = 1; + foreach (var item in constructionProblems) + { + //创建行 + Row row = new Row(doc); + row.Cells.Add(CreateCell(numberIndex18_2.ToString(), doc, table18_2.FirstRow.Cells[0].CellFormat.Width)); + row.Cells.Add(CreateCell(item.UnitId, doc, table18_2.FirstRow.Cells[1].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ProblemDesrioption, doc, table18_2.FirstRow.Cells[2].CellFormat.Width)); + row.Cells.Add(CreateCell(item.TreatmentMeasures, doc, table18_2.FirstRow.Cells[3].CellFormat.Width)); + row.Cells.Add(CreateCell(item.ProcessingResults, doc, table18_2.FirstRow.Cells[4].CellFormat.Width)); + row.Cells.Add(CreateCell(item.Remark, doc, table18_2.FirstRow.Cells[5].CellFormat.Width)); + table18_2.Rows.Insert(numberIndex18_2, row); + + numberIndex18_2 += 1; + } + //自动设置表格样式 + table18_2.AutoFit(AutoFitBehavior.FixedColumnWidths); + #endregion + #endregion + + #region 19.下月质量控制重点 + whileIndex = 31; + Aspose.Words.Tables.Table table19 = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + bool isYm19 = true; + //跳过页眉的表头 + while (isYm19) + { + if (table19.Range.Text.Substring(0, 2) != "序号") + { + whileIndex += 1; + table19 = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true); + } + else + { + isYm19 = false; + } + } + var nextQualityControls = db.Report_NextQualityControl.Where(x => x.ReportId == Id); + int numberIndex19 = 1; + foreach (var item in nextQualityControls) + { + //创建行 + Row row = new Row(doc); + row.Cells.Add(CreateCell(numberIndex19.ToString(), doc, table19.FirstRow.Cells[0].CellFormat.Width)); + row.Cells.Add(CreateCell(item.NextQualityControlContent, doc, table19.FirstRow.Cells[1].CellFormat.Width)); + table19.Rows.Insert(numberIndex19, row); + + numberIndex19 += 1; + } + //自动设置表格样式 + table19.AutoFit(AutoFitBehavior.FixedColumnWidths); + #endregion + + #region 20.项目质量体系审核 + bkmark = doc.Range.Bookmarks["Content20"]; + if (bkmark != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText; + } + #endregion + + #region 21.类似项目管理经验教训应对措施及跟踪 + bkmark = doc.Range.Bookmarks["Content21"]; + if (bkmark != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText; + } + #endregion + + #region 22.附件 + bkmark = doc.Range.Bookmarks["Content22"]; + if (bkmark != null) + { + bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText; + } #endregion doc.Save(newUrl); diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx index 4ce9ebeb..7658c249 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx @@ -832,18 +832,25 @@ - + - + + + + + + + + - + + <%--9.计量器具报验管理情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10.现场质量共检数据--%> + + + + + + + <%--10-1.土建--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-2.设备--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-3.管道--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-4.电气--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-5.仪表--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-6.防腐--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-7.消防--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10.合计--%> + + + + + + + + + + + + + + + + + + + + + + + + <%--11.压力管道监检情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--12.管道试压包管理情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--13.特种设备监检情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--14.NCR管理情况--%> + + + + + + + + + + + + + + + + + + + + <%-- + + + + + --%> + + + + + + + + + + + + + <%--15.质量巡检情况--%> @@ -900,23 +1452,15 @@ - - + + + + + - - - - - - - - - - - <%--16.质量专项检查情况--%> @@ -1101,7 +1645,7 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商"> - + @@ -1196,20 +1740,6 @@ - - - - - - - - - - - - - - <%--20.项目质量体系审核--%> @@ -1227,7 +1757,6 @@ - <%--21.类似项目管理经验教训应对措施及跟踪--%> @@ -1263,7 +1792,6 @@ - @@ -1272,9 +1800,6 @@ - - - @@ -1286,10 +1811,7 @@ - - - diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 15fa0ec5..0ba8b3f6 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -71,10 +71,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { if (!IsPostBack) { + BLL.UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); BLL.UnitService.InitUnitDownListByText(this.drpUnitIdGrid9, this.CurrUser.LoginProjectId, true); this.EnableViewState = true; this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName; - BLL.UnitService.InitUnitNameByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); this.ReportId = Request.Params["reportId"]; if (!string.IsNullOrEmpty(Request.Params["view"])) { @@ -187,12 +187,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText; txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText; txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText; - + if (txtAre8.Text != "本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批") + { + Form19.Hidden = false; + Toolbar4.Hidden = true; + } #endregion //加载所有grid lodAllGrid("1"); + Grid10.EmptyText = "
无数据
"; + gvTj.EmptyText = "
无数据
"; + GvSb.EmptyText = "
无数据
"; + GvGD.EmptyText = "
无数据
"; + GvDq.EmptyText = "
无数据
"; + GvYb.EmptyText = "
无数据
"; + GvFf.EmptyText = "
无数据
"; + GvXf.EmptyText = "
无数据
"; } else { @@ -242,6 +254,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //8 设备报验管理Grid11 LoadInspectionEquipment(objType); + //加载9.计量器具报验管理情况 + loadMeasuringInspection(objType); + //加载10.现场质量共检数据 + loadInspectionDataInspection(objType); + //加载11.压力管道监检情况 + loadPressureInspection(objType); + //加载12.管道试压包管理情况 + loadPipingInspection(objType); + //加载13.特种设备监检情况 + loadSpecialInspection(objType); + ////加载14.NCR管理情况 + loadNcrManagementInspection(); + //加载15.质量巡检情况 loadQualityInspection(objType); //加载16.质量专项检查情况 @@ -1078,9 +1103,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew var query = from c in db.ProcessControl_NondestructiveTest_New - join u in db.Base_Unit on c.UnitId equals u.UnitId + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin - + from u in unitJoin.DefaultIfEmpty() where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId && c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate) @@ -1100,124 +1125,123 @@ namespace FineUIPro.Web.CQMS.ManageReportNew c.MonthRate, c.TotalRate }; - if (query.ToList().Count>0) - { + if (query.ToList().Count > 0) { //加载工艺管道 var gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "工艺管道"); - var model = new Model.ProcessControl_NondestructiveTest_New(); - model.Id = Guid.NewGuid().ToString(); - model.CreateMan = item.UnitName;//用作存储施工单位名称 - model.ProfessionalName = "工艺管道"; + var model = new Model.ProcessControl_NondestructiveTest_New(); + model.Id = Guid.NewGuid().ToString(); + model.CreateMan = item.UnitName;//用作存储施工单位名称 + model.ProfessionalName = "工艺管道"; - if (gygdModel != null) - { - model.MonthQuantity = gygdModel.MonthQuantity; - model.TotalQuantity = gygdModel.TotalQuantity; - model.MonthRate = gygdModel.MonthRate + "%"; - model.TotalRate = gygdModel.TotalRate + "%"; - #region 小计和合计 - //小计 - num0 += gygdModel.MonthQuantity; - num1 += gygdModel.TotalQuantity; - - //合计 - totalNum0 += gygdModel.MonthQuantity; - totalNum1 += gygdModel.TotalQuantity; - - #endregion - list.Add(model); - } - else - { - model.MonthQuantity = 0; - model.TotalQuantity = 0; - model.MonthRate = "0%"; - model.TotalRate = "0%"; - list.Add(model); - } - - - - - //地管 - gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "地管"); - model = new Model.ProcessControl_NondestructiveTest_New(); - model.Id = Guid.NewGuid().ToString(); - model.CreateMan = item.UnitName;//用作存储施工单位名称 - model.ProfessionalName = "地管"; - - if (gygdModel != null) - { - model.MonthQuantity = gygdModel.MonthQuantity; - model.TotalQuantity = gygdModel.TotalQuantity; - model.MonthRate = gygdModel.MonthRate + "%"; - model.TotalRate = gygdModel.TotalRate + "%"; - #region 小计和合计 - //小计 - num0 += gygdModel.MonthQuantity; - num1 += gygdModel.TotalQuantity; - - //合计 - totalNum0 += gygdModel.MonthQuantity; - totalNum1 += gygdModel.TotalQuantity; - - #endregion - list.Add(model); - } - else - { - model.MonthQuantity = 0; - model.TotalQuantity = 0; - model.MonthRate = "0%"; - model.TotalRate = "0%"; - list.Add(model); - } - - - //非标 - gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "非标"); - model = new Model.ProcessControl_NondestructiveTest_New(); - model.Id = Guid.NewGuid().ToString(); - model.CreateMan = item.UnitName;//用作存储施工单位名称 - model.ProfessionalName = "非标"; - - if (gygdModel != null) - { - model.MonthQuantity = gygdModel.MonthQuantity; - model.TotalQuantity = gygdModel.TotalQuantity; - model.MonthRate = gygdModel.MonthRate + "%"; - model.TotalRate = gygdModel.TotalRate + "%"; - #region 小计和合计 - //小计 - num0 += gygdModel.MonthQuantity; - num1 += gygdModel.TotalQuantity; - - //合计 - totalNum0 += gygdModel.MonthQuantity; - totalNum1 += gygdModel.TotalQuantity; - - #endregion - list.Add(model); - } - else - { - model.MonthQuantity = 0; - model.TotalQuantity = 0; - model.MonthRate = "0%"; - model.TotalRate = "0%"; - list.Add(model); - } + if (gygdModel != null) + { + model.MonthQuantity = gygdModel.MonthQuantity; + model.TotalQuantity = gygdModel.TotalQuantity; + model.MonthRate = gygdModel.MonthRate + "%"; + model.TotalRate = gygdModel.TotalRate + "%"; + #region 小计和合计 //小计 - model = new Model.ProcessControl_NondestructiveTest_New(); - model.Id = Guid.NewGuid().ToString(); - model.CreateMan = item.UnitName;//用作存储施工单位名称 - model.ProfessionalName = "小计"; - model.MonthQuantity = num0; - model.TotalQuantity = num1; - model.MonthRate = ""; - model.TotalRate = ""; + num0 += gygdModel.MonthQuantity; + num1 += gygdModel.TotalQuantity; + + //合计 + totalNum0 += gygdModel.MonthQuantity; + totalNum1 += gygdModel.TotalQuantity; + + #endregion list.Add(model); - } + } + else + { + model.MonthQuantity = 0; + model.TotalQuantity = 0; + model.MonthRate = "0%"; + model.TotalRate = "0%"; + list.Add(model); + } + + + + + //地管 + gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "地管"); + model = new Model.ProcessControl_NondestructiveTest_New(); + model.Id = Guid.NewGuid().ToString(); + model.CreateMan = item.UnitName;//用作存储施工单位名称 + model.ProfessionalName = "地管"; + + if (gygdModel != null) + { + model.MonthQuantity = gygdModel.MonthQuantity; + model.TotalQuantity = gygdModel.TotalQuantity; + model.MonthRate = gygdModel.MonthRate + "%"; + model.TotalRate = gygdModel.TotalRate + "%"; + #region 小计和合计 + //小计 + num0 += gygdModel.MonthQuantity; + num1 += gygdModel.TotalQuantity; + + //合计 + totalNum0 += gygdModel.MonthQuantity; + totalNum1 += gygdModel.TotalQuantity; + + #endregion + list.Add(model); + } + else + { + model.MonthQuantity = 0; + model.TotalQuantity = 0; + model.MonthRate = "0%"; + model.TotalRate = "0%"; + list.Add(model); + } + + + //非标 + gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "非标"); + model = new Model.ProcessControl_NondestructiveTest_New(); + model.Id = Guid.NewGuid().ToString(); + model.CreateMan = item.UnitName;//用作存储施工单位名称 + model.ProfessionalName = "非标"; + + if (gygdModel != null) + { + model.MonthQuantity = gygdModel.MonthQuantity; + model.TotalQuantity = gygdModel.TotalQuantity; + model.MonthRate = gygdModel.MonthRate + "%"; + model.TotalRate = gygdModel.TotalRate + "%"; + #region 小计和合计 + //小计 + num0 += gygdModel.MonthQuantity; + num1 += gygdModel.TotalQuantity; + + //合计 + totalNum0 += gygdModel.MonthQuantity; + totalNum1 += gygdModel.TotalQuantity; + + #endregion + list.Add(model); + } + else + { + model.MonthQuantity = 0; + model.TotalQuantity = 0; + model.MonthRate = "0%"; + model.TotalRate = "0%"; + list.Add(model); + } + //小计 + model = new Model.ProcessControl_NondestructiveTest_New(); + model.Id = Guid.NewGuid().ToString(); + model.CreateMan = item.UnitName;//用作存储施工单位名称 + model.ProfessionalName = "小计"; + model.MonthQuantity = num0; + model.TotalQuantity = num1; + model.MonthRate = ""; + model.TotalRate = ""; + list.Add(model); + } } Grid10.DataSource = list; @@ -1343,6 +1367,720 @@ namespace FineUIPro.Web.CQMS.ManageReportNew } #endregion + #region 9.计量器具报验管理情况 gvMeasuringInspection方法 + /// + /// 计量器具报验管理情况 + /// + void loadMeasuringInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_InspectionMachine + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId && c.InspectionType.Equals("计量") + select new + { + c.InspectionDate, + c.ProjectId, + u.UnitId, + u.UnitName + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.MonthsCount = monethCount.Count(); + model.ProjectCount = AllList.Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "9"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + i++; + } + gvMeasuringInspection.DataSource = list; + gvMeasuringInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvMeasuringInspection.SummaryData = summary; + } + #endregion + + #region 10.现场质量共检数据 gvInspectionDataInspection方法 + /// + /// 现场质量共检数据 + /// + void loadInspectionDataInspection(string objType) + { + CheckLotBindStatisc("CV");//检验批统计:土建 + CheckLotBindStatisc("EQ");//检验批统计:设备 + CheckLotBindStatisc("PP");//检验批统计:管道 + CheckLotBindStatisc("EL");//检验批统计:电气 + CheckLotBindStatisc("IN");//检验批统计:仪表 + CheckLotBindStatisc("FF");//检验批统计:反腐 + CheckLotBindStatisc("XF");//检验批统计:消防 + + #region 现场质量共检数据合计 + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.View_CQMS_InspectionManagementDetail + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.CheckDate, + c.ProjectId, + u.UnitId, + u.UnitName + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate))); + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.MonthsCount = monethCount.Count(); + model.ProjectCount = AllList.Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "10"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + i++; + } + gvInspectionDataInspection.DataSource = list; + gvInspectionDataInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvInspectionDataInspection.SummaryData = summary; + #endregion + } + + public void CheckLotBindStatisc(string cNProfessionalCode) + { + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + + DateTime projectStartDate = Convert.ToDateTime("2015-01-01"); + List StatisticsList = new List(); + Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + + int CheckNum = 0; + int TotalCheckNum = 0; + + int OKNum = 0; + int TotalOKNum = 0; + + string OneOKRate = string.Empty; + string TotalOneOKRate = string.Empty; + + + if (project != null) + { + if (project.StartDate != null) + { + projectStartDate = Convert.ToDateTime(project.StartDate); + } + } + //int i = 1; + string cNProfessionalId = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalCode == cNProfessionalCode select x.CNProfessionalId).FirstOrDefault(); + + List workNames = new List(); + //专业下所有集合 + List totalManagementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false); + //专业下当期集合 + List managementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false); + workNames = totalManagementList.Select(x => x.UnitWorkId).DefaultIfEmpty().Distinct()?.ToList(); + foreach (string item in workNames) + { + Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(item); + if (ins != null) + { + Model.CheckStatisc checkStatisc = new Model.CheckStatisc(); + checkStatisc.Id = Guid.NewGuid().ToString(); + checkStatisc.WorkName = ins.UnitWorkName; + checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); + checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); + checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); + checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); + StatisticsList.Add(checkStatisc); + } + } + foreach (var item in StatisticsList) + { + if (item.CheckNum != 0)//被除数不能为零 + { + item.OneOKRate = Math.Round((double)item.OKNum / (double)item.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + item.OneOKRate = "0%"; + } + if (item.TotalCheckNum != 0)//被除数不能为零 + { + item.TotalOneOKRate = Math.Round((double)item.TotalOKNum / (double)item.TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + item.TotalOneOKRate = "0%"; + } + + CheckNum += item.CheckNum; + TotalCheckNum += item.TotalCheckNum; + + OKNum += item.OKNum; + TotalOKNum += item.TotalOKNum; + } + + if (CheckNum != 0)//被除数不能为零 + { + OneOKRate = Math.Round((double)OKNum / (double)CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + OneOKRate = "0%"; + } + if (TotalCheckNum != 0)//被除数不能为零 + { + TotalOneOKRate = Math.Round((double)TotalOKNum / (double)TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + TotalOneOKRate = "0%"; + } + + //检验批统计:土建 + if (cNProfessionalCode == "CV") + { + this.gvTj.DataSource = StatisticsList; + this.gvTj.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + gvTj.SummaryData = summary; + + } + //检验批统计:设备 + if (cNProfessionalCode == "EQ") + { + this.GvSb.DataSource = StatisticsList; + this.GvSb.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvSb.SummaryData = summary; + } + //检验批统计:管道 + if (cNProfessionalCode == "PP") + { + this.GvGD.DataSource = StatisticsList; + this.GvGD.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvGD.SummaryData = summary; + } + //检验批统计:电气 + if (cNProfessionalCode == "EL") + { + this.GvDq.DataSource = StatisticsList; + this.GvDq.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvDq.SummaryData = summary; + } + //检验批统计:仪表 + if (cNProfessionalCode == "IN") + { + this.GvYb.DataSource = StatisticsList; + this.GvYb.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvYb.SummaryData = summary; + } + //检验批统计:反腐 + if (cNProfessionalCode == "FF") + { + this.GvFf.DataSource = StatisticsList; + this.GvFf.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvFf.SummaryData = summary; + } + //检验批统计:消防 + if (cNProfessionalCode == "XF") + { + this.GvXf.DataSource = StatisticsList; + this.GvXf.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvXf.SummaryData = summary; + } + + } + + #endregion + + #region 11.压力管道监检情况 gvPressureInspection方法 + /// + /// 压力管道监检情况 + /// + void loadPressureInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity0Sum = 0; + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_PressurePipe + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.Projctid == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.ReportTime, + c.Projctid, + u.UnitId, + u.UnitName, + c.ActualNumber, + c.PressurePipeNumber + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber)); + model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber)); + model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.ActualNumber));//总数 + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "11"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + Quantity0Sum += Convert.ToInt32(AllList.Sum(o => o.ActualNumber)); + Quantity1Sum += Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber)); + Quantity2Sum += Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber)); + i++; + } + gvPressureInspection.DataSource = list; + gvPressureInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("TotalNoBackCount", Quantity0Sum.ToString());//总数 + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvPressureInspection.SummaryData = summary; + } + #endregion + + #region 12.管道试压包管理情况 gvPipingInspection方法 + /// + /// 管道试压包管理情况 + /// + void loadPipingInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity0Sum = 0; + int Quantity1Sum = 0; + int Quantity2Sum = 0; + + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_PressurePipe + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.Projctid == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.ReportTime, + c.Projctid, + u.UnitId, + u.UnitName, + c.PackageNumber, + c.IssuedReportNumber + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.PackageNumber)); + model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.IssuedReportNumber)); + model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.IssuedReportNumber)); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "11"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity0Sum += Convert.ToInt32(monethCount.Sum(o => o.PackageNumber)); + Quantity1Sum += Convert.ToInt32(monethCount.Sum(o => o.IssuedReportNumber)); + Quantity2Sum += Convert.ToInt32(AllList.Sum(o => o.IssuedReportNumber)); + i++; + } + gvPipingInspection.DataSource = list; + gvPipingInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("TotalNoBackCount", Quantity0Sum.ToString()); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvPipingInspection.SummaryData = summary; + } + #endregion + + #region 13.特种设备监检情况 gvSpecialInspection方法 + /// + /// 特种设备监检情况 + /// + void loadSpecialInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity0Sum = 0; + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_SpecialEquipment + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.ReportTime, + c.ProjectId, + u.UnitId, + u.UnitName, + c.SunNumber, + c.MonitoringReportNumber + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.SunNumber)); + model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.MonitoringReportNumber)); + model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber)); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "13"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + Quantity0Sum += Convert.ToInt32(monethCount.Sum(o => o.SunNumber)); + Quantity1Sum += Convert.ToInt32(monethCount.Sum(o => o.MonitoringReportNumber)); + Quantity2Sum += Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber)); + i++; + } + gvSpecialInspection.DataSource = list; + gvSpecialInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("TotalNoBackCount", Quantity0Sum.ToString()); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvSpecialInspection.SummaryData = summary; + } + #endregion + + #region 14.NCR管理情况 gvNcrManagementInspection方法 + /// + /// NCR管理情况 + /// + void loadNcrManagementInspection() + { + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + List StatisticsList = new List(); + int i = 1; + + int CurrentPeriodOkNumSum = 0; + int OKNumSum = 0; + int CheckNumSum = 0; + string OKRateSum = string.Empty; + + var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + DateTime projectStartDate = Convert.ToDateTime("2000-01-01"); + if (project != null && project.StartDate != null) + { + projectStartDate = project.StartDate.Value; + } + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2 + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + var db = Funs.DB; + foreach (var item in units) + { + + var query = from c in db.Comprehensive_NCRManagement + join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit == item.UnitId + select new + { + c.NCRManagementId, + c.ProjectId, + u.UnitId, + u.UnitName, + c.IssuedDate, + c.Status + }; + + var AllList = query.ToList(); + var unitNCRStatic = query + .Where(x => (x.IssuedDate >= Convert.ToDateTime(startDate) && x.IssuedDate <= Convert.ToDateTime(endDate))); + + Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc(); + NCRStatisc.Id = Guid.NewGuid().ToString(); + NCRStatisc.WorkName = item.UnitName; + NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); + NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); + NCRStatisc.CheckNum = AllList.Count(); + if (NCRStatisc.CheckNum != 0)//被除数不能为零 + { + NCRStatisc.OKRate = Math.Round((double)NCRStatisc.OKNum / (double)NCRStatisc.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + NCRStatisc.OKRate = "0%"; + } + StatisticsList.Add(NCRStatisc); + + CurrentPeriodOkNumSum += NCRStatisc.CurrentPeriodOkNum; + OKNumSum += NCRStatisc.OKNum; + CheckNumSum += NCRStatisc.CheckNum; + i++; + } + + if (CheckNumSum != 0)//被除数不能为零 + { + OKRateSum = Math.Round((double)OKNumSum / (double)CheckNumSum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + OKRateSum = "0%"; + } + + this.gvNcrManagementInspection.DataSource = StatisticsList; + this.gvNcrManagementInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + summary.Add("CurrentPeriodOkNum", CurrentPeriodOkNumSum.ToString()); + summary.Add("OKNum", OKNumSum.ToString()); + summary.Add("CheckNum", CheckNumSum.ToString()); + summary.Add("OKRate", OKRateSum.ToString()); + + gvNcrManagementInspection.SummaryData = summary; + } + #endregion + #region 15.质量巡检情况 gvQualityInspection方法 /// /// 加载质量巡检情况 @@ -1803,6 +2541,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew //保存8 设备材料报验管理情况 saveSbclBy(); + //保存9.计量器具报验管理情况 + saveMeasuringInspection(); + //保存10.现场质量共检数据 + saveInspectionDataInspection(); + //保存11.压力管道监检情况 + savePressureInspection(); + //保存12.管道试压包管理情况 + savePipingInspection(); + //保存13.特种设备监检情况 + saveSpecialInspection(); + //保存14.NCR管理情况 + saveNcrManagementInspection(); + //保存15.质量巡检情况 saveQualityInspection(); //保存16.质量专项检查情况 @@ -2168,6 +2919,211 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Funs.DB.SubmitChanges(); } + #region 9.计量器具报验管理情况 + void saveMeasuringInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvMeasuringInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "9", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvMeasuringInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvMeasuringInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + #endregion + + #region 10.现场质量共检数据 + void saveInspectionDataInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvInspectionDataInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "10", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvInspectionDataInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 11.压力管道监检情况 + void savePressureInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvPressureInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "11", + TotalNoBackCount = values.Value("TotalNoBackCount"), + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvPressureInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvPressureInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 12.管道试压包管理情况 + void savePipingInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvPipingInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "12", + TotalNoBackCount = values.Value("TotalNoBackCount"), + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvPipingInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvPipingInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 13.特种设备监检情况 + void saveSpecialInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvSpecialInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "13", + TotalNoBackCount = values.Value("TotalNoBackCount"), + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvSpecialInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvSpecialInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 14.NCR管理情况 + void saveNcrManagementInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvNcrManagementInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "14", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvNcrManagementInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + #endregion + #region 15.质量巡检情况 /// /// 15.质量巡检情况 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs index 1eac715e..891842c2 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs @@ -752,6 +752,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected global::FineUIPro.TextBox TextBox6; + /// + /// Toolbar4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar4; + + /// + /// Button5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button Button5; + /// /// Form19 控件。 /// @@ -770,6 +788,294 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected global::FineUIPro.TextArea txtAre8; + /// + /// Pnl9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl9; + + /// + /// Form26 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form26; + + /// + /// gvMeasuringInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvMeasuringInspection; + + /// + /// TextBox14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox14; + + /// + /// Pnl10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl10; + + /// + /// Form27 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form27; + + /// + /// gvTj 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvTj; + + /// + /// GvSb 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvSb; + + /// + /// GvGD 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvGD; + + /// + /// GvDq 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvDq; + + /// + /// GvYb 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvYb; + + /// + /// GvFf 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvFf; + + /// + /// GvXf 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvXf; + + /// + /// gvInspectionDataInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvInspectionDataInspection; + + /// + /// TextBox15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox15; + + /// + /// Pnl11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl11; + + /// + /// Form28 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form28; + + /// + /// gvPressureInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvPressureInspection; + + /// + /// TextBox16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox16; + + /// + /// Pnl12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl12; + + /// + /// Form29 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form29; + + /// + /// gvPipingInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvPipingInspection; + + /// + /// TextBox17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox17; + + /// + /// TextBox18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox18; + + /// + /// Pnl13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl13; + + /// + /// Form30 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form30; + + /// + /// gvSpecialInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvSpecialInspection; + + /// + /// TextBox19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox19; + + /// + /// TextBox20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox20; + + /// + /// Pnl14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl14; + + /// + /// Form31 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form31; + + /// + /// gvNcrManagementInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvNcrManagementInspection; + /// /// Panel21 控件。 /// @@ -815,15 +1121,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew /// protected global::FineUIPro.TextBox TextBox11; - /// - /// Form26 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form26; - /// /// Panel22 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx index fe1b0482..95d35968 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx @@ -295,16 +295,557 @@ + <%--9.计量器具报验管理情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10.现场质量共检数据--%> + + + + + + + <%--10-1.土建--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-2.设备--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-3.管道--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-4.电气--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-5.仪表--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-6.防腐--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10-7.消防--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--10.合计--%> + + + + + + + + + + + + + + + + + + + + + + + + <%--11.压力管道监检情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--12.管道试压包管理情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--13.特种设备监检情况--%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%--14.NCR管理情况--%> + + + + + + + + + + + + + + + + + + + + <%-- + + + + + --%> + + + + + + + + + + + + <%--15.质量巡检情况--%> @@ -536,7 +1077,7 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商"> - + @@ -632,20 +1173,6 @@ - - - - - - - - - - - - - - <%--20.项目质量体系审核--%> diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs index ba57c7cc..9e1de78c 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs @@ -308,6 +308,18 @@ namespace FineUIPro.Web.CQMS.ManageReportNew saveTxtContent(); + //保存9.计量器具报验管理情况 + saveMeasuringInspection(); + //保存10.现场质量共检数据 + saveInspectionDataInspection(); + //保存11.压力管道监检情况 + savePressureInspection(); + //保存12.管道试压包管理情况 + savePipingInspection(); + //保存13.特种设备监检情况 + saveSpecialInspection(); + //保存14.NCR管理情况 + saveNcrManagementInspection(); //保存15.质量巡检情况 saveQualityInspection(); @@ -423,13 +435,23 @@ namespace FineUIPro.Web.CQMS.ManageReportNew Funs.DB.Report_TextBoxContent.InsertAllOnSubmit(txtContentList); Funs.DB.SubmitChanges(); } - #endregion - - void lodAllGrid(string objType) { + //加载9.计量器具报验管理情况 + loadMeasuringInspection(objType); + //加载10.现场质量共检数据 + loadInspectionDataInspection(objType); + //加载11.压力管道监检情况 + loadPressureInspection(objType); + //加载12.管道试压包管理情况 + loadPipingInspection(objType); + //加载13.特种设备监检情况 + loadSpecialInspection(objType); + ////加载14.NCR管理情况 + loadNcrManagementInspection(); + //加载15.质量巡检情况 loadQualityInspection(objType); //加载16.质量专项检查情况 @@ -438,6 +460,720 @@ namespace FineUIPro.Web.CQMS.ManageReportNew loadFileReport(objType); } + #region 9.计量器具报验管理情况 gvMeasuringInspection方法 + /// + /// 计量器具报验管理情况 + /// + void loadMeasuringInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_InspectionMachine + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId && c.InspectionType.Equals("计量") + select new + { + c.InspectionDate, + c.ProjectId, + u.UnitId, + u.UnitName + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.InspectionDate >= Convert.ToDateTime(startDate) && x.InspectionDate <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.MonthsCount = monethCount.Count(); + model.ProjectCount = AllList.Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "9"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + i++; + } + gvMeasuringInspection.DataSource = list; + gvMeasuringInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvMeasuringInspection.SummaryData = summary; + } + #endregion + + #region 10.现场质量共检数据 gvInspectionDataInspection方法 + /// + /// 现场质量共检数据 + /// + void loadInspectionDataInspection(string objType) + { + CheckLotBindStatisc("CV");//检验批统计:土建 + CheckLotBindStatisc("EQ");//检验批统计:设备 + CheckLotBindStatisc("PP");//检验批统计:管道 + CheckLotBindStatisc("EL");//检验批统计:电气 + CheckLotBindStatisc("IN");//检验批统计:仪表 + CheckLotBindStatisc("FF");//检验批统计:反腐 + CheckLotBindStatisc("XF");//检验批统计:消防 + + #region 现场质量共检数据合计 + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.View_CQMS_InspectionManagementDetail + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.CheckDate, + c.ProjectId, + u.UnitId, + u.UnitName + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.CheckDate >= Convert.ToDateTime(startDate) && x.CheckDate <= Convert.ToDateTime(endDate))); + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.MonthsCount = monethCount.Count(); + model.ProjectCount = AllList.Count(); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "10"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity1Sum += monethCount.Count(); + Quantity2Sum += AllList.Count(); + i++; + } + gvInspectionDataInspection.DataSource = list; + gvInspectionDataInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvInspectionDataInspection.SummaryData = summary; + #endregion + } + + public void CheckLotBindStatisc(string cNProfessionalCode) + { + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + + DateTime projectStartDate = Convert.ToDateTime("2015-01-01"); + List StatisticsList = new List(); + Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + + int CheckNum = 0; + int TotalCheckNum = 0; + + int OKNum = 0; + int TotalOKNum = 0; + + string OneOKRate = string.Empty; + string TotalOneOKRate = string.Empty; + + + if (project != null) + { + if (project.StartDate != null) + { + projectStartDate = Convert.ToDateTime(project.StartDate); + } + } + //int i = 1; + string cNProfessionalId = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalCode == cNProfessionalCode select x.CNProfessionalId).FirstOrDefault(); + + List workNames = new List(); + //专业下所有集合 + List totalManagementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false); + //专业下当期集合 + List managementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, startDate, endDate, false); + workNames = totalManagementList.Select(x => x.UnitWorkId).DefaultIfEmpty().Distinct()?.ToList(); + foreach (string item in workNames) + { + Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(item); + if (ins != null) + { + Model.CheckStatisc checkStatisc = new Model.CheckStatisc(); + checkStatisc.Id = Guid.NewGuid().ToString(); + checkStatisc.WorkName = ins.UnitWorkName; + checkStatisc.CheckNum = managementList.Count(x => x.UnitWorkId == item); + checkStatisc.TotalCheckNum = totalManagementList.Count(x => x.UnitWorkId == item); + checkStatisc.OKNum = managementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); + checkStatisc.TotalOKNum = totalManagementList.Count(x => x.UnitWorkId == item && x.IsOnceQualified == true); + StatisticsList.Add(checkStatisc); + } + } + foreach (var item in StatisticsList) + { + if (item.CheckNum != 0)//被除数不能为零 + { + item.OneOKRate = Math.Round((double)item.OKNum / (double)item.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + item.OneOKRate = "0%"; + } + if (item.TotalCheckNum != 0)//被除数不能为零 + { + item.TotalOneOKRate = Math.Round((double)item.TotalOKNum / (double)item.TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + item.TotalOneOKRate = "0%"; + } + + CheckNum += item.CheckNum; + TotalCheckNum += item.TotalCheckNum; + + OKNum += item.OKNum; + TotalOKNum += item.TotalOKNum; + } + + if (CheckNum != 0)//被除数不能为零 + { + OneOKRate = Math.Round((double)OKNum / (double)CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + OneOKRate = "0%"; + } + if (TotalCheckNum != 0)//被除数不能为零 + { + TotalOneOKRate = Math.Round((double)TotalOKNum / (double)TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + TotalOneOKRate = "0%"; + } + + //检验批统计:土建 + if (cNProfessionalCode == "CV") + { + this.gvTj.DataSource = StatisticsList; + this.gvTj.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + gvTj.SummaryData = summary; + + } + //检验批统计:设备 + if (cNProfessionalCode == "EQ") + { + this.GvSb.DataSource = StatisticsList; + this.GvSb.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvSb.SummaryData = summary; + } + //检验批统计:管道 + if (cNProfessionalCode == "PP") + { + this.GvGD.DataSource = StatisticsList; + this.GvGD.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvGD.SummaryData = summary; + } + //检验批统计:电气 + if (cNProfessionalCode == "EL") + { + this.GvDq.DataSource = StatisticsList; + this.GvDq.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvDq.SummaryData = summary; + } + //检验批统计:仪表 + if (cNProfessionalCode == "IN") + { + this.GvYb.DataSource = StatisticsList; + this.GvYb.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvYb.SummaryData = summary; + } + //检验批统计:反腐 + if (cNProfessionalCode == "FF") + { + this.GvFf.DataSource = StatisticsList; + this.GvFf.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvFf.SummaryData = summary; + } + //检验批统计:消防 + if (cNProfessionalCode == "XF") + { + this.GvXf.DataSource = StatisticsList; + this.GvXf.DataBind(); + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + + summary.Add("CheckNum", CheckNum.ToString()); //当前检查点数 + summary.Add("TotalCheckNum", TotalCheckNum.ToString());//累计点数 + + summary.Add("OKNum", OKNum.ToString());//当前合格点数 + summary.Add("TotalOKNum", TotalOKNum.ToString());//累计合格点数 + + summary.Add("OneOKRate", OneOKRate.ToString());//本周合格点数 + summary.Add("TotalOneOKRate", TotalOneOKRate.ToString());//本周累计合格点数 + GvXf.SummaryData = summary; + } + + } + + #endregion + + #region 11.压力管道监检情况 gvPressureInspection方法 + /// + /// 压力管道监检情况 + /// + void loadPressureInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity0Sum = 0; + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_PressurePipe + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.Projctid == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.ReportTime, + c.Projctid, + u.UnitId, + u.UnitName, + c.ActualNumber, + c.PressurePipeNumber + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber)); + model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber)); + model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.ActualNumber));//总数 + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "11"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + Quantity0Sum += Convert.ToInt32(AllList.Sum(o => o.ActualNumber)); + Quantity1Sum += Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber)); + Quantity2Sum += Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber)); + i++; + } + gvPressureInspection.DataSource = list; + gvPressureInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("TotalNoBackCount", Quantity0Sum.ToString());//总数 + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvPressureInspection.SummaryData = summary; + } + #endregion + + #region 12.管道试压包管理情况 gvPipingInspection方法 + /// + /// 管道试压包管理情况 + /// + void loadPipingInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity0Sum = 0; + int Quantity1Sum = 0; + int Quantity2Sum = 0; + + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_PressurePipe + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.Projctid == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.ReportTime, + c.Projctid, + u.UnitId, + u.UnitName, + c.PackageNumber, + c.IssuedReportNumber + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.PackageNumber)); + model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.IssuedReportNumber)); + model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.IssuedReportNumber)); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "11"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + + Quantity0Sum += Convert.ToInt32(monethCount.Sum(o => o.PackageNumber)); + Quantity1Sum += Convert.ToInt32(monethCount.Sum(o => o.IssuedReportNumber)); + Quantity2Sum += Convert.ToInt32(AllList.Sum(o => o.IssuedReportNumber)); + i++; + } + gvPipingInspection.DataSource = list; + gvPipingInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("TotalNoBackCount", Quantity0Sum.ToString()); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvPipingInspection.SummaryData = summary; + } + #endregion + + #region 13.特种设备监检情况 gvSpecialInspection方法 + /// + /// 特种设备监检情况 + /// + void loadSpecialInspection(string objType) + { + var db = Funs.DB; + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + var list = new List(); + int i = 1; + + int Quantity0Sum = 0; + int Quantity1Sum = 0; + int Quantity2Sum = 0; + //加载所有单位 + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1) + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + foreach (var item in units) + { + var query = from c in db.Comprehensive_SpecialEquipment + join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId + select new + { + c.ReportTime, + c.ProjectId, + u.UnitId, + u.UnitName, + c.SunNumber, + c.MonitoringReportNumber + }; + var AllList = query.ToList(); + var monethCount = query + .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate))); + + Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem(); + model.Id = Guid.NewGuid().ToString(); + model.ContentName = item.UnitName; + model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o=>o.SunNumber)); + model.MonthsCount = Convert.ToInt32(monethCount.Sum(o=>o.MonitoringReportNumber)); + model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber)); + model.ReportId = ReportId; + //如果是修改，查询表中数据 + if (objType == "1") + { + var NewModel = db.Report_CQMS_MonthReportItem.FirstOrDefault(x => x.ReportId == ReportId && x.ContentName == item.UnitName && x.ReType == "13"); + if (NewModel != null) + { + model.RectificationRate = NewModel.RectificationRate; + model.Remarks = NewModel.Remarks; + } + } + list.Add(model); + Quantity0Sum += Convert.ToInt32(monethCount.Sum(o => o.SunNumber)); + Quantity1Sum += Convert.ToInt32(monethCount.Sum(o => o.MonitoringReportNumber)); + Quantity2Sum += Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber)); + i++; + } + gvSpecialInspection.DataSource = list; + gvSpecialInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("ContentName", "合计"); + summary.Add("TotalNoBackCount", Quantity0Sum.ToString()); + summary.Add("MonthsCount", Quantity1Sum.ToString()); + summary.Add("ProjectCount", Quantity2Sum.ToString()); + + gvSpecialInspection.SummaryData = summary; + } + #endregion + + #region 14.NCR管理情况 gvNcrManagementInspection方法 + /// + /// NCR管理情况 + /// + void loadNcrManagementInspection() + { + DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); + DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim()); + List StatisticsList = new List(); + int i = 1; + + int CurrentPeriodOkNumSum = 0; + int OKNumSum = 0; + int CheckNumSum = 0; + string OKRateSum = string.Empty; + + var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + DateTime projectStartDate = Convert.ToDateTime("2000-01-01"); + if (project != null && project.StartDate != null) + { + projectStartDate = project.StartDate.Value; + } + var units = from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2 + orderby y.UnitCode + select new { x.UnitId, y.UnitName }; + var db = Funs.DB; + foreach (var item in units) + { + + var query = from c in db.Comprehensive_NCRManagement + join u in db.Base_Unit on c.SendUnit equals u.UnitId into unitJoin + from u in unitJoin.DefaultIfEmpty() + where c.ProjectId == this.CurrUser.LoginProjectId && c.ReceiveUnit == item.UnitId + select new + { + c.NCRManagementId, + c.ProjectId, + u.UnitId, + u.UnitName, + c.IssuedDate, + c.Status + }; + + var AllList = query.ToList(); + var unitNCRStatic = query + .Where(x => (x.IssuedDate >= Convert.ToDateTime(startDate) && x.IssuedDate <= Convert.ToDateTime(endDate))); + + Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc(); + NCRStatisc.Id = Guid.NewGuid().ToString(); + NCRStatisc.WorkName = item.UnitName; + NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3"); + NCRStatisc.OKNum = AllList.Count(x => x.Status == "3"); + NCRStatisc.CheckNum = AllList.Count(); + if (NCRStatisc.CheckNum != 0)//被除数不能为零 + { + NCRStatisc.OKRate = Math.Round((double)NCRStatisc.OKNum / (double)NCRStatisc.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + NCRStatisc.OKRate = "0%"; + } + StatisticsList.Add(NCRStatisc); + + CurrentPeriodOkNumSum += NCRStatisc.CurrentPeriodOkNum; + OKNumSum += NCRStatisc.OKNum; + CheckNumSum += NCRStatisc.CheckNum; + i++; + } + + if (CheckNumSum != 0)//被除数不能为零 + { + OKRateSum = Math.Round((double)OKNumSum / (double)CheckNumSum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + OKRateSum = "0%"; + } + + this.gvNcrManagementInspection.DataSource = StatisticsList; + this.gvNcrManagementInspection.DataBind(); + + //合计 + JObject summary = new JObject(); + summary.Add("WorkName", "合计"); + summary.Add("CurrentPeriodOkNum", CurrentPeriodOkNumSum.ToString()); + summary.Add("OKNum", OKNumSum.ToString()); + summary.Add("CheckNum", CheckNumSum.ToString()); + summary.Add("OKRate", OKRateSum.ToString()); + + gvNcrManagementInspection.SummaryData = summary; + } + #endregion + #region 15.质量巡检情况 gvQualityInspection方法 /// /// 加载质量巡检情况 @@ -819,6 +1555,214 @@ namespace FineUIPro.Web.CQMS.ManageReportNew #endregion #region 保存方法 + + #region 9.计量器具报验管理情况 + void saveMeasuringInspection() { + + List detailLists = new List(); + JArray teamGroupData = gvMeasuringInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "9", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvMeasuringInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvMeasuringInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } + #endregion + + #region 10.现场质量共检数据 + void saveInspectionDataInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvInspectionDataInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "10", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvInspectionDataInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 11.压力管道监检情况 + void savePressureInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvPressureInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "11", + TotalNoBackCount = values.Value("TotalNoBackCount"), + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvPressureInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvPressureInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 12.管道试压包管理情况 + void savePipingInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvPipingInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "12", + TotalNoBackCount = values.Value("TotalNoBackCount"), + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvPipingInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvPipingInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 13.特种设备监检情况 + void saveSpecialInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvSpecialInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "13", + TotalNoBackCount= values.Value("TotalNoBackCount"), + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvSpecialInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvSpecialInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + + } + #endregion + + #region 14.NCR管理情况 + void saveNcrManagementInspection() + { + List detailLists = new List(); + JArray teamGroupData = gvNcrManagementInspection.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem + { + ReportId = ReportId, + ReType = "14", + ContentName = values.Value("ContentName"), + MonthsCount = values.Value("MonthsCount"), + ProjectCount = values.Value("ProjectCount"), + //RectificationRate = values.Value("RectificationRate"), + Remarks = values.Value("Remarks") + }; + if (gvNcrManagementInspection.Rows[rowIndex].DataKeys.Length > 0) + { + newDetail.Id = gvNcrManagementInspection.Rows[rowIndex].DataKeys[0].ToString(); + } + detailLists.Add(newDetail); + } + if (detailLists.Count > 0) + { + Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists); + Funs.DB.SubmitChanges(); + } + } +#endregion + + + #region 15.质量巡检情况 /// /// 15.质量巡检情况 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs index 56e530ef..17a93083 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.ManageReportNew { - - - public partial class MonthReportNewEdit { - +namespace FineUIPro.Web.CQMS.ManageReportNew +{ + + + public partial class MonthReportNewEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// ContentPanel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel ContentPanel1; - + /// /// Table1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlTable Table1; - + /// /// tabbtn 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlTable tabbtn; - + /// /// image15 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Image image15; - + /// /// Button2 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button Button2; - + /// /// Table5 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlTable Table5; - + /// /// lblProjectName 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblProjectName; - + /// /// Label1 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + /// /// txtPeriod 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.TextBox txtPeriod; - + /// /// RequiredFieldValidator1 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1; - + /// /// Label2 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// lblTital 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblTital; - + /// /// Table2 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlTable Table2; - + /// /// txtStartDate 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.TextBox txtStartDate; - + /// /// txtEndDate 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.TextBox txtEndDate; - + /// /// Panel4 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel4; - + /// /// Toolbar2 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// Button3 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button Button3; - + /// /// Form5 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form5; - + /// /// Grid1 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// txtProStage 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProStage; - + /// /// txtProDescribe 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProDescribe; - + /// /// txtTargetValue 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTargetValue; - + /// /// txtMonthPer 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtMonthPer; - + /// /// txtRemarks 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemarks; - + /// /// Panel5 控件。 /// @@ -263,7 +265,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel5; - + /// /// Panel6 控件。 /// @@ -272,7 +274,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel6; - + /// /// Form6 控件。 /// @@ -281,7 +283,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form6; - + /// /// txtAre0 控件。 /// @@ -290,7 +292,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtAre0; - + /// /// Panel7 控件。 /// @@ -299,7 +301,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel7; - + /// /// Form7 控件。 /// @@ -308,7 +310,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form7; - + /// /// txtAre1 控件。 /// @@ -317,7 +319,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtAre1; - + /// /// Panel8 控件。 /// @@ -326,7 +328,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel8; - + /// /// Form8 控件。 /// @@ -335,7 +337,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form8; - + /// /// txtAre2 控件。 /// @@ -344,7 +346,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtAre2; - + /// /// Panel9 控件。 /// @@ -353,7 +355,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel9; - + /// /// Panel10 控件。 /// @@ -362,7 +364,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel10; - + /// /// Form9 控件。 /// @@ -371,7 +373,295 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form9; - + + /// + /// Pnl9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl9; + + /// + /// Form16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form16; + + /// + /// gvMeasuringInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvMeasuringInspection; + + /// + /// TextBox6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox6; + + /// + /// Pnl10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl10; + + /// + /// Form17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form17; + + /// + /// gvTj 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvTj; + + /// + /// GvSb 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvSb; + + /// + /// GvGD 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvGD; + + /// + /// GvDq 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvDq; + + /// + /// GvYb 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvYb; + + /// + /// GvFf 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvFf; + + /// + /// GvXf 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid GvXf; + + /// + /// gvInspectionDataInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvInspectionDataInspection; + + /// + /// TextBox14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox14; + + /// + /// Pnl11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl11; + + /// + /// Form18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form18; + + /// + /// gvPressureInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvPressureInspection; + + /// + /// TextBox11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox11; + + /// + /// Pnl12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl12; + + /// + /// Form19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form19; + + /// + /// gvPipingInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvPipingInspection; + + /// + /// TextBox8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox8; + + /// + /// TextBox12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox12; + + /// + /// Pnl13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl13; + + /// + /// Form20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form20; + + /// + /// gvSpecialInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvSpecialInspection; + + /// + /// TextBox9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox9; + + /// + /// TextBox13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox TextBox13; + + /// + /// Pnl14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Pnl14; + + /// + /// Form21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form21; + + /// + /// gvNcrManagementInspection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid gvNcrManagementInspection; + /// /// Panel13 控件。 /// @@ -380,7 +670,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel13; - + /// /// Form12 控件。 /// @@ -389,7 +679,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form12; - + /// /// gvQualityInspection 控件。 /// @@ -398,7 +688,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvQualityInspection; - + /// /// TextBox1 控件。 /// @@ -407,7 +697,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox TextBox1; - + /// /// TextBox3 控件。 /// @@ -416,7 +706,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox TextBox3; - + /// /// Panel11 控件。 /// @@ -425,7 +715,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel11; - + /// /// Form10 控件。 /// @@ -434,7 +724,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form10; - + /// /// gvSpecialCheck 控件。 /// @@ -443,7 +733,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvSpecialCheck; - + /// /// TextBox4 控件。 /// @@ -452,7 +742,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox TextBox4; - + /// /// Panel12 控件。 /// @@ -461,7 +751,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel12; - + /// /// Form11 控件。 /// @@ -470,7 +760,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form11; - + /// /// gvFileReport 控件。 /// @@ -479,7 +769,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvFileReport; - + /// /// Panel14 控件。 /// @@ -488,7 +778,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel14; - + /// /// Panel15 控件。 /// @@ -497,7 +787,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel15; - + /// /// Toolbar3 控件。 /// @@ -506,7 +796,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// btnRowMaterialProblem 控件。 /// @@ -515,7 +805,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnRowMaterialProblem; - + /// /// Form13 控件。 /// @@ -524,7 +814,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form13; - + /// /// gvRowMaterialProblem 控件。 /// @@ -533,7 +823,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvRowMaterialProblem; - + /// /// txtUnitId 控件。 /// @@ -542,7 +832,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitId; - + /// /// txtProblemDesrioption 控件。 /// @@ -551,7 +841,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProblemDesrioption; - + /// /// txtTreatmentMeasures 控件。 /// @@ -560,7 +850,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTreatmentMeasures; - + /// /// txtProcessingResults 控件。 /// @@ -569,7 +859,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProcessingResults; - + /// /// txtRemark 控件。 /// @@ -578,7 +868,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemark; - + /// /// Panel16 控件。 /// @@ -587,7 +877,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel16; - + /// /// Toolbar4 控件。 /// @@ -596,7 +886,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar4; - + /// /// btnAddConstructionProblems 控件。 /// @@ -605,7 +895,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAddConstructionProblems; - + /// /// Form14 控件。 /// @@ -614,7 +904,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form14; - + /// /// gvConstructionProblems 控件。 /// @@ -623,7 +913,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvConstructionProblems; - + /// /// drpUnitId 控件。 /// @@ -632,7 +922,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// txtProblemDesrioption2 控件。 /// @@ -641,7 +931,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProblemDesrioption2; - + /// /// txtTreatmentMeasures2 控件。 /// @@ -650,7 +940,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtTreatmentMeasures2; - + /// /// txtProcessingResults2 控件。 /// @@ -659,7 +949,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProcessingResults2; - + /// /// txtRemark2 控件。 /// @@ -668,7 +958,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemark2; - + /// /// Panel17 控件。 /// @@ -677,7 +967,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel17; - + /// /// Toolbar5 控件。 /// @@ -686,7 +976,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar5; - + /// /// btnAddNextControl 控件。 /// @@ -695,7 +985,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAddNextControl; - + /// /// Form15 控件。 /// @@ -704,7 +994,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form15; - + /// /// gvNextQualityControl 控件。 /// @@ -713,7 +1003,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvNextQualityControl; - + /// /// TextBox2 控件。 /// @@ -722,7 +1012,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox TextBox2; - + /// /// Panel3 控件。 /// @@ -731,7 +1021,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel3; - + /// /// Form3 控件。 /// @@ -740,7 +1030,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form3; - + /// /// txtAre20 控件。 /// @@ -749,7 +1039,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtAre20; - + /// /// Panel1 控件。 /// @@ -758,7 +1048,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Form2 控件。 /// @@ -767,7 +1057,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form2; - + /// /// txtAre21 控件。 /// @@ -776,7 +1066,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtAre21; - + /// /// Panel2 控件。 /// @@ -785,7 +1075,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Form4 控件。 /// @@ -794,7 +1084,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form4; - + /// /// txtAre22 控件。 /// @@ -803,7 +1093,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtAre22; - + /// /// Toolbar1 控件。 /// @@ -812,7 +1102,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdCheckControlCode 控件。 /// @@ -821,7 +1111,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdCheckControlCode; - + /// /// ToolbarFill1 控件。 /// @@ -830,7 +1120,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// Button1 控件。 /// @@ -839,7 +1129,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button Button1; - + /// /// hdId 控件。 /// @@ -848,7 +1138,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdId; - + /// /// hdAttachUrl 控件。 /// @@ -857,7 +1147,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// ValidationSummary1 控件。 /// @@ -866,7 +1156,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1; - + /// /// hidReportId 控件。 /// diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 187a54e3..a18ac0af 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,5 +1,372 @@ 错误信息开始=====> +<<<<<<< HEAD +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 188 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:03/30/2024 16:25:08 +出错文件:http://localhost:8579/CQMS/ManageReportNew/MonthReportEdit.aspx?reportId=c759797f-0e9c-4c4d-9f3e-b0920d9ab930 +IP地址:::1 +操作人员:JT + +出错时间:03/30/2024 16:25:08 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 +出错时间:03/30/2024 18:23:33 +出错时间:03/30/2024 18:23:33 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 +出错时间:03/30/2024 18:23:33 +出错时间:03/30/2024 18:23:33 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 +出错时间:03/30/2024 18:23:33 +出错时间:03/30/2024 18:23:33 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 +出错时间:03/30/2024 18:23:33 +出错时间:03/30/2024 18:23:33 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 +出错时间:03/30/2024 20:23:32 +出错时间:03/30/2024 20:23:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 +出错时间:03/30/2024 20:23:32 +出错时间:03/30/2024 20:23:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 +出错时间:03/30/2024 20:23:32 +出错时间:03/30/2024 20:23:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 +出错时间:03/30/2024 20:23:32 +出错时间:03/30/2024 20:23:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204 + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181 +出错时间:03/30/2024 22:23:32 +出错时间:03/30/2024 22:23:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228 + 在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046 +出错时间:03/30/2024 22:23:32 +出错时间:03/30/2024 22:23:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220 + 在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942 +出错时间:03/30/2024 22:23:32 +出错时间:03/30/2024 22:23:32 + + +错误信息开始=====> +错误类型:ArgumentException +错误信息:提供的 URI 方案“http”无效，应为“https”。 +参数名: via +错误堆栈: + 在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via) + 在 System.ServiceModel.ChannelFactory`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannel() + 在 System.ServiceModel.ClientBase`1.CreateChannelInternal() + 在 System.ServiceModel.ClientBase`1.get_Channel() + 在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020 + 在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884 +出错时间:03/30/2024 22:23:32 +出错时间:03/30/2024 22:23:32 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.CQMS.ManageReportNew.MonthReport.btnPrinter_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReport.aspx.cs:行号 1208 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:03/30/2024 22:29:44 +出错文件:http://localhost:8579/CQMS/ManageReportNew/MonthReport.aspx +IP地址:::1 +操作人员:JT + +出错时间:03/30/2024 22:29:44 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 FineUIPro.Web.CQMS.ManageReportNew.MonthReport.btnPrinter_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReport.aspx.cs:行号 1208 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:03/30/2024 23:10:44 +出错文件:http://localhost:8579/CQMS/ManageReportNew/MonthReport.aspx +IP地址:::1 +操作人员:JT + +出错时间:03/30/2024 23:10:44 +======= 错误类型:HttpCompileException 错误信息:e:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\ZHGL\TestRunPerformance\TestRunMonthSummaryReport.aspx(24): error CS1061: “ASP.zhgl_testrunperformance_testrunmonthsummaryreport_aspx”不包含“TextBox_TextChanged”的定义，并且找不到可接受类型为“ASP.zhgl_testrunperformance_testrunmonthsummaryreport_aspx”的第一个参数的扩展方法“TextBox_TextChanged”(是否缺少 using 指令或程序集引用?) 错误堆栈: @@ -258,6 +625,7 @@ IP地址:::1 操作人员:JT 出错时间:03/26/2024 10:58:48 +>>>>>>> 0ae4143492852fa438a0c21d967acf7271ee604e 错误信息开始=====> diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc index ca318986..1623d1f4 100644 Binary files a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc and b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc differ diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 64eb053d..2ce3ba23 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1819,6 +1819,9 @@ + + + @@ -16338,6 +16341,27 @@ Feedback.aspx + + MeetingInitiate.aspx + ASPXCodeBehind + + + MeetingInitiate.aspx + + + MeetingInitiateEdit.aspx + ASPXCodeBehind + + + MeetingInitiateEdit.aspx + + + MeetingSummary.aspx + ASPXCodeBehind + + + MeetingSummary.aspx + ScheduleMeeting.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index 63ca13cc..9e91deff 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs index 269f3232..0b0ffb01 100644 --- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs @@ -84,8 +84,18 @@ namespace FineUIPro.Web.TestRun.DriverReport else { this.txtMonthReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + //新增月报时填充上一条月报的项目概况内容 + var report = BLL.TestRun_MonthReportService.GetReportByMaxDate(this.CurrUser.LoginProjectId); + if (report != null) + { + this.txtProjectOverview.Text = report.ProjectOverview; + this.txtProjectBaseInfo.Text = report.ProjectBaseInfo; + this.txtEngineeringPlant.Text = report.EngineeringPlant; + this.txtProjectContract.Text = report.ProjectContract; + } #region 开车绩效测量数据 + monthReportItems2.Clear(); Model.TestRun_MonthReportItem2 newItem = new Model.TestRun_MonthReportItem2(); newItem.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)); newItem.TypeName = "设计"; diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/Feedback.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/Feedback.aspx.cs index ff6702e6..c5c0c3fc 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/Feedback.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/Feedback.aspx.cs @@ -17,15 +17,15 @@ namespace FineUIPro.Web.TestRun.Meeting if (data != null) { this.hdId.Text = id; - this.txtMeetingCode.Text = data.MeetingCode; - this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; + //this.txtMeetingCode.Text = data.MeetingCode; + //this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; this.txtMeetingAddress.Text = data.MeetingAddress; - this.txtMeetingUrl.Text = data.AttachUrl; - if (!string.IsNullOrEmpty(data.CompileMan)) - { - this.drpCompileMan.SelectedValue = data.CompileMan; - } - this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; + //this.txtMeetingUrl.Text = data.AttachUrl; + //if (!string.IsNullOrEmpty(data.CompileMan)) + //{ + // this.drpCompileMan.SelectedValue = data.CompileMan; + //} + //this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; } } } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx new file mode 100644 index 00000000..447cd863 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeetingInitiate.aspx.cs" Inherits="FineUIPro.Web.TestRun.Meeting.MeetingInitiate" %> + + + + + + + 会议发起 + + +
+
+
+
+ + diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.cs new file mode 100644 index 00000000..8adb504d --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Meeting +{ + public partial class MeetingInitiate : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.designer.cs new file mode 100644 index 00000000..bbfa171c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Meeting { + + + public partial class MeetingInitiate { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx new file mode 100644 index 00000000..1e27ffbd --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx @@ -0,0 +1,84 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeetingInitiateEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.Meeting.MeetingInitiateEdit" %> + + + + + + + 编辑会议发起 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.cs new file mode 100644 index 00000000..32eff397 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.cs @@ -0,0 +1,233 @@ +using BLL; +using System; + +namespace FineUIPro.Web.TestRun.Meeting +{ + public partial class MeetingInitiateEdit : PageBase + { + #region 加载 + /// + /// 页面加载 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + string id = Request.Params["id"]; + if (!string.IsNullOrEmpty(id)) + { + Model.Driver_Meeting data = BLL.MeetingService.GetMeetingById(id); + if (data != null) + { + this.hdId.Text = id; + this.txtMeetingName.Text = data.MeetingName; + this.txtStartTime.Text = data.StartTime.HasValue ? string.Format("{0:yyyy-MM-dd hh:mm:ss}", data.StartTime) : ""; + this.txtEndTime.Text = data.EndTime.HasValue ? string.Format("{0:yyyy-MM-dd hh:mm:ss}", data.EndTime) : ""; + this.txtMeetingAddress.Text = data.MeetingAddress; + this.txtMeetingUrl.Text = data.MeetingUrl; + this.txtInitiationDate.Text = data.InitiationDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.InitiationDate) : ""; + this.txtMeetingContent.Text = data.MeetingContent; + this.rblMeetingType.SelectedValue = data.MeetingType; + } + } + else + { + this.txtStartTime.Text = string.Format("{0:yyyy-MM-dd hh:mm:ss}", DateTime.Now); + this.txtEndTime.Text = string.Format("{0:yyyy-MM-dd hh:mm:ss}", DateTime.Now); + this.txtInitiationDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + } + InitMenuTree(); + } + } + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + SaveData(BLL.Const.BtnSave); + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 保存数据 + /// + /// + private void SaveData(string type) + { + string id = Request.Params["id"]; + Model.Driver_Meeting newData = new Model.Driver_Meeting(); + newData.MeetingName = this.txtMeetingName.Text.Trim(); + newData.StartTime = Funs.GetNewDateTime(this.txtStartTime.Text.Trim()); + newData.EndTime = Funs.GetNewDateTime(this.txtEndTime.Text.Trim()); + newData.MeetingAddress = this.txtMeetingAddress.Text.Trim(); + newData.MeetingUrl = this.txtMeetingUrl.Text.Trim(); + newData.InitiationDate = Funs.GetNewDateTime(this.txtInitiationDate.Text.Trim()); + newData.MeetingContent = this.txtMeetingContent.Text.Trim(); + newData.MeetingType = this.rblMeetingType.SelectedValue; + newData.ProjectId = this.CurrUser.LoginProjectId; + + if (!string.IsNullOrEmpty(id)) + { + newData.MeetingId = id; + BLL.MeetingService.UpdateMeeting(newData); + } + else + { + if (!string.IsNullOrEmpty(this.hdId.Text)) + { + newData.MeetingId = this.hdId.Text.Trim(); + } + else + { + newData.MeetingId = SQLHelper.GetNewID(typeof(Model.Driver_Meeting)); + this.hdId.Text = newData.MeetingId; + } + BLL.MeetingService.AddMeeting(newData); + } + + #region 保存参会人员 + BLL.MeetingItemService.DeleteMeetingItemByMeetingId(this.hdId.Text); + TreeNode[] nodes = this.tvAttendMeetingsPerson.GetCheckedNodes(); + if (nodes.Length > 0) + { + foreach (TreeNode tn in nodes) + { + if (tn.NodeID != "0") + { + Model.Driver_MeetingItem newItem = new Model.Driver_MeetingItem + { + MeetingItemId = SQLHelper.GetNewID(typeof(Model.Driver_MeetingItem)), + MeetingId = this.hdId.Text, + UserId = tn.NodeID, + }; + BLL.MeetingItemService.AddMeetingItem(newItem); + } + } + } + #endregion + } + #endregion + + #region 初始化树 + /// + /// 初始化树 + /// + /// 单位集合 + private void InitMenuTree() + { + this.tvAttendMeetingsPerson.Nodes.Clear(); + var units = BLL.UnitService.GetUnitByProjectIdList(this.CurrUser.LoginProjectId); + foreach (var item in units) + { + TreeNode rootNode = new TreeNode + { + Text = item.UnitName, + NodeID = item.UnitId, + EnableCheckBox = true, + EnableCheckEvent = true, + Expanded = true + }; + this.tvAttendMeetingsPerson.Nodes.Add(rootNode); + this.BoundTree(rootNode.Nodes, rootNode.NodeID); + } + } + + /// + /// 遍历增加子节点 + /// + /// + /// + private void BoundTree(TreeNodeCollection nodes, string superMenuId) + { + var menus = BLL.UserService.GetUserByUnitId(this.CurrUser.LoginProjectId, superMenuId); + foreach (var item in menus) + { + TreeNode chidNode = new TreeNode + { + Text = item.Text, + NodeID = item.Value, + EnableCheckBox = true, + EnableCheckEvent = true + }; + var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(this.hdId.Text.Trim()); + if (items.Count > 0) + { + foreach (var i in items) + { + if (i.UserId == item.Value) + { + chidNode.Checked = true; + chidNode.Expanded = true; + chidNode.Selectable = true; + //var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); + //if (meeting != null) + //{ + // if (meeting.States == "2") + // { + // if (i.IsMeeting == true) + // { + // chidNode.Text = item.Text + "（可按时参加）"; + // } + // else if (i.IsMeeting == false) + // { + // chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; + // } + // else + // { + // chidNode.Text = item.Text + "（暂未反馈）"; + // } + // } + //} + } + } + } + nodes.Add(chidNode); + } + } + #endregion + + #region 全选、全不选 + /// + /// 全选、全不选 + /// + /// + /// + protected void tvAttendMeetingsPerson_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e) + { + if (e.Checked) + { + this.tvAttendMeetingsPerson.CheckAllNodes(e.Node.Nodes); + SetCheckParentNode(e.Node); + } + else + { + this.tvAttendMeetingsPerson.UncheckAllNodes(e.Node.Nodes); + } + } + + /// + /// 选中父节点 + /// + /// + private void SetCheckParentNode(TreeNode node) + { + if (node.ParentNode != null && node.ParentNode.NodeID != "0") + { + node.ParentNode.Checked = true; + if (node.ParentNode.ParentNode.NodeID != "0") + { + SetCheckParentNode(node.ParentNode); + } + } + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.designer.cs new file mode 100644 index 00000000..392c016c --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.designer.cs @@ -0,0 +1,186 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Meeting { + + + public partial class MeetingInitiateEdit { + + /// + /// 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; + + /// + /// hdId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hdId; + + /// + /// ContentPanel2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel2; + + /// + /// Form2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form Form2; + + /// + /// txtMeetingName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMeetingName; + + /// + /// txtStartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtStartTime; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// txtEndTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtEndTime; + + /// + /// rblMeetingType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblMeetingType; + + /// + /// txtMeetingAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMeetingAddress; + + /// + /// txtMeetingUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMeetingUrl; + + /// + /// txtInitiationDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtInitiationDate; + + /// + /// txtMeetingContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtMeetingContent; + + /// + /// tvAttendMeetingsPerson 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Tree tvAttendMeetingsPerson; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx new file mode 100644 index 00000000..4ee93803 --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MeetingSummary.aspx.cs" Inherits="FineUIPro.Web.TestRun.Meeting.MeetingSummary" %> + + + + + + + 会议纪要 + + +
+
+
+
+ + diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.cs new file mode 100644 index 00000000..afa0656e --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.TestRun.Meeting +{ + public partial class MeetingSummary : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.designer.cs new file mode 100644 index 00000000..0a5ae10a --- /dev/null +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.designer.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.TestRun.Meeting { + + + public partial class MeetingSummary { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeeting.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeeting.aspx.cs index 842a363d..3f9729bc 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeeting.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeeting.aspx.cs @@ -260,34 +260,34 @@ namespace FineUIPro.Web.TestRun.Meeting Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); return; } - var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID); - if (meeting.States == "2") - { - var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID); - if (items.Count > 0) - { - var user = items.Where(x => x.UserId == this.CurrUser.UserId); - if (user.Count() > 0) - { - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); - } - else - { - Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning); - return; - } + //var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID); + //if (meeting.States == "2") + //{ + // var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID); + // if (items.Count > 0) + // { + // var user = items.Where(x => x.UserId == this.CurrUser.UserId); + // if (user.Count() > 0) + // { + // PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); + // } + // else + // { + // Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); + // return; + // } + //} + //else + //{ + // Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning); + // return; + //} } #endregion } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingEdit.aspx.cs index 00ef3e5b..dc6be516 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingEdit.aspx.cs @@ -23,15 +23,15 @@ namespace FineUIPro.Web.TestRun.Meeting if (data != null) { this.hdId.Text = id; - this.txtMeetingCode.Text = data.MeetingCode; - this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; + //this.txtMeetingCode.Text = data.MeetingCode; + //this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; this.txtMeetingAddress.Text = data.MeetingAddress; - this.txtMeetingUrl.Text = data.AttachUrl; - if (!string.IsNullOrEmpty(data.CompileMan)) - { - this.drpCompileMan.SelectedValue = data.CompileMan; - } - this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; + //this.txtMeetingUrl.Text = data.AttachUrl; + //if (!string.IsNullOrEmpty(data.CompileMan)) + //{ + // this.drpCompileMan.SelectedValue = data.CompileMan; + //} + //this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; } } else @@ -121,22 +121,22 @@ namespace FineUIPro.Web.TestRun.Meeting { string id = Request.Params["id"]; Model.Driver_Meeting newData = new Model.Driver_Meeting(); - newData.MeetingCode = this.txtMeetingCode.Text.Trim(); - newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim()); + //newData.MeetingCode = this.txtMeetingCode.Text.Trim(); + //newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim()); newData.MeetingAddress = this.txtMeetingAddress.Text.Trim(); - newData.AttachUrl = this.txtMeetingUrl.Text.Trim(); - if (this.drpCompileMan.SelectedValue != BLL.Const._Null) - { - newData.CompileMan = this.drpCompileMan.SelectedValue; - } - newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim()); + //newData.AttachUrl = this.txtMeetingUrl.Text.Trim(); + //if (this.drpCompileMan.SelectedValue != BLL.Const._Null) + //{ + // newData.CompileMan = this.drpCompileMan.SelectedValue; + //} + //newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim()); newData.ProjectId = this.CurrUser.LoginProjectId; ////单据状态 - newData.States = BLL.Const.State_0; - if (type == BLL.Const.BtnSubmit) - { - newData.States = this.ctlAuditFlow.NextStep; - } + //newData.States = BLL.Const.State_0; + //if (type == BLL.Const.BtnSubmit) + //{ + // newData.States = this.ctlAuditFlow.NextStep; + //} if (!string.IsNullOrEmpty(id)) { newData.MeetingId = id; @@ -179,7 +179,7 @@ namespace FineUIPro.Web.TestRun.Meeting #endregion ////保存流程审核数据 - this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.ScheduleMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null); + //this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.ScheduleMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null); } #endregion @@ -234,25 +234,25 @@ namespace FineUIPro.Web.TestRun.Meeting chidNode.Checked = true; chidNode.Expanded = true; chidNode.Selectable = true; - var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); - if (meeting != null) - { - if (meeting.States == "2") - { - if (i.IsMeeting == true) - { - chidNode.Text = item.Text + "（可按时参加）"; - } - else if (i.IsMeeting == false) - { - chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; - } - else - { - chidNode.Text = item.Text + "（暂未反馈）"; - } - } - } + //var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); + //if (meeting != null) + //{ + // if (meeting.States == "2") + // { + // if (i.IsMeeting == true) + // { + // chidNode.Text = item.Text + "（可按时参加）"; + // } + // else if (i.IsMeeting == false) + // { + // chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; + // } + // else + // { + // chidNode.Text = item.Text + "（暂未反馈）"; + // } + // } + //} } } } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingView.aspx.cs index 74d4b9fa..df975a70 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/ScheduleMeetingView.aspx.cs @@ -22,15 +22,15 @@ namespace FineUIPro.Web.TestRun.Meeting if (data != null) { this.hdId.Text = id; - this.txtMeetingCode.Text = data.MeetingCode; - this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; + //this.txtMeetingCode.Text = data.MeetingCode; + //this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; this.txtMeetingAddress.Text = data.MeetingAddress; - this.txtMeetingUrl.Text = data.AttachUrl; - if (!string.IsNullOrEmpty(data.CompileMan)) - { - this.drpCompileMan.SelectedValue = data.CompileMan; - } - this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; + //this.txtMeetingUrl.Text = data.AttachUrl; + //if (!string.IsNullOrEmpty(data.CompileMan)) + //{ + // this.drpCompileMan.SelectedValue = data.CompileMan; + //} + //this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; } } InitMenuTree(); @@ -120,25 +120,25 @@ namespace FineUIPro.Web.TestRun.Meeting chidNode.Checked = true; chidNode.Expanded = true; chidNode.Selectable = true; - var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); - if (meeting != null) - { - if (meeting.States == "2") - { - if (i.IsMeeting == true) - { - chidNode.Text = item.Text + "（可按时参加）"; - } - else if (i.IsMeeting == false) - { - chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; - } - else - { - chidNode.Text = item.Text + "（暂未反馈）"; - } - } - } + //var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); + //if (meeting != null) + //{ + // if (meeting.States == "2") + // { + // if (i.IsMeeting == true) + // { + // chidNode.Text = item.Text + "（可按时参加）"; + // } + // else if (i.IsMeeting == false) + // { + // chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; + // } + // else + // { + // chidNode.Text = item.Text + "（暂未反馈）"; + // } + // } + //} } } } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeeting.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeeting.aspx.cs index 9b380596..4fcd8d36 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeeting.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeeting.aspx.cs @@ -267,34 +267,34 @@ namespace FineUIPro.Web.TestRun.Meeting Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); return; } - var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID); - if (meeting.States == "2") - { - var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID); - if (items.Count > 0) - { - var user = items.Where(x => x.UserId == this.CurrUser.UserId); - if (user.Count() > 0) - { - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); - } - else - { - Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning); - return; - } + //var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID); + //if (meeting.States == "2") + //{ + // var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID); + // if (items.Count > 0) + // { + // var user = items.Where(x => x.UserId == this.CurrUser.UserId); + // if (user.Count() > 0) + // { + // PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); + // } + // else + // { + // Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); + // return; + // } + //} + //else + //{ + // Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning); + // return; + //} } #endregion } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingEdit.aspx.cs index 2c3ebc29..2579962e 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingEdit.aspx.cs @@ -23,15 +23,15 @@ namespace FineUIPro.Web.TestRun.Meeting if (data != null) { this.hdId.Text = id; - this.txtMeetingCode.Text = data.MeetingCode; - this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; + //this.txtMeetingCode.Text = data.MeetingCode; + //this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; this.txtMeetingAddress.Text = data.MeetingAddress; - this.txtMeetingUrl.Text = data.AttachUrl; - if (!string.IsNullOrEmpty(data.CompileMan)) - { - this.drpCompileMan.SelectedValue = data.CompileMan; - } - this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; + //this.txtMeetingUrl.Text = data.AttachUrl; + //if (!string.IsNullOrEmpty(data.CompileMan)) + //{ + // this.drpCompileMan.SelectedValue = data.CompileMan; + //} + //this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; } } else @@ -121,22 +121,22 @@ namespace FineUIPro.Web.TestRun.Meeting { string id = Request.Params["id"]; Model.Driver_Meeting newData = new Model.Driver_Meeting(); - newData.MeetingCode = this.txtMeetingCode.Text.Trim(); - newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim()); + //newData.MeetingCode = this.txtMeetingCode.Text.Trim(); + //newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim()); newData.MeetingAddress = this.txtMeetingAddress.Text.Trim(); - newData.AttachUrl = this.txtMeetingUrl.Text.Trim(); - if (this.drpCompileMan.SelectedValue != BLL.Const._Null) - { - newData.CompileMan = this.drpCompileMan.SelectedValue; - } - newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim()); + //newData.AttachUrl = this.txtMeetingUrl.Text.Trim(); + //if (this.drpCompileMan.SelectedValue != BLL.Const._Null) + //{ + // newData.CompileMan = this.drpCompileMan.SelectedValue; + //} + //newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim()); newData.ProjectId = this.CurrUser.LoginProjectId; ////单据状态 - newData.States = BLL.Const.State_0; - if (type == BLL.Const.BtnSubmit) - { - newData.States = this.ctlAuditFlow.NextStep; - } + //newData.States = BLL.Const.State_0; + //if (type == BLL.Const.BtnSubmit) + //{ + // newData.States = this.ctlAuditFlow.NextStep; + //} if (!string.IsNullOrEmpty(id)) { newData.MeetingId = id; @@ -179,7 +179,7 @@ namespace FineUIPro.Web.TestRun.Meeting #endregion ////保存流程审核数据 - this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.SpecialMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null); + //this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.SpecialMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null); } #endregion @@ -234,25 +234,25 @@ namespace FineUIPro.Web.TestRun.Meeting chidNode.Checked = true; chidNode.Expanded = true; chidNode.Selectable = true; - var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); - if (meeting != null) - { - if (meeting.States == "2") - { - if (i.IsMeeting == true) - { - chidNode.Text = item.Text + "（可按时参加）"; - } - else if (i.IsMeeting == false) - { - chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; - } - else - { - chidNode.Text = item.Text + "（暂未反馈）"; - } - } - } + //var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); + //if (meeting != null) + //{ + // if (meeting.States == "2") + // { + // if (i.IsMeeting == true) + // { + // chidNode.Text = item.Text + "（可按时参加）"; + // } + // else if (i.IsMeeting == false) + // { + // chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; + // } + // else + // { + // chidNode.Text = item.Text + "（暂未反馈）"; + // } + // } + //} } } } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingView.aspx.cs index 554c4b3b..de8b2373 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/SpecialMeetingView.aspx.cs @@ -22,15 +22,15 @@ namespace FineUIPro.Web.TestRun.Meeting if (data != null) { this.hdId.Text = id; - this.txtMeetingCode.Text = data.MeetingCode; - this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; + //this.txtMeetingCode.Text = data.MeetingCode; + //this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; this.txtMeetingAddress.Text = data.MeetingAddress; - this.txtMeetingUrl.Text = data.AttachUrl; - if (!string.IsNullOrEmpty(data.CompileMan)) - { - this.drpCompileMan.SelectedValue = data.CompileMan; - } - this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; + //this.txtMeetingUrl.Text = data.AttachUrl; + //if (!string.IsNullOrEmpty(data.CompileMan)) + //{ + // this.drpCompileMan.SelectedValue = data.CompileMan; + //} + //this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; } } InitMenuTree(); @@ -120,25 +120,25 @@ namespace FineUIPro.Web.TestRun.Meeting chidNode.Checked = true; chidNode.Expanded = true; chidNode.Selectable = true; - var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); - if (meeting != null) - { - if (meeting.States == "2") - { - if (i.IsMeeting == true) - { - chidNode.Text = item.Text + "（可按时参加）"; - } - else if (i.IsMeeting == false) - { - chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; - } - else - { - chidNode.Text = item.Text + "（暂未反馈）"; - } - } - } + //var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); + //if (meeting != null) + //{ + // if (meeting.States == "2") + // { + // if (i.IsMeeting == true) + // { + // chidNode.Text = item.Text + "（可按时参加）"; + // } + // else if (i.IsMeeting == false) + // { + // chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; + // } + // else + // { + // chidNode.Text = item.Text + "（暂未反馈）"; + // } + // } + //} } } } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeeting.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeeting.aspx.cs index df1d94a0..f8cb4b79 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeeting.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeeting.aspx.cs @@ -267,34 +267,34 @@ namespace FineUIPro.Web.TestRun.Meeting Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); return; } - var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID); - if (meeting.States == "2") - { - var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID); - if (items.Count > 0) - { - var user = items.Where(x => x.UserId == this.CurrUser.UserId); - if (user.Count() > 0) - { - PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); - } - else - { - Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning); - return; - } + //var meeting = BLL.MeetingService.GetMeetingById(Grid1.SelectedRowID); + //if (meeting.States == "2") + //{ + // var items = BLL.MeetingItemService.GetMeetingItemByMeetingId(Grid1.SelectedRowID); + // if (items.Count > 0) + // { + // var user = items.Where(x => x.UserId == this.CurrUser.UserId); + // if (user.Count() > 0) + // { + // PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("Feedback.aspx?id={0}", Grid1.SelectedRowID, "编辑 - "))); + // } + // else + // { + // Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // Alert.ShowInTop("未参与此会议，无需反馈！", MessageBoxIcon.Warning); + // return; + // } + //} + //else + //{ + // Alert.ShowInTop("审核未完成，无需反馈！", MessageBoxIcon.Warning); + // return; + //} } #endregion } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingEdit.aspx.cs index bb5b6147..3f600124 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingEdit.aspx.cs @@ -23,15 +23,15 @@ namespace FineUIPro.Web.TestRun.Meeting if (data != null) { this.hdId.Text = id; - this.txtMeetingCode.Text = data.MeetingCode; - this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; + //this.txtMeetingCode.Text = data.MeetingCode; + //this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; this.txtMeetingAddress.Text = data.MeetingAddress; - this.txtMeetingUrl.Text = data.AttachUrl; - if (!string.IsNullOrEmpty(data.CompileMan)) - { - this.drpCompileMan.SelectedValue = data.CompileMan; - } - this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; + //this.txtMeetingUrl.Text = data.AttachUrl; + //if (!string.IsNullOrEmpty(data.CompileMan)) + //{ + // this.drpCompileMan.SelectedValue = data.CompileMan; + //} + //this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; } } else @@ -121,22 +121,22 @@ namespace FineUIPro.Web.TestRun.Meeting { string id = Request.Params["id"]; Model.Driver_Meeting newData = new Model.Driver_Meeting(); - newData.MeetingCode = this.txtMeetingCode.Text.Trim(); - newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim()); + //newData.MeetingCode = this.txtMeetingCode.Text.Trim(); + //newData.MeetingDate = Funs.GetNewDateTime(this.txtMeetingDate.Text.Trim()); newData.MeetingAddress = this.txtMeetingAddress.Text.Trim(); - newData.AttachUrl = this.txtMeetingUrl.Text.Trim(); - if (this.drpCompileMan.SelectedValue != BLL.Const._Null) - { - newData.CompileMan = this.drpCompileMan.SelectedValue; - } - newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim()); + //newData.AttachUrl = this.txtMeetingUrl.Text.Trim(); + //if (this.drpCompileMan.SelectedValue != BLL.Const._Null) + //{ + // newData.CompileMan = this.drpCompileMan.SelectedValue; + //} + //newData.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim()); newData.ProjectId = this.CurrUser.LoginProjectId; ////单据状态 - newData.States = BLL.Const.State_0; - if (type == BLL.Const.BtnSubmit) - { - newData.States = this.ctlAuditFlow.NextStep; - } + //newData.States = BLL.Const.State_0; + //if (type == BLL.Const.BtnSubmit) + //{ + // newData.States = this.ctlAuditFlow.NextStep; + //} if (!string.IsNullOrEmpty(id)) { newData.MeetingId = id; @@ -179,7 +179,7 @@ namespace FineUIPro.Web.TestRun.Meeting #endregion ////保存流程审核数据 - this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.WeekMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null); + //this.ctlAuditFlow.btnSaveData(this.CurrUser.LoginProjectId, BLL.Const.WeekMeetingMenuId, this.hdId.Text, (type == BLL.Const.BtnSubmit ? true : false), newData.MeetingCode, null); } #endregion @@ -235,25 +235,25 @@ namespace FineUIPro.Web.TestRun.Meeting chidNode.Expanded = true; chidNode.Selectable = true; - var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); - if (meeting != null) - { - if (meeting.States == "2") - { - if (i.IsMeeting == true) - { - chidNode.Text = item.Text + "（可按时参加）"; - } - else if (i.IsMeeting == false) - { - chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; - } - else - { - chidNode.Text = item.Text + "（暂未反馈）"; - } - } - } + //var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); + //if (meeting != null) + //{ + // if (meeting.States == "2") + // { + // if (i.IsMeeting == true) + // { + // chidNode.Text = item.Text + "（可按时参加）"; + // } + // else if (i.IsMeeting == false) + // { + // chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; + // } + // else + // { + // chidNode.Text = item.Text + "（暂未反馈）"; + // } + // } + //} } } } diff --git a/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingView.aspx.cs index 086136f4..d7824f88 100644 --- a/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingView.aspx.cs +++ b/SGGL/FineUIPro.Web/TestRun/Meeting/WeekMeetingView.aspx.cs @@ -22,15 +22,15 @@ namespace FineUIPro.Web.TestRun.Meeting if (data != null) { this.hdId.Text = id; - this.txtMeetingCode.Text = data.MeetingCode; - this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; + //this.txtMeetingCode.Text = data.MeetingCode; + //this.txtMeetingDate.Text = data.MeetingDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MeetingDate) : ""; this.txtMeetingAddress.Text = data.MeetingAddress; - this.txtMeetingUrl.Text = data.AttachUrl; - if (!string.IsNullOrEmpty(data.CompileMan)) - { - this.drpCompileMan.SelectedValue = data.CompileMan; - } - this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; + //this.txtMeetingUrl.Text = data.AttachUrl; + //if (!string.IsNullOrEmpty(data.CompileMan)) + //{ + // this.drpCompileMan.SelectedValue = data.CompileMan; + //} + //this.txtCompileDate.Text = data.CompileDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.CompileDate) : ""; } } InitMenuTree(); @@ -120,25 +120,25 @@ namespace FineUIPro.Web.TestRun.Meeting chidNode.Checked = true; chidNode.Expanded = true; chidNode.Selectable = true; - var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); - if (meeting != null) - { - if (meeting.States == "2") - { - if (i.IsMeeting == true) - { - chidNode.Text = item.Text + "（可按时参加）"; - } - else if (i.IsMeeting == false) - { - chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; - } - else - { - chidNode.Text = item.Text + "（暂未反馈）"; - } - } - } + //var meeting = BLL.MeetingService.GetMeetingById(this.hdId.Text.Trim()); + //if (meeting != null) + //{ + // if (meeting.States == "2") + // { + // if (i.IsMeeting == true) + // { + // chidNode.Text = item.Text + "（可按时参加）"; + // } + // else if (i.IsMeeting == false) + // { + // chidNode.Text = item.Text + "（因故不参加：" + i.Feedback + "）"; + // } + // else + // { + // chidNode.Text = item.Text + "（暂未反馈）"; + // } + // } + //} } } } diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 963148f2..1ba63cb7 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml index a20d7aa1..ac8364da 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml @@ -7,7 +7,4 @@ - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index 5f525364..ef07bfad 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - - + + + + @@ -69,11 +69,9 @@ - - @@ -103,9 +101,8 @@ - - - + + diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 4d3b9e97..91d9fd84 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,21 +1,3 @@  - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 69859890..3ddcd7cf 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -83,8 +83,11 @@ +<<<<<<< HEAD +======= +>>>>>>> 0ae4143492852fa438a0c21d967acf7271ee604e \ No newline at end of file diff --git a/SGGL/Model/CQMS/CheckStatisc.cs b/SGGL/Model/CQMS/CheckStatisc.cs index 2d725f06..68ad2819 100644 --- a/SGGL/Model/CQMS/CheckStatisc.cs +++ b/SGGL/Model/CQMS/CheckStatisc.cs @@ -86,5 +86,15 @@ namespace Model get { return totalOneOKRate; } set { totalOneOKRate = value; } } + + private string id; + /// + /// + /// + public string Id + { + get { return id; } + set { id = value; } + } } } diff --git a/SGGL/Model/CQMS/NCRReportStatisc.cs b/SGGL/Model/CQMS/NCRReportStatisc.cs index 90c0f2ff..b31efb78 100644 --- a/SGGL/Model/CQMS/NCRReportStatisc.cs +++ b/SGGL/Model/CQMS/NCRReportStatisc.cs @@ -70,5 +70,15 @@ namespace Model get { return oKRate; } set { oKRate = value; } } - } + + private string id; + /// + /// + /// + public string Id + { + get { return id; } + set { id = value; } + } + } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 6c9859b8..56db465a 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1445,6 +1445,9 @@ namespace Model partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance); partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance); partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance); + partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); + partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance); partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance); @@ -2003,6 +2006,9 @@ namespace Model partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance); + partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); + partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance); partial void InsertReport_CqmsTarget(Report_CqmsTarget instance); partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance); partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance); @@ -6443,6 +6449,14 @@ namespace Model } } + public System.Data.Linq.Table Manager_Month_ComplianceObligations + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Manager_Month_ComplianceObligationsC { get @@ -7931,6 +7945,14 @@ namespace Model } } + public System.Data.Linq.Table Report_CQMS_ProblemHandle + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Report_CqmsTarget { get @@ -21408,8 +21430,6 @@ namespace Model private string _CodeRule; - private EntitySet _Doc_DocManage; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21426,7 +21446,6 @@ namespace Model public Base_DocType() { - this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); OnCreated(); } @@ -21510,19 +21529,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManage - { - get - { - return this._Doc_DocManage; - } - set - { - this._Doc_DocManage.Assign(value); - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -21542,18 +21548,6 @@ namespace Model this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); } } - - private void attach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = this; - } - - private void detach_Doc_DocManage(Doc_DocManage entity) - { - this.SendPropertyChanging(); - entity.Base_DocType = null; - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")] @@ -96142,6 +96136,10 @@ namespace Model private string _AuditMan; + private string _Measure; + + private string _Problem; + private EntityRef _Sys_User; private EntityRef _Base_CNProfessional; @@ -96188,6 +96186,10 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnMeasureChanging(string value); + partial void OnMeasureChanged(); + partial void OnProblemChanging(string value); + partial void OnProblemChanged(); #endregion public Comprehensive_NCRManagement() @@ -96555,6 +96557,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")] + public string Measure + { + get + { + return this._Measure; + } + set + { + if ((this._Measure != value)) + { + this.OnMeasureChanging(value); + this.SendPropertyChanging(); + this._Measure = value; + this.SendPropertyChanged("Measure"); + this.OnMeasureChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")] + public string Problem + { + get + { + return this._Problem; + } + set + { + if ((this._Problem != value)) + { + this.OnProblemChanging(value); + this.SendPropertyChanging(); + this._Problem = value; + this.SendPropertyChanged("Problem"); + this.OnProblemChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -96996,6 +97038,8 @@ namespace Model private string _AuditMan; + private System.Nullable _ReportTime; + private EntityRef _Sys_User; private EntityRef _Base_Project; @@ -97030,6 +97074,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnReportTimeChanging(System.Nullable value); + partial void OnReportTimeChanged(); #endregion public Comprehensive_PressurePipe() @@ -97292,6 +97338,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportTime", DbType="DateTime")] + public System.Nullable ReportTime + { + get + { + return this._ReportTime; + } + set + { + if ((this._ReportTime != value)) + { + this.OnReportTimeChanging(value); + this.SendPropertyChanging(); + this._ReportTime = value; + this.SendPropertyChanged("ReportTime"); + this.OnReportTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_PressurePipe_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -99775,6 +99841,8 @@ namespace Model private string _AuditMan; + private System.Nullable _ReportTime; + private EntityRef _Sys_User; private EntityRef _Base_Project; @@ -99807,6 +99875,8 @@ namespace Model partial void OnStatusChanged(); partial void OnAuditManChanging(string value); partial void OnAuditManChanged(); + partial void OnReportTimeChanging(System.Nullable value); + partial void OnReportTimeChanged(); #endregion public Comprehensive_SpecialEquipment() @@ -100049,6 +100119,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportTime", DbType="DateTime")] + public System.Nullable ReportTime + { + get + { + return this._ReportTime; + } + set + { + if ((this._ReportTime != value)) + { + this.OnReportTimeChanging(value); + this.SendPropertyChanging(); + this._ReportTime = value; + this.SendPropertyChanged("ReportTime"); + this.OnReportTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_SpecialEquipment_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { @@ -118341,8 +118431,6 @@ namespace Model private EntityRef _Base_CNProfessional; - private EntityRef _Base_DocType; - private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -118394,7 +118482,6 @@ namespace Model public Doc_DocManage() { this._Base_CNProfessional = default(EntityRef); - this._Base_DocType = default(EntityRef); this._Base_Project = default(EntityRef); this._Base_Unit = default(EntityRef); this._Sys_User = default(EntityRef); @@ -118473,10 +118560,6 @@ namespace Model { if ((this._DocTypeId != value)) { - if (this._Base_DocType.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnDocTypeIdChanging(value); this.SendPropertyChanging(); this._DocTypeId = value; @@ -118796,40 +118879,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)] - public Base_DocType Base_DocType - { - get - { - return this._Base_DocType.Entity; - } - set - { - Base_DocType previousValue = this._Base_DocType.Entity; - if (((previousValue != value) - || (this._Base_DocType.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._Base_DocType.Entity = null; - previousValue.Doc_DocManage.Remove(this); - } - this._Base_DocType.Entity = value; - if ((value != null)) - { - value.Doc_DocManage.Add(this); - this._DocTypeId = value.DocTypeId; - } - else - { - this._DocTypeId = default(string); - } - this.SendPropertyChanged("Base_DocType"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -119000,8 +119049,6 @@ namespace Model private EntityRef _Doc_DocManage; - private EntityRef _Sys_User; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -119025,7 +119072,6 @@ namespace Model public Doc_DocManageApprove() { this._Doc_DocManage = default(EntityRef); - this._Sys_User = default(EntityRef); OnCreated(); } @@ -119073,7 +119119,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")] public string ApproveMan { get @@ -119084,10 +119130,6 @@ namespace Model { if ((this._ApproveMan != value)) { - if (this._Sys_User.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } this.OnApproveManChanging(value); this.SendPropertyChanging(); this._ApproveMan = value; @@ -119211,40 +119253,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", 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.Doc_DocManageApprove.Remove(this); - } - this._Sys_User.Entity = value; - if ((value != null)) - { - value.Doc_DocManageApprove.Add(this); - this._ApproveMan = value.UserId; - } - else - { - this._ApproveMan = default(string); - } - this.SendPropertyChanged("Sys_User"); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -122059,38 +122067,24 @@ namespace Model private string _ProjectId; - private string _UnitWorkId; + private string _MeetingName; - private string _MeetingTake; + private System.Nullable _StartTime; - private string _MeetingUnit; - - private System.Nullable _MeetingDate; + private System.Nullable _EndTime; private string _MeetingAddress; + private string _MeetingUrl; + + private System.Nullable _InitiationDate; + private string _MeetingContent; - private string _Number; - - private string _AttachUrl; - private string _MeetingType; - private string _Remark; - - private string _MeetingCode; - - private string _CompileMan; - - private System.Nullable _CompileDate; - - private string _States; - private EntityRef _Base_Project; - private EntityRef _WBS_UnitWork; - private EntitySet _Driver_MeetingItem; #region 可扩展性方法定义 @@ -122101,40 +122095,27 @@ namespace Model partial void OnMeetingIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); - partial void OnUnitWorkIdChanging(string value); - partial void OnUnitWorkIdChanged(); - partial void OnMeetingTakeChanging(string value); - partial void OnMeetingTakeChanged(); - partial void OnMeetingUnitChanging(string value); - partial void OnMeetingUnitChanged(); - partial void OnMeetingDateChanging(System.Nullable value); - partial void OnMeetingDateChanged(); + partial void OnMeetingNameChanging(string value); + partial void OnMeetingNameChanged(); + partial void OnStartTimeChanging(System.Nullable value); + partial void OnStartTimeChanged(); + partial void OnEndTimeChanging(System.Nullable value); + partial void OnEndTimeChanged(); partial void OnMeetingAddressChanging(string value); partial void OnMeetingAddressChanged(); + partial void OnMeetingUrlChanging(string value); + partial void OnMeetingUrlChanged(); + partial void OnInitiationDateChanging(System.Nullable value); + partial void OnInitiationDateChanged(); partial void OnMeetingContentChanging(string value); partial void OnMeetingContentChanged(); - partial void OnNumberChanging(string value); - partial void OnNumberChanged(); - partial void OnAttachUrlChanging(string value); - partial void OnAttachUrlChanged(); partial void OnMeetingTypeChanging(string value); partial void OnMeetingTypeChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnMeetingCodeChanging(string value); - partial void OnMeetingCodeChanged(); - partial void OnCompileManChanging(string value); - partial void OnCompileManChanged(); - partial void OnCompileDateChanging(System.Nullable value); - partial void OnCompileDateChanged(); - partial void OnStatesChanging(string value); - partial void OnStatesChanged(); #endregion public Driver_Meeting() { this._Base_Project = default(EntityRef); - this._WBS_UnitWork = default(EntityRef); this._Driver_MeetingItem = new EntitySet(new Action(this.attach_Driver_MeetingItem), new Action(this.detach_Driver_MeetingItem)); OnCreated(); } @@ -122183,86 +122164,62 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")] - public string UnitWorkId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingName", DbType="NVarChar(50)")] + public string MeetingName { get { - return this._UnitWorkId; + return this._MeetingName; } set { - if ((this._UnitWorkId != value)) + if ((this._MeetingName != value)) { - if (this._WBS_UnitWork.HasLoadedOrAssignedValue) - { - throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); - } - this.OnUnitWorkIdChanging(value); + this.OnMeetingNameChanging(value); this.SendPropertyChanging(); - this._UnitWorkId = value; - this.SendPropertyChanged("UnitWorkId"); - this.OnUnitWorkIdChanged(); + this._MeetingName = value; + this.SendPropertyChanged("MeetingName"); + this.OnMeetingNameChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingTake", DbType="NVarChar(50)")] - public string MeetingTake + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StartTime", DbType="DateTime")] + public System.Nullable StartTime { get { - return this._MeetingTake; + return this._StartTime; } set { - if ((this._MeetingTake != value)) + if ((this._StartTime != value)) { - this.OnMeetingTakeChanging(value); + this.OnStartTimeChanging(value); this.SendPropertyChanging(); - this._MeetingTake = value; - this.SendPropertyChanged("MeetingTake"); - this.OnMeetingTakeChanged(); + this._StartTime = value; + this.SendPropertyChanged("StartTime"); + this.OnStartTimeChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingUnit", DbType="NVarChar(150)")] - public string MeetingUnit + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EndTime", DbType="DateTime")] + public System.Nullable EndTime { get { - return this._MeetingUnit; + return this._EndTime; } set { - if ((this._MeetingUnit != value)) + if ((this._EndTime != value)) { - this.OnMeetingUnitChanging(value); + this.OnEndTimeChanging(value); this.SendPropertyChanging(); - this._MeetingUnit = value; - this.SendPropertyChanged("MeetingUnit"); - this.OnMeetingUnitChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingDate", DbType="DateTime")] - public System.Nullable MeetingDate - { - get - { - return this._MeetingDate; - } - set - { - if ((this._MeetingDate != value)) - { - this.OnMeetingDateChanging(value); - this.SendPropertyChanging(); - this._MeetingDate = value; - this.SendPropertyChanged("MeetingDate"); - this.OnMeetingDateChanged(); + this._EndTime = value; + this.SendPropertyChanged("EndTime"); + this.OnEndTimeChanged(); } } } @@ -122287,7 +122244,47 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingContent", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingUrl", DbType="NVarChar(500)")] + public string MeetingUrl + { + get + { + return this._MeetingUrl; + } + set + { + if ((this._MeetingUrl != value)) + { + this.OnMeetingUrlChanging(value); + this.SendPropertyChanging(); + this._MeetingUrl = value; + this.SendPropertyChanged("MeetingUrl"); + this.OnMeetingUrlChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InitiationDate", DbType="DateTime")] + public System.Nullable InitiationDate + { + get + { + return this._InitiationDate; + } + set + { + if ((this._InitiationDate != value)) + { + this.OnInitiationDateChanging(value); + this.SendPropertyChanging(); + this._InitiationDate = value; + this.SendPropertyChanged("InitiationDate"); + this.OnInitiationDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingContent", DbType="NVarChar(1000)")] public string MeetingContent { get @@ -122307,46 +122304,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Number", DbType="NVarChar(50)")] - public string Number - { - get - { - return this._Number; - } - set - { - if ((this._Number != value)) - { - this.OnNumberChanging(value); - this.SendPropertyChanging(); - this._Number = value; - this.SendPropertyChanged("Number"); - this.OnNumberChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachUrl", DbType="NVarChar(1000)")] - public string AttachUrl - { - get - { - return this._AttachUrl; - } - set - { - if ((this._AttachUrl != value)) - { - this.OnAttachUrlChanging(value); - this.SendPropertyChanging(); - this._AttachUrl = value; - this.SendPropertyChanged("AttachUrl"); - this.OnAttachUrlChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MeetingType", DbType="NChar(1)")] public string MeetingType { @@ -122367,106 +122324,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(1000)")] - 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="_MeetingCode", DbType="NVarChar(50)")] - public string MeetingCode - { - get - { - return this._MeetingCode; - } - set - { - if ((this._MeetingCode != value)) - { - this.OnMeetingCodeChanging(value); - this.SendPropertyChanging(); - this._MeetingCode = value; - this.SendPropertyChanged("MeetingCode"); - this.OnMeetingCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] - public string CompileMan - { - get - { - return this._CompileMan; - } - set - { - if ((this._CompileMan != value)) - { - 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="_States", DbType="Char(1)")] - public string States - { - get - { - return this._States; - } - set - { - if ((this._States != value)) - { - this.OnStatesChanging(value); - this.SendPropertyChanging(); - this._States = value; - this.SendPropertyChanged("States"); - this.OnStatesChanged(); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_Meeting_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -122501,40 +122358,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_Meeting_WBS_UnitWork", Storage="_WBS_UnitWork", ThisKey="UnitWorkId", OtherKey="UnitWorkId", IsForeignKey=true)] - public WBS_UnitWork WBS_UnitWork - { - get - { - return this._WBS_UnitWork.Entity; - } - set - { - WBS_UnitWork previousValue = this._WBS_UnitWork.Entity; - if (((previousValue != value) - || (this._WBS_UnitWork.HasLoadedOrAssignedValue == false))) - { - this.SendPropertyChanging(); - if ((previousValue != null)) - { - this._WBS_UnitWork.Entity = null; - previousValue.Driver_Meeting.Remove(this); - } - this._WBS_UnitWork.Entity = value; - if ((value != null)) - { - value.Driver_Meeting.Add(this); - this._UnitWorkId = value.UnitWorkId; - } - else - { - this._UnitWorkId = default(string); - } - this.SendPropertyChanged("WBS_UnitWork"); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_MeetingItem_Driver_Meeting", Storage="_Driver_MeetingItem", ThisKey="MeetingId", OtherKey="MeetingId", DeleteRule="NO ACTION")] public EntitySet Driver_MeetingItem { @@ -232946,6 +232769,229 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")] + public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _ComplianceObligationsId; + + private string _MonthReportId; + + private string _InformationContent; + + private string _ResponseMeasures; + + private string _ImplementationStatus; + + private string _EvaluationConclusion; + + private EntityRef _Manager_MonthReportC; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnComplianceObligationsIdChanging(string value); + partial void OnComplianceObligationsIdChanged(); + partial void OnMonthReportIdChanging(string value); + partial void OnMonthReportIdChanged(); + partial void OnInformationContentChanging(string value); + partial void OnInformationContentChanged(); + partial void OnResponseMeasuresChanging(string value); + partial void OnResponseMeasuresChanged(); + partial void OnImplementationStatusChanging(string value); + partial void OnImplementationStatusChanged(); + partial void OnEvaluationConclusionChanging(string value); + partial void OnEvaluationConclusionChanged(); + #endregion + + public Manager_Month_ComplianceObligations() + { + this._Manager_MonthReportC = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string ComplianceObligationsId + { + get + { + return this._ComplianceObligationsId; + } + set + { + if ((this._ComplianceObligationsId != value)) + { + this.OnComplianceObligationsIdChanging(value); + this.SendPropertyChanging(); + this._ComplianceObligationsId = value; + this.SendPropertyChanged("ComplianceObligationsId"); + this.OnComplianceObligationsIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")] + public string MonthReportId + { + get + { + return this._MonthReportId; + } + set + { + if ((this._MonthReportId != value)) + { + if (this._Manager_MonthReportC.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnMonthReportIdChanging(value); + this.SendPropertyChanging(); + this._MonthReportId = value; + this.SendPropertyChanged("MonthReportId"); + this.OnMonthReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")] + public string InformationContent + { + get + { + return this._InformationContent; + } + set + { + if ((this._InformationContent != value)) + { + this.OnInformationContentChanging(value); + this.SendPropertyChanging(); + this._InformationContent = value; + this.SendPropertyChanged("InformationContent"); + this.OnInformationContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")] + public string ResponseMeasures + { + get + { + return this._ResponseMeasures; + } + set + { + if ((this._ResponseMeasures != value)) + { + this.OnResponseMeasuresChanging(value); + this.SendPropertyChanging(); + this._ResponseMeasures = value; + this.SendPropertyChanged("ResponseMeasures"); + this.OnResponseMeasuresChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")] + public string ImplementationStatus + { + get + { + return this._ImplementationStatus; + } + set + { + if ((this._ImplementationStatus != value)) + { + this.OnImplementationStatusChanging(value); + this.SendPropertyChanging(); + this._ImplementationStatus = value; + this.SendPropertyChanged("ImplementationStatus"); + this.OnImplementationStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")] + public string EvaluationConclusion + { + get + { + return this._EvaluationConclusion; + } + set + { + if ((this._EvaluationConclusion != value)) + { + this.OnEvaluationConclusionChanging(value); + this.SendPropertyChanging(); + this._EvaluationConclusion = value; + this.SendPropertyChanged("EvaluationConclusion"); + this.OnEvaluationConclusionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)] + public Manager_MonthReportC Manager_MonthReportC + { + get + { + return this._Manager_MonthReportC.Entity; + } + set + { + Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity; + if (((previousValue != value) + || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Manager_MonthReportC.Entity = null; + previousValue.Manager_Month_ComplianceObligations.Remove(this); + } + this._Manager_MonthReportC.Entity = value; + if ((value != null)) + { + value.Manager_Month_ComplianceObligations.Add(this); + this._MonthReportId = value.MonthReportId; + } + else + { + this._MonthReportId = default(string); + } + this.SendPropertyChanged("Manager_MonthReportC"); + } + } + } + + 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.Manager_Month_ComplianceObligationsC")] public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged { @@ -239145,6 +239191,8 @@ namespace Model private EntitySet _Manager_Month_CheckC; + private EntitySet _Manager_Month_ComplianceObligations; + private EntitySet _Manager_Month_ComplianceObligationsC; private EntitySet _Manager_Month_CostInvestmentPlanC; @@ -239417,6 +239465,7 @@ namespace Model this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC)); this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC)); this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC)); + this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations)); this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC)); this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC)); this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC)); @@ -241597,6 +241646,19 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] + public EntitySet Manager_Month_ComplianceObligations + { + get + { + return this._Manager_Month_ComplianceObligations; + } + set + { + this._Manager_Month_ComplianceObligations.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")] public EntitySet Manager_Month_ComplianceObligationsC { @@ -242178,6 +242240,18 @@ namespace Model entity.Manager_MonthReportC = null; } + private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = this; + } + + private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity) + { + this.SendPropertyChanging(); + entity.Manager_MonthReportC = null; + } + private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity) { this.SendPropertyChanging(); @@ -270522,7 +270596,7 @@ namespace Model private System.Nullable _ProblemType; - private string _SubInspectId; + private string _QuestionTechnologyId; private string _TermItemId; @@ -270536,18 +270610,20 @@ namespace Model private string _InspectUser; - private string _HandleUser; - private string _ApproveUser; - private System.Nullable _AdjustCompleteTime; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private string _HandleUser; + + private System.Nullable _AdjustCompleteTime; + + private string _SubInspectId; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -270564,8 +270640,8 @@ namespace Model partial void OnConstructionUnitChanged(); partial void OnProblemTypeChanging(System.Nullable value); partial void OnProblemTypeChanged(); - partial void OnSubInspectIdChanging(string value); - partial void OnSubInspectIdChanged(); + partial void OnQuestionTechnologyIdChanging(string value); + partial void OnQuestionTechnologyIdChanged(); partial void OnTermItemIdChanging(string value); partial void OnTermItemIdChanged(); partial void OnWorkPackIdChanging(string value); @@ -270578,18 +270654,20 @@ namespace Model partial void OnRectifyTimeChanged(); partial void OnInspectUserChanging(string value); partial void OnInspectUserChanged(); - partial void OnHandleUserChanging(string value); - partial void OnHandleUserChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnAdjustCompleteTimeChanging(System.Nullable value); - partial void OnAdjustCompleteTimeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnHandleUserChanging(string value); + partial void OnHandleUserChanged(); + partial void OnAdjustCompleteTimeChanging(System.Nullable value); + partial void OnAdjustCompleteTimeChanged(); + partial void OnSubInspectIdChanging(string value); + partial void OnSubInspectIdChanged(); #endregion public PreRun_InspectTailTerm() @@ -270717,22 +270795,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")] - public string SubInspectId + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")] + public string QuestionTechnologyId { get { - return this._SubInspectId; + return this._QuestionTechnologyId; } set { - if ((this._SubInspectId != value)) + if ((this._QuestionTechnologyId != value)) { - this.OnSubInspectIdChanging(value); + this.OnQuestionTechnologyIdChanging(value); this.SendPropertyChanging(); - this._SubInspectId = value; - this.SendPropertyChanged("SubInspectId"); - this.OnSubInspectIdChanged(); + this._QuestionTechnologyId = value; + this.SendPropertyChanged("QuestionTechnologyId"); + this.OnQuestionTechnologyIdChanged(); } } } @@ -270857,26 +270935,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] - public string HandleUser - { - get - { - return this._HandleUser; - } - set - { - if ((this._HandleUser != value)) - { - this.OnHandleUserChanging(value); - this.SendPropertyChanging(); - this._HandleUser = value; - this.SendPropertyChanged("HandleUser"); - this.OnHandleUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")] public string ApproveUser { @@ -270897,26 +270955,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] - public System.Nullable AdjustCompleteTime - { - get - { - return this._AdjustCompleteTime; - } - set - { - if ((this._AdjustCompleteTime != value)) - { - this.OnAdjustCompleteTimeChanging(value); - this.SendPropertyChanging(); - this._AdjustCompleteTime = value; - this.SendPropertyChanged("AdjustCompleteTime"); - this.OnAdjustCompleteTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -270977,6 +271015,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")] + public string HandleUser + { + get + { + return this._HandleUser; + } + set + { + if ((this._HandleUser != value)) + { + this.OnHandleUserChanging(value); + this.SendPropertyChanging(); + this._HandleUser = value; + this.SendPropertyChanged("HandleUser"); + this.OnHandleUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")] + public System.Nullable AdjustCompleteTime + { + get + { + return this._AdjustCompleteTime; + } + set + { + if ((this._AdjustCompleteTime != value)) + { + this.OnAdjustCompleteTimeChanging(value); + this.SendPropertyChanging(); + this._AdjustCompleteTime = value; + this.SendPropertyChanged("AdjustCompleteTime"); + this.OnAdjustCompleteTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")] + public string SubInspectId + { + get + { + return this._SubInspectId; + } + set + { + if ((this._SubInspectId != value)) + { + this.OnSubInspectIdChanging(value); + this.SendPropertyChanging(); + this._SubInspectId = value; + this.SendPropertyChanged("SubInspectId"); + this.OnSubInspectIdChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -271018,14 +271116,14 @@ namespace Model private string _ApproveUser; - private System.Nullable _ApproveType; - private System.Nullable _ApproveState; private string _AddUser; private System.Nullable _AddTime; + private System.Nullable _ApproveType; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -271044,14 +271142,14 @@ namespace Model partial void OnApproveTimeChanged(); partial void OnApproveUserChanging(string value); partial void OnApproveUserChanged(); - partial void OnApproveTypeChanging(System.Nullable value); - partial void OnApproveTypeChanged(); partial void OnApproveStateChanging(System.Nullable value); partial void OnApproveStateChanged(); partial void OnAddUserChanging(string value); partial void OnAddUserChanged(); partial void OnAddTimeChanging(System.Nullable value); partial void OnAddTimeChanged(); + partial void OnApproveTypeChanging(System.Nullable value); + partial void OnApproveTypeChanged(); #endregion public PreRun_InspectTermApproveRecords() @@ -271199,26 +271297,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] - public System.Nullable ApproveType - { - get - { - return this._ApproveType; - } - set - { - if ((this._ApproveType != value)) - { - this.OnApproveTypeChanging(value); - this.SendPropertyChanging(); - this._ApproveType = value; - this.SendPropertyChanged("ApproveType"); - this.OnApproveTypeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")] public System.Nullable ApproveState { @@ -271279,6 +271357,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")] + public System.Nullable ApproveType + { + get + { + return this._ApproveType; + } + set + { + if ((this._ApproveType != value)) + { + this.OnApproveTypeChanging(value); + this.SendPropertyChanging(); + this._ApproveType = value; + this.SendPropertyChanged("ApproveType"); + this.OnApproveTypeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -272211,7 +272309,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -272334,6 +272432,12 @@ namespace Model private string _InspectResult; + private System.Nullable _InspectTime; + + private string _AddUser; + + private System.Nullable _AddTime; + private string _Subcontractor; private string _Contractor; @@ -272342,6 +272446,12 @@ namespace Model private string _Owner; + private System.Nullable _IsUnifyWanderAbout; + + private System.Nullable _UnifyWanderAboutData; + + private string _UnifyWanderAboutOpinion; + private System.Nullable _InspectionIsAllPass; private System.Nullable _SubcontractorIsAllPass; @@ -272352,9 +272462,7 @@ namespace Model private System.Nullable _OwnerIsAllPass; - private System.Nullable _WorkPackType; - - private string _PropertyTechnologyId; + private System.Nullable _WanderIsComplete; private System.Nullable _SubcontractorAllPassData; @@ -272364,35 +272472,25 @@ namespace Model private System.Nullable _OwnerAllPassData; - private System.Nullable _WanderIsComplete; - private System.Nullable _WanderCompleteData; + private System.Nullable _WorkPackType; + private System.Nullable _IsSiteImplement; - private string _SiteImplementUser; - - private System.Nullable _SiteImplementConfirmData; - - private System.Nullable _RecordUploadData; - private System.Nullable _InspectIsClose; - private string _InspectIsCloseUser; - private System.Nullable _InspectCloseData; - private System.Nullable _IsUnifyWanderAbout; + private string _InspectIsCloseUser; - private System.Nullable _UnifyWanderAboutData; + private string _PropertyTechnologyId; - private string _UnifyWanderAboutOpinion; + private System.Nullable _RecordUploadData; - private System.Nullable _InspectTime; + private System.Nullable _SiteImplementConfirmData; - private string _AddUser; - - private System.Nullable _AddTime; + private string _SiteImplementUser; #region 可扩展性方法定义 partial void OnLoaded(); @@ -272414,6 +272512,12 @@ namespace Model partial void OnWorkPackIdChanged(); partial void OnInspectResultChanging(string value); partial void OnInspectResultChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnAddUserChanging(string value); + partial void OnAddUserChanged(); + partial void OnAddTimeChanging(System.Nullable value); + partial void OnAddTimeChanged(); partial void OnSubcontractorChanging(string value); partial void OnSubcontractorChanged(); partial void OnContractorChanging(string value); @@ -272422,6 +272526,12 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); + partial void OnIsUnifyWanderAboutChanging(System.Nullable value); + partial void OnIsUnifyWanderAboutChanged(); + partial void OnUnifyWanderAboutDataChanging(System.Nullable value); + partial void OnUnifyWanderAboutDataChanged(); + partial void OnUnifyWanderAboutOpinionChanging(string value); + partial void OnUnifyWanderAboutOpinionChanged(); partial void OnInspectionIsAllPassChanging(System.Nullable value); partial void OnInspectionIsAllPassChanged(); partial void OnSubcontractorIsAllPassChanging(System.Nullable value); @@ -272432,10 +272542,8 @@ namespace Model partial void OnSupervisionIsAllPassChanged(); partial void OnOwnerIsAllPassChanging(System.Nullable value); partial void OnOwnerIsAllPassChanged(); - partial void OnWorkPackTypeChanging(System.Nullable value); - partial void OnWorkPackTypeChanged(); - partial void OnPropertyTechnologyIdChanging(string value); - partial void OnPropertyTechnologyIdChanged(); + partial void OnWanderIsCompleteChanging(System.Nullable value); + partial void OnWanderIsCompleteChanged(); partial void OnSubcontractorAllPassDataChanging(System.Nullable value); partial void OnSubcontractorAllPassDataChanged(); partial void OnContractorAllPassDataChanging(System.Nullable value); @@ -272444,36 +272552,26 @@ namespace Model partial void OnSupervisionAllPassDataChanged(); partial void OnOwnerAllPassDataChanging(System.Nullable value); partial void OnOwnerAllPassDataChanged(); - partial void OnWanderIsCompleteChanging(System.Nullable value); - partial void OnWanderIsCompleteChanged(); partial void OnWanderCompleteDataChanging(System.Nullable value); partial void OnWanderCompleteDataChanged(); + partial void OnWorkPackTypeChanging(System.Nullable value); + partial void OnWorkPackTypeChanged(); partial void OnIsSiteImplementChanging(System.Nullable value); partial void OnIsSiteImplementChanged(); - partial void OnSiteImplementUserChanging(string value); - partial void OnSiteImplementUserChanged(); - partial void OnSiteImplementConfirmDataChanging(System.Nullable value); - partial void OnSiteImplementConfirmDataChanged(); - partial void OnRecordUploadDataChanging(System.Nullable value); - partial void OnRecordUploadDataChanged(); partial void OnInspectIsCloseChanging(System.Nullable value); partial void OnInspectIsCloseChanged(); - partial void OnInspectIsCloseUserChanging(string value); - partial void OnInspectIsCloseUserChanged(); partial void OnInspectCloseDataChanging(System.Nullable value); partial void OnInspectCloseDataChanged(); - partial void OnIsUnifyWanderAboutChanging(System.Nullable value); - partial void OnIsUnifyWanderAboutChanged(); - partial void OnUnifyWanderAboutDataChanging(System.Nullable value); - partial void OnUnifyWanderAboutDataChanged(); - partial void OnUnifyWanderAboutOpinionChanging(string value); - partial void OnUnifyWanderAboutOpinionChanged(); - partial void OnInspectTimeChanging(System.Nullable value); - partial void OnInspectTimeChanged(); - partial void OnAddUserChanging(string value); - partial void OnAddUserChanged(); - partial void OnAddTimeChanging(System.Nullable value); - partial void OnAddTimeChanged(); + partial void OnInspectIsCloseUserChanging(string value); + partial void OnInspectIsCloseUserChanged(); + partial void OnPropertyTechnologyIdChanging(string value); + partial void OnPropertyTechnologyIdChanged(); + partial void OnRecordUploadDataChanging(System.Nullable value); + partial void OnRecordUploadDataChanged(); + partial void OnSiteImplementConfirmDataChanging(System.Nullable value); + partial void OnSiteImplementConfirmDataChanged(); + partial void OnSiteImplementUserChanging(string value); + partial void OnSiteImplementUserChanged(); #endregion public PreRun_SubInspectTerm() @@ -272641,6 +272739,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] + public string AddUser + { + get + { + return this._AddUser; + } + set + { + if ((this._AddUser != value)) + { + this.OnAddUserChanging(value); + this.SendPropertyChanging(); + this._AddUser = value; + this.SendPropertyChanged("AddUser"); + this.OnAddUserChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] + public System.Nullable AddTime + { + get + { + return this._AddTime; + } + set + { + if ((this._AddTime != value)) + { + this.OnAddTimeChanging(value); + this.SendPropertyChanging(); + this._AddTime = value; + this.SendPropertyChanged("AddTime"); + this.OnAddTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")] public string Subcontractor { @@ -272721,6 +272879,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] + public System.Nullable IsUnifyWanderAbout + { + get + { + return this._IsUnifyWanderAbout; + } + set + { + if ((this._IsUnifyWanderAbout != value)) + { + this.OnIsUnifyWanderAboutChanging(value); + this.SendPropertyChanging(); + this._IsUnifyWanderAbout = value; + this.SendPropertyChanged("IsUnifyWanderAbout"); + this.OnIsUnifyWanderAboutChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] + public System.Nullable UnifyWanderAboutData + { + get + { + return this._UnifyWanderAboutData; + } + set + { + if ((this._UnifyWanderAboutData != value)) + { + this.OnUnifyWanderAboutDataChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutData = value; + this.SendPropertyChanged("UnifyWanderAboutData"); + this.OnUnifyWanderAboutDataChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string UnifyWanderAboutOpinion + { + get + { + return this._UnifyWanderAboutOpinion; + } + set + { + if ((this._UnifyWanderAboutOpinion != value)) + { + this.OnUnifyWanderAboutOpinionChanging(value); + this.SendPropertyChanging(); + this._UnifyWanderAboutOpinion = value; + this.SendPropertyChanged("UnifyWanderAboutOpinion"); + this.OnUnifyWanderAboutOpinionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")] public System.Nullable InspectionIsAllPass { @@ -272821,42 +273039,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] - public System.Nullable WorkPackType + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] + public System.Nullable WanderIsComplete { get { - return this._WorkPackType; + return this._WanderIsComplete; } set { - if ((this._WorkPackType != value)) + if ((this._WanderIsComplete != value)) { - this.OnWorkPackTypeChanging(value); + this.OnWanderIsCompleteChanging(value); this.SendPropertyChanging(); - this._WorkPackType = value; - this.SendPropertyChanged("WorkPackType"); - this.OnWorkPackTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string PropertyTechnologyId - { - get - { - return this._PropertyTechnologyId; - } - set - { - if ((this._PropertyTechnologyId != value)) - { - this.OnPropertyTechnologyIdChanging(value); - this.SendPropertyChanging(); - this._PropertyTechnologyId = value; - this.SendPropertyChanged("PropertyTechnologyId"); - this.OnPropertyTechnologyIdChanged(); + this._WanderIsComplete = value; + this.SendPropertyChanged("WanderIsComplete"); + this.OnWanderIsCompleteChanged(); } } } @@ -272941,26 +273139,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderIsComplete", DbType="Int")] - public System.Nullable WanderIsComplete - { - get - { - return this._WanderIsComplete; - } - set - { - if ((this._WanderIsComplete != value)) - { - this.OnWanderIsCompleteChanging(value); - this.SendPropertyChanging(); - this._WanderIsComplete = value; - this.SendPropertyChanged("WanderIsComplete"); - this.OnWanderIsCompleteChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WanderCompleteData", DbType="DateTime")] public System.Nullable WanderCompleteData { @@ -272981,6 +273159,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] + public System.Nullable WorkPackType + { + get + { + return this._WorkPackType; + } + set + { + if ((this._WorkPackType != value)) + { + this.OnWorkPackTypeChanging(value); + this.SendPropertyChanging(); + this._WorkPackType = value; + this.SendPropertyChanged("WorkPackType"); + this.OnWorkPackTypeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSiteImplement", DbType="Int")] public System.Nullable IsSiteImplement { @@ -273001,66 +273199,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="VarChar(50)")] - public string SiteImplementUser - { - get - { - return this._SiteImplementUser; - } - set - { - if ((this._SiteImplementUser != value)) - { - this.OnSiteImplementUserChanging(value); - this.SendPropertyChanging(); - this._SiteImplementUser = value; - this.SendPropertyChanged("SiteImplementUser"); - this.OnSiteImplementUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] - public System.Nullable SiteImplementConfirmData - { - get - { - return this._SiteImplementConfirmData; - } - set - { - if ((this._SiteImplementConfirmData != value)) - { - this.OnSiteImplementConfirmDataChanging(value); - this.SendPropertyChanging(); - this._SiteImplementConfirmData = value; - this.SendPropertyChanged("SiteImplementConfirmData"); - this.OnSiteImplementConfirmDataChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] - public System.Nullable RecordUploadData - { - get - { - return this._RecordUploadData; - } - set - { - if ((this._RecordUploadData != value)) - { - this.OnRecordUploadDataChanging(value); - this.SendPropertyChanging(); - this._RecordUploadData = value; - this.SendPropertyChanged("RecordUploadData"); - this.OnRecordUploadDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsClose", DbType="Int")] public System.Nullable InspectIsClose { @@ -273081,26 +273219,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="VarChar(50)")] - public string InspectIsCloseUser - { - get - { - return this._InspectIsCloseUser; - } - set - { - if ((this._InspectIsCloseUser != value)) - { - this.OnInspectIsCloseUserChanging(value); - this.SendPropertyChanging(); - this._InspectIsCloseUser = value; - this.SendPropertyChanged("InspectIsCloseUser"); - this.OnInspectIsCloseUserChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectCloseData", DbType="DateTime")] public System.Nullable InspectCloseData { @@ -273121,122 +273239,102 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")] - public System.Nullable IsUnifyWanderAbout + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectIsCloseUser", DbType="NVarChar(50)")] + public string InspectIsCloseUser { get { - return this._IsUnifyWanderAbout; + return this._InspectIsCloseUser; } set { - if ((this._IsUnifyWanderAbout != value)) + if ((this._InspectIsCloseUser != value)) { - this.OnIsUnifyWanderAboutChanging(value); + this.OnInspectIsCloseUserChanging(value); this.SendPropertyChanging(); - this._IsUnifyWanderAbout = value; - this.SendPropertyChanged("IsUnifyWanderAbout"); - this.OnIsUnifyWanderAboutChanged(); + this._InspectIsCloseUser = value; + this.SendPropertyChanged("InspectIsCloseUser"); + this.OnInspectIsCloseUserChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")] - public System.Nullable UnifyWanderAboutData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(500)")] + public string PropertyTechnologyId { get { - return this._UnifyWanderAboutData; + return this._PropertyTechnologyId; } set { - if ((this._UnifyWanderAboutData != value)) + if ((this._PropertyTechnologyId != value)) { - this.OnUnifyWanderAboutDataChanging(value); + this.OnPropertyTechnologyIdChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutData = value; - this.SendPropertyChanged("UnifyWanderAboutData"); - this.OnUnifyWanderAboutDataChanged(); + this._PropertyTechnologyId = value; + this.SendPropertyChanged("PropertyTechnologyId"); + this.OnPropertyTechnologyIdChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string UnifyWanderAboutOpinion + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RecordUploadData", DbType="DateTime")] + public System.Nullable RecordUploadData { get { - return this._UnifyWanderAboutOpinion; + return this._RecordUploadData; } set { - if ((this._UnifyWanderAboutOpinion != value)) + if ((this._RecordUploadData != value)) { - this.OnUnifyWanderAboutOpinionChanging(value); + this.OnRecordUploadDataChanging(value); this.SendPropertyChanging(); - this._UnifyWanderAboutOpinion = value; - this.SendPropertyChanged("UnifyWanderAboutOpinion"); - this.OnUnifyWanderAboutOpinionChanged(); + this._RecordUploadData = value; + this.SendPropertyChanged("RecordUploadData"); + this.OnRecordUploadDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] - public System.Nullable InspectTime + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementConfirmData", DbType="DateTime")] + public System.Nullable SiteImplementConfirmData { get { - return this._InspectTime; + return this._SiteImplementConfirmData; } set { - if ((this._InspectTime != value)) + if ((this._SiteImplementConfirmData != value)) { - this.OnInspectTimeChanging(value); + this.OnSiteImplementConfirmDataChanging(value); this.SendPropertyChanging(); - this._InspectTime = value; - this.SendPropertyChanged("InspectTime"); - this.OnInspectTimeChanged(); + this._SiteImplementConfirmData = value; + this.SendPropertyChanged("SiteImplementConfirmData"); + this.OnSiteImplementConfirmDataChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")] - public string AddUser + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SiteImplementUser", DbType="NVarChar(50)")] + public string SiteImplementUser { get { - return this._AddUser; + return this._SiteImplementUser; } set { - if ((this._AddUser != value)) + if ((this._SiteImplementUser != value)) { - this.OnAddUserChanging(value); + this.OnSiteImplementUserChanging(value); this.SendPropertyChanging(); - this._AddUser = value; - this.SendPropertyChanged("AddUser"); - this.OnAddUserChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")] - public System.Nullable AddTime - { - get - { - return this._AddTime; - } - set - { - if ((this._AddTime != value)) - { - this.OnAddTimeChanging(value); - this.SendPropertyChanging(); - this._AddTime = value; - this.SendPropertyChanged("AddTime"); - this.OnAddTimeChanged(); + this._SiteImplementUser = value; + this.SendPropertyChanged("SiteImplementUser"); + this.OnSiteImplementUserChanged(); } } } @@ -273304,22 +273402,6 @@ namespace Model private string _Owner; - private System.Nullable _SubcontractorIsPass; - - private System.Nullable _ContractorIsPass; - - private System.Nullable _SupervisionIsPass; - - private System.Nullable _OwnerIsPass; - - private string _SubcontractorRemark; - - private string _ContractorRemark; - - private string _SupervisionRemark; - - private string _OwnerRemark; - private System.Nullable _WorkPackType; private string _PropertyTechnologyId; @@ -273332,6 +273414,22 @@ namespace Model private System.Nullable _Sort; + private string _SubcontractorRemark; + + private string _ContractorRemark; + + private string _SupervisionRemark; + + private string _OwnerRemark; + + private System.Nullable _SubcontractorIsPass; + + private System.Nullable _ContractorIsPass; + + private System.Nullable _SupervisionIsPass; + + private System.Nullable _OwnerIsPass; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -273372,22 +273470,6 @@ namespace Model partial void OnSupervisionChanged(); partial void OnOwnerChanging(string value); partial void OnOwnerChanged(); - partial void OnSubcontractorIsPassChanging(System.Nullable value); - partial void OnSubcontractorIsPassChanged(); - partial void OnContractorIsPassChanging(System.Nullable value); - partial void OnContractorIsPassChanged(); - partial void OnSupervisionIsPassChanging(System.Nullable value); - partial void OnSupervisionIsPassChanged(); - partial void OnOwnerIsPassChanging(System.Nullable value); - partial void OnOwnerIsPassChanged(); - partial void OnSubcontractorRemarkChanging(string value); - partial void OnSubcontractorRemarkChanged(); - partial void OnContractorRemarkChanging(string value); - partial void OnContractorRemarkChanged(); - partial void OnSupervisionRemarkChanging(string value); - partial void OnSupervisionRemarkChanged(); - partial void OnOwnerRemarkChanging(string value); - partial void OnOwnerRemarkChanged(); partial void OnWorkPackTypeChanging(System.Nullable value); partial void OnWorkPackTypeChanged(); partial void OnPropertyTechnologyIdChanging(string value); @@ -273400,6 +273482,22 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnSubcontractorRemarkChanging(string value); + partial void OnSubcontractorRemarkChanged(); + partial void OnContractorRemarkChanging(string value); + partial void OnContractorRemarkChanged(); + partial void OnSupervisionRemarkChanging(string value); + partial void OnSupervisionRemarkChanged(); + partial void OnOwnerRemarkChanging(string value); + partial void OnOwnerRemarkChanged(); + partial void OnSubcontractorIsPassChanging(System.Nullable value); + partial void OnSubcontractorIsPassChanged(); + partial void OnContractorIsPassChanging(System.Nullable value); + partial void OnContractorIsPassChanged(); + partial void OnSupervisionIsPassChanging(System.Nullable value); + partial void OnSupervisionIsPassChanged(); + partial void OnOwnerIsPassChanging(System.Nullable value); + partial void OnOwnerIsPassChanged(); #endregion public PreRun_SubInspectTermItem() @@ -273767,166 +273865,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] - public System.Nullable SubcontractorIsPass - { - get - { - return this._SubcontractorIsPass; - } - set - { - if ((this._SubcontractorIsPass != value)) - { - this.OnSubcontractorIsPassChanging(value); - this.SendPropertyChanging(); - this._SubcontractorIsPass = value; - this.SendPropertyChanged("SubcontractorIsPass"); - this.OnSubcontractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] - public System.Nullable ContractorIsPass - { - get - { - return this._ContractorIsPass; - } - set - { - if ((this._ContractorIsPass != value)) - { - this.OnContractorIsPassChanging(value); - this.SendPropertyChanging(); - this._ContractorIsPass = value; - this.SendPropertyChanged("ContractorIsPass"); - this.OnContractorIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] - public System.Nullable SupervisionIsPass - { - get - { - return this._SupervisionIsPass; - } - set - { - if ((this._SupervisionIsPass != value)) - { - this.OnSupervisionIsPassChanging(value); - this.SendPropertyChanging(); - this._SupervisionIsPass = value; - this.SendPropertyChanged("SupervisionIsPass"); - this.OnSupervisionIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] - public System.Nullable OwnerIsPass - { - get - { - return this._OwnerIsPass; - } - set - { - if ((this._OwnerIsPass != value)) - { - this.OnOwnerIsPassChanging(value); - this.SendPropertyChanging(); - this._OwnerIsPass = value; - this.SendPropertyChanged("OwnerIsPass"); - this.OnOwnerIsPassChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] - public string SubcontractorRemark - { - get - { - return this._SubcontractorRemark; - } - set - { - if ((this._SubcontractorRemark != value)) - { - this.OnSubcontractorRemarkChanging(value); - this.SendPropertyChanging(); - this._SubcontractorRemark = value; - this.SendPropertyChanged("SubcontractorRemark"); - this.OnSubcontractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] - public string ContractorRemark - { - get - { - return this._ContractorRemark; - } - set - { - if ((this._ContractorRemark != value)) - { - this.OnContractorRemarkChanging(value); - this.SendPropertyChanging(); - this._ContractorRemark = value; - this.SendPropertyChanged("ContractorRemark"); - this.OnContractorRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] - public string SupervisionRemark - { - get - { - return this._SupervisionRemark; - } - set - { - if ((this._SupervisionRemark != value)) - { - this.OnSupervisionRemarkChanging(value); - this.SendPropertyChanging(); - this._SupervisionRemark = value; - this.SendPropertyChanged("SupervisionRemark"); - this.OnSupervisionRemarkChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] - public string OwnerRemark - { - get - { - return this._OwnerRemark; - } - set - { - if ((this._OwnerRemark != value)) - { - this.OnOwnerRemarkChanging(value); - this.SendPropertyChanging(); - this._OwnerRemark = value; - this.SendPropertyChanged("OwnerRemark"); - this.OnOwnerRemarkChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")] public System.Nullable WorkPackType { @@ -273947,7 +273885,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")] public string PropertyTechnologyId { get @@ -274047,6 +273985,166 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")] + public string SubcontractorRemark + { + get + { + return this._SubcontractorRemark; + } + set + { + if ((this._SubcontractorRemark != value)) + { + this.OnSubcontractorRemarkChanging(value); + this.SendPropertyChanging(); + this._SubcontractorRemark = value; + this.SendPropertyChanged("SubcontractorRemark"); + this.OnSubcontractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")] + public string ContractorRemark + { + get + { + return this._ContractorRemark; + } + set + { + if ((this._ContractorRemark != value)) + { + this.OnContractorRemarkChanging(value); + this.SendPropertyChanging(); + this._ContractorRemark = value; + this.SendPropertyChanged("ContractorRemark"); + this.OnContractorRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")] + public string SupervisionRemark + { + get + { + return this._SupervisionRemark; + } + set + { + if ((this._SupervisionRemark != value)) + { + this.OnSupervisionRemarkChanging(value); + this.SendPropertyChanging(); + this._SupervisionRemark = value; + this.SendPropertyChanged("SupervisionRemark"); + this.OnSupervisionRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")] + public string OwnerRemark + { + get + { + return this._OwnerRemark; + } + set + { + if ((this._OwnerRemark != value)) + { + this.OnOwnerRemarkChanging(value); + this.SendPropertyChanging(); + this._OwnerRemark = value; + this.SendPropertyChanged("OwnerRemark"); + this.OnOwnerRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")] + public System.Nullable SubcontractorIsPass + { + get + { + return this._SubcontractorIsPass; + } + set + { + if ((this._SubcontractorIsPass != value)) + { + this.OnSubcontractorIsPassChanging(value); + this.SendPropertyChanging(); + this._SubcontractorIsPass = value; + this.SendPropertyChanged("SubcontractorIsPass"); + this.OnSubcontractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")] + public System.Nullable ContractorIsPass + { + get + { + return this._ContractorIsPass; + } + set + { + if ((this._ContractorIsPass != value)) + { + this.OnContractorIsPassChanging(value); + this.SendPropertyChanging(); + this._ContractorIsPass = value; + this.SendPropertyChanged("ContractorIsPass"); + this.OnContractorIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")] + public System.Nullable SupervisionIsPass + { + get + { + return this._SupervisionIsPass; + } + set + { + if ((this._SupervisionIsPass != value)) + { + this.OnSupervisionIsPassChanging(value); + this.SendPropertyChanging(); + this._SupervisionIsPass = value; + this.SendPropertyChanged("SupervisionIsPass"); + this.OnSupervisionIsPassChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")] + public System.Nullable OwnerIsPass + { + get + { + return this._OwnerIsPass; + } + set + { + if ((this._OwnerIsPass != value)) + { + this.OnOwnerIsPassChanging(value); + this.SendPropertyChanging(); + this._OwnerIsPass = value; + this.SendPropertyChanged("OwnerIsPass"); + this.OnOwnerIsPassChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -275048,8 +275146,6 @@ namespace Model private string _RestrictCondition; - private System.Nullable _ResponsibilityProposeSatate; - private System.Nullable _ResponsibilityConfirm; private System.Nullable _ProposeConfirm; @@ -275060,11 +275156,9 @@ namespace Model private System.Nullable _OwnerConfirm; - private System.Nullable _ProposeConfirmData; - private System.Nullable _ResponsibilityConfirmData; - private System.Nullable _ProposeHandleData; + private System.Nullable _ProposeConfirmData; private System.Nullable _GeneraConfirmData; @@ -275080,6 +275174,10 @@ namespace Model private System.Nullable _Sort; + private System.Nullable _ResponsibilityProposeSatate; + + private System.Nullable _ProposeHandleData; + private string _FourDecisionCode; #region 可扩展性方法定义 @@ -275116,8 +275214,6 @@ namespace Model partial void OnRealityDestructionTimeChanged(); partial void OnRestrictConditionChanging(string value); partial void OnRestrictConditionChanged(); - partial void OnResponsibilityProposeSatateChanging(System.Nullable value); - partial void OnResponsibilityProposeSatateChanged(); partial void OnResponsibilityConfirmChanging(System.Nullable value); partial void OnResponsibilityConfirmChanged(); partial void OnProposeConfirmChanging(System.Nullable value); @@ -275128,12 +275224,10 @@ namespace Model partial void OnSupervisionConfirmChanged(); partial void OnOwnerConfirmChanging(System.Nullable value); partial void OnOwnerConfirmChanged(); - partial void OnProposeConfirmDataChanging(System.Nullable value); - partial void OnProposeConfirmDataChanged(); partial void OnResponsibilityConfirmDataChanging(System.Nullable value); partial void OnResponsibilityConfirmDataChanged(); - partial void OnProposeHandleDataChanging(System.Nullable value); - partial void OnProposeHandleDataChanged(); + partial void OnProposeConfirmDataChanging(System.Nullable value); + partial void OnProposeConfirmDataChanged(); partial void OnGeneraConfirmDataChanging(System.Nullable value); partial void OnGeneraConfirmDataChanged(); partial void OnSupervisionConfirmDataChanging(System.Nullable value); @@ -275148,6 +275242,10 @@ namespace Model partial void OnAddTimeChanged(); partial void OnSortChanging(System.Nullable value); partial void OnSortChanged(); + partial void OnResponsibilityProposeSatateChanging(System.Nullable value); + partial void OnResponsibilityProposeSatateChanged(); + partial void OnProposeHandleDataChanging(System.Nullable value); + partial void OnProposeHandleDataChanged(); partial void OnFourDecisionCodeChanging(string value); partial void OnFourDecisionCodeChanged(); #endregion @@ -275457,26 +275555,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] - public System.Nullable ResponsibilityProposeSatate - { - get - { - return this._ResponsibilityProposeSatate; - } - set - { - if ((this._ResponsibilityProposeSatate != value)) - { - this.OnResponsibilityProposeSatateChanging(value); - this.SendPropertyChanging(); - this._ResponsibilityProposeSatate = value; - this.SendPropertyChanged("ResponsibilityProposeSatate"); - this.OnResponsibilityProposeSatateChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")] public System.Nullable ResponsibilityConfirm { @@ -275577,26 +275655,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] - public System.Nullable ProposeConfirmData - { - get - { - return this._ProposeConfirmData; - } - set - { - if ((this._ProposeConfirmData != value)) - { - this.OnProposeConfirmDataChanging(value); - this.SendPropertyChanging(); - this._ProposeConfirmData = value; - this.SendPropertyChanged("ProposeConfirmData"); - this.OnProposeConfirmDataChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")] public System.Nullable ResponsibilityConfirmData { @@ -275617,22 +275675,22 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] - public System.Nullable ProposeHandleData + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")] + public System.Nullable ProposeConfirmData { get { - return this._ProposeHandleData; + return this._ProposeConfirmData; } set { - if ((this._ProposeHandleData != value)) + if ((this._ProposeConfirmData != value)) { - this.OnProposeHandleDataChanging(value); + this.OnProposeConfirmDataChanging(value); this.SendPropertyChanging(); - this._ProposeHandleData = value; - this.SendPropertyChanged("ProposeHandleData"); - this.OnProposeHandleDataChanged(); + this._ProposeConfirmData = value; + this.SendPropertyChanged("ProposeConfirmData"); + this.OnProposeConfirmDataChanged(); } } } @@ -275777,6 +275835,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")] + public System.Nullable ResponsibilityProposeSatate + { + get + { + return this._ResponsibilityProposeSatate; + } + set + { + if ((this._ResponsibilityProposeSatate != value)) + { + this.OnResponsibilityProposeSatateChanging(value); + this.SendPropertyChanging(); + this._ResponsibilityProposeSatate = value; + this.SendPropertyChanged("ResponsibilityProposeSatate"); + this.OnResponsibilityProposeSatateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")] + public System.Nullable ProposeHandleData + { + get + { + return this._ProposeHandleData; + } + set + { + if ((this._ProposeHandleData != value)) + { + this.OnProposeHandleDataChanging(value); + this.SendPropertyChanging(); + this._ProposeHandleData = value; + this.SendPropertyChanged("ProposeHandleData"); + this.OnProposeHandleDataChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")] public string FourDecisionCode { @@ -276489,7 +276587,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string Remark { get @@ -311350,6 +311448,164 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_CQMS_ProblemHandle")] + public partial class Report_CQMS_ProblemHandle : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _ReportId; + + private string _ReType; + + private string _UnitName; + + private string _ProblemDes; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnReportIdChanging(string value); + partial void OnReportIdChanged(); + partial void OnReTypeChanging(string value); + partial void OnReTypeChanged(); + partial void OnUnitNameChanging(string value); + partial void OnUnitNameChanged(); + partial void OnProblemDesChanging(string value); + partial void OnProblemDesChanged(); + #endregion + + public Report_CQMS_ProblemHandle() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")] + public string ReportId + { + get + { + return this._ReportId; + } + set + { + if ((this._ReportId != value)) + { + this.OnReportIdChanging(value); + this.SendPropertyChanging(); + this._ReportId = value; + this.SendPropertyChanged("ReportId"); + this.OnReportIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NChar(20)")] + public string ReType + { + get + { + return this._ReType; + } + set + { + if ((this._ReType != value)) + { + this.OnReTypeChanging(value); + this.SendPropertyChanging(); + this._ReType = value; + this.SendPropertyChanged("ReType"); + this.OnReTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(100)")] + public string UnitName + { + get + { + return this._UnitName; + } + set + { + if ((this._UnitName != value)) + { + this.OnUnitNameChanging(value); + this.SendPropertyChanging(); + this._UnitName = value; + this.SendPropertyChanged("UnitName"); + this.OnUnitNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemDes", DbType="NVarChar(100)")] + public string ProblemDes + { + get + { + return this._ProblemDes; + } + set + { + if ((this._ProblemDes != value)) + { + this.OnProblemDesChanging(value); + this.SendPropertyChanging(); + this._ProblemDes = value; + this.SendPropertyChanged("ProblemDes"); + this.OnProblemDesChanged(); + } + } + } + + 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.Report_CqmsTarget")] public partial class Report_CqmsTarget : INotifyPropertyChanging, INotifyPropertyChanged { @@ -345207,8 +345463,6 @@ namespace Model private EntitySet _Doc_DocManage; - private EntitySet _Doc_DocManageApprove; - private EntitySet _Driver_DriverProgress; private EntitySet _Driver_DriverReport; @@ -345920,7 +346174,6 @@ namespace Model this._DataBase_File = new EntitySet(new Action(this.attach_DataBase_File), new Action(this.detach_DataBase_File)); this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport)); this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage)); - this._Doc_DocManageApprove = new EntitySet(new Action(this.attach_Doc_DocManageApprove), new Action(this.detach_Doc_DocManageApprove)); this._Driver_DriverProgress = new EntitySet(new Action(this.attach_Driver_DriverProgress), new Action(this.detach_Driver_DriverProgress)); this._Driver_DriverReport = new EntitySet(new Action(this.attach_Driver_DriverReport), new Action(this.detach_Driver_DriverReport)); this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); @@ -348298,19 +348551,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Doc_DocManageApprove", ThisKey="UserId", OtherKey="ApproveMan", DeleteRule="NO ACTION")] - public EntitySet Doc_DocManageApprove - { - get - { - return this._Doc_DocManageApprove; - } - set - { - this._Doc_DocManageApprove.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_DriverProgress_Sys_User", Storage="_Driver_DriverProgress", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")] public EntitySet Driver_DriverProgress { @@ -352778,18 +353018,6 @@ namespace Model entity.Sys_User = null; } - private void attach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = this; - } - - private void detach_Doc_DocManageApprove(Doc_DocManageApprove entity) - { - this.SendPropertyChanging(); - entity.Sys_User = null; - } - private void attach_Driver_DriverProgress(Driver_DriverProgress entity) { this.SendPropertyChanging(); @@ -438382,8 +438610,6 @@ namespace Model private EntitySet _Driver_FeedingTestRun; - private EntitySet _Driver_Meeting; - private EntitySet _Driver_TestRun; private EntitySet _DriverHse_RoadMap; @@ -438496,7 +438722,6 @@ namespace Model this._Driver_DriverScheme = new EntitySet(new Action(this.attach_Driver_DriverScheme), new Action(this.detach_Driver_DriverScheme)); this._Driver_DriverSummary = new EntitySet(new Action(this.attach_Driver_DriverSummary), new Action(this.detach_Driver_DriverSummary)); this._Driver_FeedingTestRun = new EntitySet(new Action(this.attach_Driver_FeedingTestRun), new Action(this.detach_Driver_FeedingTestRun)); - this._Driver_Meeting = new EntitySet(new Action(this.attach_Driver_Meeting), new Action(this.detach_Driver_Meeting)); this._Driver_TestRun = new EntitySet(new Action(this.attach_Driver_TestRun), new Action(this.detach_Driver_TestRun)); this._DriverHse_RoadMap = new EntitySet(new Action(this.attach_DriverHse_RoadMap), new Action(this.detach_DriverHse_RoadMap)); this._HJGL_Batch_BatchTrust = new EntitySet(new Action(this.attach_HJGL_Batch_BatchTrust), new Action(this.detach_HJGL_Batch_BatchTrust)); @@ -438986,19 +439211,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_Meeting_WBS_UnitWork", Storage="_Driver_Meeting", ThisKey="UnitWorkId", OtherKey="UnitWorkId", DeleteRule="NO ACTION")] - public EntitySet Driver_Meeting - { - get - { - return this._Driver_Meeting; - } - set - { - this._Driver_Meeting.Assign(value); - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Driver_TestRun_WBS_UnitWork", Storage="_Driver_TestRun", ThisKey="UnitWorkId", OtherKey="UnitWorkId", DeleteRule="NO ACTION")] public EntitySet Driver_TestRun { @@ -439666,18 +439878,6 @@ namespace Model entity.WBS_UnitWork = null; } - private void attach_Driver_Meeting(Driver_Meeting entity) - { - this.SendPropertyChanging(); - entity.WBS_UnitWork = this; - } - - private void detach_Driver_Meeting(Driver_Meeting entity) - { - this.SendPropertyChanging(); - entity.WBS_UnitWork = null; - } - private void attach_Driver_TestRun(Driver_TestRun entity) { this.SendPropertyChanging(); diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true