Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

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

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
+

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();
             }
         }

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();
             }
         }

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)
             {

SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs

@@ -18,6 +18,16 @@ namespace BLL
             return Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId);
         }
 
+        /// <summary>
+        /// 获取最新一条月报信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        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();
+        }
+
         /// <summary>
         /// 根据月份获取开车月报告
         /// </summary>

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();
             }

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx

@@ -32,6 +32,27 @@
                         <f:TextArea ID="txtContents" runat="server" Label="主要内容" MaxLength="500" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
                     </Items>
                 </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="ddlProblem" runat="server" Label="问题类别" Required="true"  LabelAlign="Right" LabelWidth="130px">     
+                            <f:ListItem Value="" Text="-请选择-" Selected="true" />
+                            <f:ListItem Value="过程监督不到位" Text="过程监督不到位" />
+                             <f:ListItem Value="质量缺陷" Text="质量缺陷" />
+                             <f:ListItem Value="质量管理问题" Text="质量管理问题" />
+                             <f:ListItem Value="不按设计要求施工" Text="不按设计要求施工" />
+                             <f:ListItem Value="不按程序施工" Text="不按程序施工" />
+                             <f:ListItem Value="成品保护不到位" Text="成品保护不到位" />
+                        </f:DropDownList>                      
+                    </Items>
+                </f:FormRow>
+                 <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtMeasure" runat="server" Label="改进措施" MaxLength="500" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+
+
                 <f:FormRow>
                     <Items>
                         <f:DropDownList ID="drpUnitWorkIds" runat="server" Label="单位工程名称" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelWidth="130px" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>

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);

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 {
+        
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-
+        
         /// <summary>
         /// drpSendUnit 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSendUnit;
-
+        
         /// <summary>
         /// drpCNProfessionalId 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessionalId;
-
+        
         /// <summary>
         /// txtNCRCode 控件。
         /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtNCRCode;
-
+        
         /// <summary>
         /// txtIssuedDate 控件。
         /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtIssuedDate;
-
+        
         /// <summary>
         /// txtContents 控件。
         /// </summary>
@@ -85,7 +83,25 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtContents;
-
+        
+        /// <summary>
+        /// ddlProblem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlProblem;
+        
+        /// <summary>
+        /// txtMeasure 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtMeasure;
+        
         /// <summary>
         /// drpUnitWorkIds 控件。
         /// </summary>
@@ -94,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWorkIds;
-
+        
         /// <summary>
         /// drpUnitIds 控件。
         /// </summary>
@@ -103,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitIds;
-
+        
         /// <summary>
         /// txtImplementationFrontState 控件。
         /// </summary>
@@ -112,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtImplementationFrontState;
-
+        
         /// <summary>
         /// txtResponsibleMan 控件。
         /// </summary>
@@ -121,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtResponsibleMan;
-
+        
         /// <summary>
         /// txtClosedDate 控件。
         /// </summary>
@@ -130,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtClosedDate;
-
+        
         /// <summary>
         /// txtCompleteDate 控件。
         /// </summary>
@@ -139,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCompleteDate;
-
+        
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -148,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-
+        
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -157,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-
+        
         /// <summary>
         /// btnAttach 控件。
         /// </summary>
@@ -166,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
-
+        
         /// <summary>
         /// drpAudit 控件。
         /// </summary>
@@ -175,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpAudit;
-
+        
         /// <summary>
         /// agree 控件。
         /// </summary>
@@ -184,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow agree;
-
+        
         /// <summary>
         /// rblIsAgree 控件。
         /// </summary>
@@ -193,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsAgree;
-
+        
         /// <summary>
         /// options 控件。
         /// </summary>
@@ -202,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow options;
-
+        
         /// <summary>
         /// txtidea 控件。
         /// </summary>
@@ -211,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtidea;
-
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -220,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
+        
         /// <summary>
         /// hdAttachUrl 控件。
         /// </summary>
@@ -229,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdAttachUrl;
-
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -238,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-
+        
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -247,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx

@@ -9,7 +9,7 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1"/>
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
         <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
             <Rows>
                 <f:FormRow>
@@ -20,7 +20,7 @@
                         </f:NumberBox>
                     </Items>
                 </f:FormRow>
-                <f:FormRow >
+                <f:FormRow>
                     <Items>
                         <f:NumberBox ID="txtActualNumber" Label="实际压力管道条数" runat="server" NoDecimal="true" LabelWidth="150px" NoNegative="true">
                         </f:NumberBox>
@@ -38,7 +38,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:NumberBox ID="txtIssuedReportNumber" Label="已初具监检报告条数" runat="server" NoDecimal="true" LabelWidth="150px" NoNegative="true">
+                        <f:NumberBox ID="txtIssuedReportNumber" Label="已完成监检报告条数" runat="server" NoDecimal="true" LabelWidth="150px" NoNegative="true">
                         </f:NumberBox>
                         <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
                             <Items>
@@ -52,11 +52,14 @@
                     </Items>
                 </f:FormRow>
 
-                
+
                 <f:FormRow MarginTop="10px">
                     <Items>
                         <f:DropDownList runat="server" Width="300px" Label="专业工程师确认" LabelWidth="130px" ID="drpAudit" ShowRedStar="true" Required="true" EmptyText="--请选择--">
                         </f:DropDownList>
+                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="填报日期" ID="txtReportTime"
+                            LabelAlign="Right" LabelWidth="130px">
+                        </f:DatePicker>
                     </Items>
                 </f:FormRow>
 
@@ -69,7 +72,7 @@
                         </f:RadioButtonList>
                     </Items>
                 </f:FormRow>
- 
+
 
                 <f:FormRow ID="options">
                     <Items>
@@ -85,10 +88,10 @@
                     <Items>
                         <f:HiddenField ID="hdAttachUrl" runat="server">
                         </f:HiddenField>
-                         <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
                         </f:Button>
 
-                         <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
+                        <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
                         </f:Button>
                     </Items>
                 </f:Toolbar>

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))

SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs

@@ -140,6 +140,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// </remarks>
         protected global::FineUIPro.DropDownList drpAudit;
 
+        /// <summary>
+        /// txtReportTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtReportTime;
+
         /// <summary>
         /// agree 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx

@@ -51,6 +51,9 @@
                     <Items>
                         <f:DropDownList runat="server" Width="300px" Label="专业工程师确认" LabelWidth="130px" ID="drpAudit" ShowRedStar="true" Required="true" EmptyText="--请选择--">
                         </f:DropDownList>
+                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="填报日期" ID="txtReportTime"
+                            LabelAlign="Right" LabelWidth="130px">
+                        </f:DatePicker>
                     </Items>
                 </f:FormRow>
 

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))

SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs

@@ -131,6 +131,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
         /// </remarks>
         protected global::FineUIPro.DropDownList drpAudit;
 
+        /// <summary>
+        /// txtReportTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtReportTime;
+
         /// <summary>
         /// agree 控件。
         /// </summary>

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<Model.ProcessControl_NondestructiveTest_New>();
                 //加载所有施工分包单位
                 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);

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx

@@ -832,18 +832,25 @@
                                         </Listeners>
                                     </f:Grid>
                                 </Items>
-                               
+
                             </f:FormRow>
                         </Rows>
                     </f:Form>
                 </Items>
-                 
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar4" Position="bottom" ToolbarAlign="left" runat="server">
+                        <Items>
+                            <f:Button ID="Button5" Icon="Add" runat="server" ToolTip="增加" Text="增加" OnClick="btnAddGrid11_Click">
+                            </f:Button>
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
                 <Items>
-                     <f:Form ID="Form19" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <f:Form ID="Form19" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" Hidden="true">
                         <Rows>
                             <f:FormRow>
                                 <Items>
-                                    <f:TextArea runat="server" ID="txtAre8" EmptyText="请填写备注" Text=""
+                                    <f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
                                         AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
                                     </f:TextArea>
                                 </Items>
@@ -852,13 +859,558 @@
                     </f:Form>
                 </Items>
             </f:Panel>
+            <%--9.计量器具报验管理情况--%>
+            <f:Panel ID="Pnl9" IsFluid="true" Title="9.计量器具报验管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form26" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvMeasuringInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="上报单位">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月报验台套">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计报验台套">
+                                            </f:RenderField>
+                                            <f:RenderField Width="300px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注" ExpandUnusedSpace="true">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox14" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--10.现场质量共检数据--%>
+            <f:Panel ID="Pnl10" IsFluid="true" Title="10.现场质量共检数据" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form27" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-1.土建--%>
+                                    <f:Grid ID="gvTj" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="土建："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
 
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
 
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
 
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
 
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-2.设备--%>
+                                    <f:Grid ID="GvSb" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="设备："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
 
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
 
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
 
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-3.管道--%>
+                                    <f:Grid ID="GvGD" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="管道："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-4.电气--%>
+                                    <f:Grid ID="GvDq" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="电气："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-5.仪表--%>
+                                    <f:Grid ID="GvYb" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="仪表："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-6.防腐--%>
+                                    <f:Grid ID="GvFf" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="防腐："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-7.消防--%>
+                                    <f:Grid ID="GvXf" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="消防："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10.合计--%>
+                                    <f:Grid ID="gvInspectionDataInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月一次共捡合格率">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目累计一次共捡合格率">
+                                            </f:RenderField>
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox15" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--11.压力管道监检情况--%>
+            <f:Panel ID="Pnl11" IsFluid="true" Title="11.压力管道监检情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form28" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvPressureInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成监检数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成监检数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="总数">
+                                            </f:RenderField>
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox16" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--12.管道试压包管理情况--%>
+            <f:Panel ID="Pnl12" IsFluid="true" Title="12.管道试压包管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form29" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvPipingInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="总数">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox17" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成试压包数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成试压包数量">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox18" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--13.特种设备监检情况--%>
+            <f:Panel ID="Pnl13" IsFluid="true" Title="13.特种设备监检情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form30" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvSpecialInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="总数">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox19" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成监检数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成监检数量">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox20" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--14.NCR管理情况--%>
+            <f:Panel ID="Pnl14" IsFluid="true" Title="14.NCR管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form31" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvNcrManagementInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="200px" ColumnID="WorkName" DataField="WorkName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="接收单位">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="CurrentPeriodOkNum" DataField="CurrentPeriodOkNum"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月已完成">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="OKNum" DataField="OKNum"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计已完成">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="CheckNum" DataField="CheckNum"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="NCR总数">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="OKRate" DataField="OKRate"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成比例">
+                                            </f:RenderField>
+                                            <%-- <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox10" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>--%>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Label runat="server" Text=" 备注：NCR包含业主下发的NCR、监理通知单、五环施工质量整改单等。"></f:Label>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
             <%--15.质量巡检情况--%>
             <f:Panel ID="Panel21" IsFluid="true" Title="15.质量巡检情况" runat="server" EnableCollapse="false"
                 ShowHeader="true">
@@ -900,23 +1452,15 @@
                                         </Columns>
                                     </f:Grid>
                                 </Items>
-
-                                 
+                            </f:FormRow>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Label runat="server" Text=" 备注：质量巡检指工程师现场质量巡检情况。"></f:Label>
+                                </Items>
                             </f:FormRow>
                         </Rows>
                     </f:Form>
                 </Items>
-                <Items>
-                                     <f:Form ID="Form26" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
-                                        <Rows>
-                                            <f:FormRow>
-                                                <Items>
-                                                   <f:Label runat="server" Text="备注：质量巡检指工程师现场质量巡检情况。"></f:Label>
-                                                </Items>
-                                            </f:FormRow>
-                                        </Rows>
-                                    </f:Form>
-                                </Items>
             </f:Panel>
 
             <%--16.质量专项检查情况--%>
@@ -1101,7 +1645,7 @@
                                                         FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
                                                         <Editor>
                                                             <f:DropDownList ID="drpUnitId" runat="server" EnableEdit="true"></f:DropDownList>
-                                                          </Editor>
+                                                        </Editor>
                                                     </f:RenderField>
                                                     <f:RenderField Width="250px" ColumnID="ProblemDesrioption" DataField="ProblemDesrioption"
                                                         FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述">
@@ -1196,20 +1740,6 @@
                     </f:Form>
                 </Items>
             </f:Panel>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             <%--20.项目质量体系审核--%>
             <f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
                 ShowHeader="true">
@@ -1227,7 +1757,6 @@
                     </f:Form>
                 </Items>
             </f:Panel>
-
             <%--21.类似项目管理经验教训应对措施及跟踪--%>
             <f:Panel ID="Panel1" IsFluid="true" Title="21.类似项目管理经验教训应对措施及跟踪" runat="server" EnableCollapse="false"
                 ShowHeader="true">
@@ -1263,7 +1792,6 @@
                     </f:Form>
                 </Items>
             </f:Panel>
-
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
@@ -1272,9 +1800,6 @@
                         </f:ToolbarFill>
                         <f:Button ID="Button1" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
                         </f:Button>
-
-
-
                         <f:HiddenField ID="hdId" runat="server">
                         </f:HiddenField>
                         <f:HiddenField ID="hdAttachUrl" runat="server">
@@ -1286,10 +1811,7 @@
         <asp:ValidationSummary ID="ValidationSummary1" Style="z-index: 101; position: absolute; top: 8px; right: 824px;"
             runat="server" ValidationGroup="Save" HeaderText="请注意！"
             ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary>
-
         <input runat="server" type="hidden" id="hidReportId" />
-
-
     </form>
 </body>
 </html>

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs

@@ -752,6 +752,24 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// </remarks>
         protected global::FineUIPro.TextBox TextBox6;
 
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+
+        /// <summary>
+        /// Button5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button5;
+
         /// <summary>
         /// Form19 控件。
         /// </summary>
@@ -770,6 +788,294 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// </remarks>
         protected global::FineUIPro.TextArea txtAre8;
 
+        /// <summary>
+        /// Pnl9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Pnl9;
+
+        /// <summary>
+        /// Form26 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form26;
+
+        /// <summary>
+        /// gvMeasuringInspection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvMeasuringInspection;
+
+        /// <summary>
+        /// TextBox14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox14;
+
+        /// <summary>
+        /// Pnl10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Pnl10;
+
+        /// <summary>
+        /// Form27 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form27;
+
+        /// <summary>
+        /// gvTj 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvTj;
+
+        /// <summary>
+        /// GvSb 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GvSb;
+
+        /// <summary>
+        /// GvGD 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GvGD;
+
+        /// <summary>
+        /// GvDq 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GvDq;
+
+        /// <summary>
+        /// GvYb 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GvYb;
+
+        /// <summary>
+        /// GvFf 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GvFf;
+
+        /// <summary>
+        /// GvXf 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid GvXf;
+
+        /// <summary>
+        /// gvInspectionDataInspection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvInspectionDataInspection;
+
+        /// <summary>
+        /// TextBox15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox15;
+
+        /// <summary>
+        /// Pnl11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Pnl11;
+
+        /// <summary>
+        /// Form28 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form28;
+
+        /// <summary>
+        /// gvPressureInspection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvPressureInspection;
+
+        /// <summary>
+        /// TextBox16 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox16;
+
+        /// <summary>
+        /// Pnl12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Pnl12;
+
+        /// <summary>
+        /// Form29 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form29;
+
+        /// <summary>
+        /// gvPipingInspection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvPipingInspection;
+
+        /// <summary>
+        /// TextBox17 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox17;
+
+        /// <summary>
+        /// TextBox18 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox18;
+
+        /// <summary>
+        /// Pnl13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Pnl13;
+
+        /// <summary>
+        /// Form30 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form30;
+
+        /// <summary>
+        /// gvSpecialInspection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvSpecialInspection;
+
+        /// <summary>
+        /// TextBox19 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox19;
+
+        /// <summary>
+        /// TextBox20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox20;
+
+        /// <summary>
+        /// Pnl14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Pnl14;
+
+        /// <summary>
+        /// Form31 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form31;
+
+        /// <summary>
+        /// gvNcrManagementInspection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvNcrManagementInspection;
+
         /// <summary>
         /// Panel21 控件。
         /// </summary>
@@ -815,15 +1121,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// </remarks>
         protected global::FineUIPro.TextBox TextBox11;
 
-        /// <summary>
-        /// Form26 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Form Form26;
-
         /// <summary>
         /// Panel22 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx

@@ -295,16 +295,557 @@
 
                 </Items>
             </f:Panel>
+            <%--9.计量器具报验管理情况--%>
+            <f:Panel ID="Pnl9" IsFluid="true" Title="9.计量器具报验管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form16" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvMeasuringInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="上报单位">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月报验台套">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计报验台套">
+                                            </f:RenderField>
+                                            <f:RenderField Width="300px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注" ExpandUnusedSpace="true">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox6" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--10.现场质量共检数据--%>
+            <f:Panel ID="Pnl10" IsFluid="true" Title="10.现场质量共检数据" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form17" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-1.土建--%>
+                                    <f:Grid ID="gvTj" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="土建："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
 
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
 
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
 
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
 
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-2.设备--%>
+                                    <f:Grid ID="GvSb" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="设备："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
 
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
 
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
 
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
 
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-3.管道--%>
+                                    <f:Grid ID="GvGD" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="管道："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
 
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
 
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-4.电气--%>
+                                    <f:Grid ID="GvDq" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="电气："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-5.仪表--%>
+                                    <f:Grid ID="GvYb" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="仪表："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-6.防腐--%>
+                                    <f:Grid ID="GvFf" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="防腐："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10-7.消防--%>
+                                    <f:Grid ID="GvXf" ShowBorder="true" ShowHeader="true" runat="server" DataIDField="Id" Title="消防："
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程" ExpandUnusedSpace="true">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="检查(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="合格(点)" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="一次合格率" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <%--10.合计--%>
+                                    <f:Grid ID="gvInspectionDataInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月一次共捡合格率">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目累计一次共捡合格率">
+                                            </f:RenderField>
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox14" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--11.压力管道监检情况--%>
+            <f:Panel ID="Pnl11" IsFluid="true" Title="11.压力管道监检情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form18" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvPressureInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成监检数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成监检数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="总数">
+                                                 </f:RenderField>
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox11" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--12.管道试压包管理情况--%>
+            <f:Panel ID="Pnl12" IsFluid="true" Title="12.管道试压包管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form19" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvPipingInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="总数">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox8" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成试压包数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成试压包数量">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox12" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--13.特种设备监检情况--%>
+            <f:Panel ID="Pnl13" IsFluid="true" Title="13.特种设备监检情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form20" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvSpecialInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="300px" ColumnID="ContentName" DataField="ContentName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="TotalNoBackCount" DataField="TotalNoBackCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="总数">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox9" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="MonthsCount" DataField="MonthsCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成监检数量">
+                                            </f:RenderField>
+                                            <f:RenderField Width="160px" ColumnID="ProjectCount" DataField="ProjectCount"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成监检数量">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox13" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+            <%--14.NCR管理情况--%>
+            <f:Panel ID="Pnl14" IsFluid="true" Title="14.NCR管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form21" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="gvNcrManagementInspection" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+                                            <f:RenderField Width="200px" ColumnID="WorkName" DataField="WorkName" ExpandUnusedSpace="true"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="接收单位">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="CurrentPeriodOkNum" DataField="CurrentPeriodOkNum"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月已完成">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="OKNum" DataField="OKNum"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计已完成">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="CheckNum" DataField="CheckNum"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="NCR总数">
+                                            </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="OKRate" DataField="OKRate"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成比例">
+                                            </f:RenderField>
+                                           <%-- <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox10" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>--%>
+                                        </Columns>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                            <f:FormRow>
+                                <Items><f:Label runat="server" Text=" 备注：NCR包含业主下发的NCR、监理通知单、五环施工质量整改单等。"></f:Label>
+                                   </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
 
 
             <%--15.质量巡检情况--%>
@@ -536,7 +1077,7 @@
                                                         FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工分包商">
                                                         <Editor>
                                                             <f:DropDownList ID="drpUnitId" runat="server" EnableEdit="true"></f:DropDownList>
-                                                          </Editor>
+                                                        </Editor>
                                                     </f:RenderField>
                                                     <f:RenderField Width="250px" ColumnID="ProblemDesrioption" DataField="ProblemDesrioption"
                                                         FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述">
@@ -632,20 +1173,6 @@
                 </Items>
             </f:Panel>
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
             <%--20.项目质量体系审核--%>
             <f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
                 ShowHeader="true">

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方法
+        /// <summary>
+        /// 计量器具报验管理情况
+        /// </summary>
+        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<Model.Report_CQMS_MonthReportItem>();
+            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方法 
+        /// <summary>
+        /// 现场质量共检数据
+        /// </summary>
+        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<Model.Report_CQMS_MonthReportItem>();
+            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<Model.CheckStatisc> StatisticsList = new List<Model.CheckStatisc>();
+            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<string> workNames = new List<string>();
+            //专业下所有集合
+            List<Model.View_CQMS_InspectionManagementDetail> totalManagementList = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, projectStartDate, endDate, false);
+            //专业下当期集合
+            List<Model.View_CQMS_InspectionManagementDetail> 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方法
+        /// <summary>
+        /// 压力管道监检情况
+        /// </summary>
+        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<Model.Report_CQMS_MonthReportItem>();
+            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方法
+        /// <summary>
+        /// 管道试压包管理情况
+        /// </summary>
+        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<Model.Report_CQMS_MonthReportItem>();
+            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方法
+        /// <summary>
+        /// 特种设备监检情况
+        /// </summary>
+        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<Model.Report_CQMS_MonthReportItem>();
+            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方法
+        /// <summary>
+        /// NCR管理情况
+        /// </summary>
+        void loadNcrManagementInspection()
+        {
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            List<Model.NCRReportStatisc> StatisticsList = new List<Model.NCRReportStatisc>();
+            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方法
         /// <summary>
         /// 加载质量巡检情况
@@ -819,6 +1555,214 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         #endregion
 
         #region 保存方法 
+
+        #region 9.计量器具报验管理情况
+        void saveMeasuringInspection() {
+
+            List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
+            JArray teamGroupData = gvMeasuringInspection.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+                {
+                    ReportId = ReportId,
+                    ReType = "9",
+                    ContentName = values.Value<string>("ContentName"),
+                    MonthsCount = values.Value<int>("MonthsCount"),
+                    ProjectCount = values.Value<int>("ProjectCount"),
+                    //RectificationRate = values.Value<string>("RectificationRate"),
+                    Remarks = values.Value<string>("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<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
+            JArray teamGroupData = gvInspectionDataInspection.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+                {
+                    ReportId = ReportId,
+                    ReType = "10",
+                    ContentName = values.Value<string>("ContentName"),
+                    MonthsCount = values.Value<int>("MonthsCount"),
+                    ProjectCount = values.Value<int>("ProjectCount"),
+                    //RectificationRate = values.Value<string>("RectificationRate"),
+                    Remarks = values.Value<string>("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<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
+            JArray teamGroupData = gvPressureInspection.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+                {
+                    ReportId = ReportId,
+                    ReType = "11",
+                    TotalNoBackCount = values.Value<int>("TotalNoBackCount"),
+                    ContentName = values.Value<string>("ContentName"),
+                    MonthsCount = values.Value<int>("MonthsCount"),
+                    ProjectCount = values.Value<int>("ProjectCount"),
+                    //RectificationRate = values.Value<string>("RectificationRate"),
+                    Remarks = values.Value<string>("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<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
+            JArray teamGroupData = gvPipingInspection.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+                {
+                    ReportId = ReportId,
+                    ReType = "12",
+                    TotalNoBackCount = values.Value<int>("TotalNoBackCount"),
+                    ContentName = values.Value<string>("ContentName"),
+                    MonthsCount = values.Value<int>("MonthsCount"),
+                    ProjectCount = values.Value<int>("ProjectCount"),
+                    //RectificationRate = values.Value<string>("RectificationRate"),
+                    Remarks = values.Value<string>("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<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
+            JArray teamGroupData = gvSpecialInspection.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+                {
+                    ReportId = ReportId,
+                    ReType = "13",
+                    TotalNoBackCount= values.Value<int>("TotalNoBackCount"),
+                    ContentName = values.Value<string>("ContentName"),
+                    MonthsCount = values.Value<int>("MonthsCount"),
+                    ProjectCount = values.Value<int>("ProjectCount"),
+                    //RectificationRate = values.Value<string>("RectificationRate"),
+                    Remarks = values.Value<string>("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<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
+            JArray teamGroupData = gvNcrManagementInspection.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+                {
+                    ReportId = ReportId,
+                    ReType = "14",
+                    ContentName = values.Value<string>("ContentName"),
+                    MonthsCount = values.Value<int>("MonthsCount"),
+                    ProjectCount = values.Value<int>("ProjectCount"),
+                    //RectificationRate = values.Value<string>("RectificationRate"),
+                    Remarks = values.Value<string>("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.质量巡检情况 
         /// <summary>
         /// 15.质量巡检情况

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
 
 
 错误信息开始=====>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1819,6 +1819,9 @@
     <Content Include="TestRun\Feeding\TailTermHandle.aspx" />
     <Content Include="TestRun\Feeding\TailTermHandleList.aspx" />
     <Content Include="TestRun\Meeting\Feedback.aspx" />
+    <Content Include="TestRun\Meeting\MeetingInitiate.aspx" />
+    <Content Include="TestRun\Meeting\MeetingInitiateEdit.aspx" />
+    <Content Include="TestRun\Meeting\MeetingSummary.aspx" />
     <Content Include="TestRun\Meeting\ScheduleMeeting.aspx" />
     <Content Include="TestRun\Meeting\ScheduleMeetingEdit.aspx" />
     <Content Include="TestRun\Meeting\ScheduleMeetingView.aspx" />
@@ -16338,6 +16341,27 @@
     <Compile Include="TestRun\Meeting\Feedback.aspx.designer.cs">
       <DependentUpon>Feedback.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\Meeting\MeetingInitiate.aspx.cs">
+      <DependentUpon>MeetingInitiate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\Meeting\MeetingInitiate.aspx.designer.cs">
+      <DependentUpon>MeetingInitiate.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="TestRun\Meeting\MeetingInitiateEdit.aspx.cs">
+      <DependentUpon>MeetingInitiateEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\Meeting\MeetingInitiateEdit.aspx.designer.cs">
+      <DependentUpon>MeetingInitiateEdit.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="TestRun\Meeting\MeetingSummary.aspx.cs">
+      <DependentUpon>MeetingSummary.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\Meeting\MeetingSummary.aspx.designer.cs">
+      <DependentUpon>MeetingSummary.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\Meeting\ScheduleMeeting.aspx.cs">
       <DependentUpon>ScheduleMeeting.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />

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 = "设计";

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) : "";
                     }
                 }
             }

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" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>会议发起</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>

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)
+        {
+
+        }
+    }
+}

SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiate.aspx.designer.cs

@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.Meeting {
+    
+    
+    public partial class MeetingInitiate {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}

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" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>编辑会议发起</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:HiddenField ID="hdId" runat="server"></f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
+                            runat="server">
+                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <Rows>
+                                    <f:FormRow ColumnWidths="50% 31% 1% 18%">
+                                        <Items>
+                                            <f:TextBox ID="txtMeetingName" runat="server" Label="会议名称" LabelAlign="Right" LabelWidth="100px" MaxLength="50" Required="true" ShowRedStar="true">
+                                            </f:TextBox>
+                                            <f:DatePicker runat="server" Required="true" DateFormatString="yyyy-MM-dd HH:mm" Label="起止时间" ID="txtStartTime" ShowRedStar="true" ShowTime="true" ShowSecond="false"></f:DatePicker>
+                                            <f:Label ID="Label1" runat="server" Text="-"></f:Label>
+                                            <f:DatePicker runat="server" Required="true" DateFormatString="yyyy-MM-dd HH:mm" ID="txtEndTime" ShowRedStar="true" ShowTime="true" ShowSecond="false"></f:DatePicker>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:RadioButtonList ID="rblMeetingType" runat="server" Label="会议类别" LabelAlign="Right" LabelWidth="100px" Required="true" ShowRedStar="true">
+                                                <f:RadioItem Value="1" Text="开车专题会" Selected="true" />
+                                                <f:RadioItem Value="2" Text="生产调度会" />
+                                                <f:RadioItem Value="3" Text="开车周例会" />
+                                            </f:RadioButtonList>
+                                            <f:TextBox ID="txtMeetingAddress" runat="server" Label="地点" LabelAlign="Right" LabelWidth="100px" MaxLength="100">
+                                            </f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtMeetingUrl" runat="server" Label="链接" LabelAlign="Right" LabelWidth="100px" MaxLength="1000">
+                                            </f:TextBox>
+                                            <f:DatePicker ID="txtInitiationDate" runat="server" Label="发起日期" LabelAlign="Right" LabelWidth="100px" Required="true" ShowRedStar="true"></f:DatePicker>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextArea ID="txtMeetingContent" runat="server" Label="会议内容" LabelAlign="Right" LabelWidth="100px"></f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Tree ID="tvAttendMeetingsPerson" EnableCollapse="true" ShowHeader="true" Title="参会人员" EnableCheckBox="true"
+                                                AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true"
+                                                EnableSingleClickExpand="true" OnNodeCheck="tvAttendMeetingsPerson_NodeCheck">
+                                            </f:Tree>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>

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 加载
+        /// <summary>
+        /// 页面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            SaveData(BLL.Const.BtnSave);
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        /// <summary>
+        /// 保存数据
+        /// </summary>
+        /// <param name="type"></param>
+        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 初始化树
+        /// <summary>
+        /// 初始化树
+        /// </summary>
+        /// <param name="menuList">单位集合</param>
+        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);
+            }
+        }
+
+        /// <summary>
+        /// 遍历增加子节点
+        /// </summary>
+        /// <param name="nodes"></param>
+        /// <param name="menuId"></param>
+        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 全选、全不选
+        /// <summary>
+        /// 全选、全不选
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        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);
+            }
+        }
+
+        /// <summary>
+        /// 选中父节点
+        /// </summary>
+        /// <param name="node"></param>
+        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
+    }
+}

SGGL/FineUIPro.Web/TestRun/Meeting/MeetingInitiateEdit.aspx.designer.cs

@@ -0,0 +1,186 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.Meeting {
+    
+    
+    public partial class MeetingInitiateEdit {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// txtMeetingName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMeetingName;
+        
+        /// <summary>
+        /// txtStartTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartTime;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// rblMeetingType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblMeetingType;
+        
+        /// <summary>
+        /// txtMeetingAddress 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMeetingAddress;
+        
+        /// <summary>
+        /// txtMeetingUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMeetingUrl;
+        
+        /// <summary>
+        /// txtInitiationDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtInitiationDate;
+        
+        /// <summary>
+        /// txtMeetingContent 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtMeetingContent;
+        
+        /// <summary>
+        /// tvAttendMeetingsPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree tvAttendMeetingsPerson;
+    }
+}

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" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>会议纪要</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>

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)
+        {
+
+        }
+    }
+}

SGGL/FineUIPro.Web/TestRun/Meeting/MeetingSummary.aspx.designer.cs

@@ -0,0 +1,24 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.Meeting {
+    
+    
+    public partial class MeetingSummary {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}

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
     }

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 + "（暂未反馈）";
+                            //        }
+                            //    }
+                            //}
                         }
                     }
                 }

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 + "（暂未反馈）";
+                            //        }
+                            //    }
+                            //}
                         }
                     }
                 }

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
     }

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 + "（暂未反馈）";
+                            //        }
+                            //    }
+                            //}
                         }
                     }
                 }

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 + "（暂未反馈）";
+                            //        }
+                            //    }
+                            //}
                         }
                     }
                 }

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
     }

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 + "（暂未反馈）";
+                            //        }
+                            //    }
+                            //}
                         }
                     }
                 }

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 + "（暂未反馈）";
+                            //        }
+                            //    }
+                            //}
                         }
                     }
                 }

SGGL/FineUIPro.Web/Web.config

@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

SGGL/FineUIPro.Web/common/Menu_Personal.xml

@@ -7,7 +7,4 @@
 <TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
 <TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
 <TreeNode id="6549EF60-1DED-4912-8D2D-7B32A80A2DEC" Text="视频会议" NavigateUrl="Personal/PersonMeeting.aspx"></TreeNode>
-<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
-<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
-<TreeNode id="F0792B77-AEE4-4834-82C2-E5B75D0B0AB7" Text="开车月技术总结" NavigateUrl="Personal/TestRunMonthSummary.aspx"></TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/Menu_TestRun.xml

@@ -46,12 +46,12 @@
 <TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="生成工作包检查表" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="检查表条件确认" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
-<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
-<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
-<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
-<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
+<TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="检查项确认" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
+<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表流转" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
+<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="检查项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
 <TreeNode id="19865B64-E0AA-4D32-9712-05C14FE6288F" Text="试车记录上传" NavigateUrl="TestRun/BeforeTestRun/TestRunRecordUploadList.aspx"></TreeNode>
+<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="FCC050F0-0F13-4CE5-BE33-623377562965" Text="三查四定尾项清单" NavigateUrl="TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx"></TreeNode>
 <TreeNode id="4822760B-395B-4979-B547-EA0D715C8A2C" Text="三查四定提出人处理" NavigateUrl="TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx"></TreeNode>
 <TreeNode id="E673FC27-74F1-479C-8DE1-950183566725" Text="三查四定责任人销项" NavigateUrl="TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx"></TreeNode>
@@ -69,11 +69,9 @@
 <TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
 <TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
 <TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
-<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
 <TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
 <TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
-<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>
@@ -103,9 +101,8 @@
 <TreeNode id="6960EA9F-DC75-4193-AAB6-27ACAA0CDA96" Text="其他巡检记录管理" NavigateUrl="TestRun/ProduceProperty/PropertyRunOthersCheck.aspx"></TreeNode>
 <TreeNode id="FC6215D9-400F-483B-9DBF-3DB388D72A7C" Text="分析取样管理" NavigateUrl="TestRun/ProduceProperty/AnalySamp.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="83EA1C7C-1DF2-4E26-BC91-946E94E5E519" Text="会议管理" NavigateUrl=""><TreeNode id="2B42BDDA-0D24-4C68-9C35-DCCA4054736A" Text="生产调度会" NavigateUrl="TestRun/Meeting/ScheduleMeeting.aspx"></TreeNode>
-<TreeNode id="E453EEE9-9D6A-454B-AB17-A6E284B7A95F" Text="开车周例会" NavigateUrl="TestRun/Meeting/WeekMeeting.aspx"></TreeNode>
-<TreeNode id="420456A5-22E7-45BF-A4CA-8412F4C7D1B9" Text="开车专题会" NavigateUrl="TestRun/Meeting/SpecialMeeting.aspx"></TreeNode>
+<TreeNode id="83EA1C7C-1DF2-4E26-BC91-946E94E5E519" Text="会议管理" NavigateUrl=""><TreeNode id="2B42BDDA-0D24-4C68-9C35-DCCA4054736A" Text="会议发起" NavigateUrl="TestRun/Meeting/MeetingInitiate.aspx"></TreeNode>
+<TreeNode id="E453EEE9-9D6A-454B-AB17-A6E284B7A95F" Text="会议纪要" NavigateUrl="TestRun/Meeting/MeetingSummary.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="9EDB56DF-6A3C-49B8-AC60-F6A5E9B0A813" Text="开车报告" NavigateUrl=""><TreeNode id="9ABFEB7D-9DFC-4286-9139-DAEAB8E311F7" Text="开车月报告" NavigateUrl="TestRun/DriverReport/MonthReport.aspx"></TreeNode>
 <TreeNode id="A6AC39B3-378A-476B-94A8-C6F1C4BFAF74" Text="联动试车报告" NavigateUrl="TestRun/DriverReport/LinkedTestRunReport.aspx"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_Transfer.xml

@@ -1,21 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
-  </TreeNode>
-<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
-<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
-<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
-<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
-<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
-<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
-<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
-<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
-<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
-<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
-<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
-<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
-<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
-<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
-<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
-</TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/Menu_ZHGL.xml

@@ -83,8 +83,11 @@
 </TreeNode>
 <TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
 <TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
+<<<<<<< HEAD
+=======
 <TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
 <TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
 <TreeNode id="0C6BB051-6BD1-4E35-90CE-9376F3C2D454" Text="开车人员月技术总结" NavigateUrl="ZHGL/TestRunPerformance/TestRunMonthSummaryReport.aspx"></TreeNode>
 </TreeNode>
+>>>>>>> 0ae4143492852fa438a0c21d967acf7271ee604e
 </Tree>

SGGL/Model/CQMS/CheckStatisc.cs

@@ -86,5 +86,15 @@ namespace Model
             get { return totalOneOKRate; }
             set { totalOneOKRate = value; }
         }
+
+        private string id;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
     }
 }

SGGL/Model/CQMS/NCRReportStatisc.cs

@@ -70,5 +70,15 @@ namespace Model
            get { return oKRate; }
            set { oKRate = value; }
        }
-   }
+
+        private string id;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+    }
 }

SGGL/WebAPI/WebAPI.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />