Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

2023-09-12 16:54:14 +08:00
parent 24ad636416 1c0cdfc7e3
commit c810dd00ed
27 changed files with 8664 additions and 40 deletions
@@ -1220,6 +1220,83 @@ GO
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
 VALUES('19C14DB9-9AD0-4FF7-897C-6D21042436FE',37,'应急演练',40,'HSEData','次')
 GO
+----质量数据（月报）汇总
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('705F4212-4589-4367-9493-F7BC94753FF1',1,'本月发出整改项',1,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9FB77E9F-E8F4-4704-A2CE-26E00844FE76',2,'本月关闭整改项',2,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('55C1F1C0-98BB-4701-A138-5EB60B531C4D',3,'累计发出整改项',3,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('56140BCD-911D-4358-B8E8-71F9539B558C',4,'累计关闭整改项',4,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('25166CF6-3930-43FA-B1E5-209A0F1E3B41',5,'本月拍片总数',5,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9078D7D7-7474-44C6-8BC1-DE7312D7765E',6,'本月不合格数',6,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9334B33A-5891-4A58-8415-D88EA9D6421E',7,'本月已返修数',7,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('07704B12-0BDB-4F99-B96A-FFE50E3DB766',8,'本月一次合格率',8,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('F51AA482-AAF7-4B57-8136-106A9A48A1B7',9,'累计拍片总数',9,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('BB0B6648-ACD6-4C99-8FCA-F0C4C5AB015C',10,'累计不合格数',10,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9995A90B-4898-460A-B751-2700B1338397',11,'累计一次合格率',11,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('EA2BF13C-A327-424F-BFBB-7A484B1D275B',12,'本月焊工入场总人数',12,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('756CDD1C-4FFE-4C6D-8163-C57CBAA9502C',13,'本月焊工入场合格人数',13,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('333E8F27-0F31-456A-8CCD-0F07CDF59687',14,'本月焊工入场合格率',14,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('3F54276E-C0B0-4036-9E82-6FE68BF5A434',15,'累计焊工入场总人数',15,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('35D0D209-65E0-42DD-86B5-4B0E59D0045F',16,'累计焊工入场合格人数',16,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('7DDCFB3D-A3D8-4D5A-81BE-2B258E57756D',17,'累计焊工入场合格率',17,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('854E657C-0B57-47DC-A181-044D2B082872',18,'A级控制点总数',18,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('CA35E12C-D0CE-4832-97E1-0346723011F4',19,'A级控制点本月完成数',19,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('D267E862-6DE5-4CCA-AE31-07BCEE1BEFB1',20,'A级控制点累计完成数',20,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('A70F3229-388B-45C6-9749-46A8859F08FF',21,'A级控制点累计完成百分比',21,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('05DA53CB-9DAF-4A5C-87DF-66ED945D6EB6',22,'B级控制点总数',22,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('8B031636-4436-40B1-9B74-241FFD705083',23,'B级控制点本月完成数',23,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('26C04EFE-F000-4AF6-B838-5FDE7ABA780F',24,'B级控制点累计完成数',24,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('FF60C455-1168-4B28-8F2D-37B351D3092C',25,'B级控制点累计完成百分比',25,'CQMSData','百分比')
+GO
+

 ----安全安全合规索引
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)
@@ -0,0 +1,266 @@
+update Sys_Menu set Url='DigData/CQMSDataCollect.aspx' where MenuId='DD960B76-1F33-468B-9FEF-76328235C079'
+GO
+
+
+CREATE TABLE [dbo].[DigData_CQMSDataCollect](
+	[CQMSDataCollectId] [nvarchar](50) NOT NULL,
+	[Year] [int] NOT NULL,
+ CONSTRAINT [PK_DigData_CQMSDataCollect] PRIMARY KEY CLUSTERED 
+(
+	[CQMSDataCollectId] 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
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollect', @level2type=N'COLUMN',@level2name=N'CQMSDataCollectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'年份' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollect', @level2type=N'COLUMN',@level2name=N'Year'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目质量数据汇总表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollect'
+GO
+
+
+
+CREATE TABLE [dbo].[DigData_CQMSDataCollectItem](
+	[CQMSDataCollectItemId] [nvarchar](50) NOT NULL,
+	[CQMSDataCollectId] [nvarchar](50) NULL,
+	[Year] [int] NULL,
+	[SortIndex] [int] NULL,
+	[CQMSContent] [nvarchar](200) NULL,
+	[MeasureUnit] [nvarchar](50) NULL,
+	[Month1] [nvarchar](50) NULL,
+	[Month2] [nvarchar](50) NULL,
+	[Month3] [nvarchar](50) NULL,
+	[Month4] [nvarchar](50) NULL,
+	[Month5] [nvarchar](50) NULL,
+	[Month6] [nvarchar](50) NULL,
+	[Month7] [nvarchar](50) NULL,
+	[Month8] [nvarchar](50) NULL,
+	[Month9] [nvarchar](50) NULL,
+	[Month10] [nvarchar](50) NULL,
+	[Month11] [nvarchar](50) NULL,
+	[Month12] [nvarchar](50) NULL,
+	[MonthSum] [nvarchar](50) NULL,
+ CONSTRAINT [PK_DigData_CQMSDataCollectItem] PRIMARY KEY CLUSTERED 
+(
+	[CQMSDataCollectItemId] 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].[DigData_CQMSDataCollectItem]  WITH CHECK ADD  CONSTRAINT [FK_DigData_CQMSDataCollectItem_DigData_CQMSDataCollect] FOREIGN KEY([CQMSDataCollectId])
+REFERENCES [dbo].[DigData_CQMSDataCollect] ([CQMSDataCollectId])
+GO
+
+ALTER TABLE [dbo].[DigData_CQMSDataCollectItem] CHECK CONSTRAINT [FK_DigData_CQMSDataCollectItem_DigData_CQMSDataCollect]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectItem', @level2type=N'COLUMN',@level2name=N'CQMSDataCollectItemId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'外键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectItem', @level2type=N'COLUMN',@level2name=N'CQMSDataCollectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'年份' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectItem', @level2type=N'COLUMN',@level2name=N'Year'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'排序' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectItem', @level2type=N'COLUMN',@level2name=N'SortIndex'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目质量数据汇总明细表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectItem'
+GO
+
+
+
+CREATE TABLE [dbo].[DigData_CQMSDataCollectSubmission](
+	[CQMSDataCollectSubmissionId] [nvarchar](50) NOT NULL,
+	[CQMSDataCollectId] [nvarchar](50) NULL,
+	[Year] [int] NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[Month1] [nvarchar](50) NULL,
+	[Month2] [nvarchar](50) NULL,
+	[Month3] [nvarchar](50) NULL,
+	[Month4] [nvarchar](50) NULL,
+	[Month5] [nvarchar](50) NULL,
+	[Month6] [nvarchar](50) NULL,
+	[Month7] [nvarchar](50) NULL,
+	[Month8] [nvarchar](50) NULL,
+	[Month9] [nvarchar](50) NULL,
+	[Month10] [nvarchar](50) NULL,
+	[Month11] [nvarchar](50) NULL,
+	[Month12] [nvarchar](50) NULL,
+ CONSTRAINT [PK_DigData_CQMSDataCollectSubmission] PRIMARY KEY CLUSTERED 
+(
+	[CQMSDataCollectSubmissionId] 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].[DigData_CQMSDataCollectSubmission]  WITH CHECK ADD  CONSTRAINT [FK_DigData_CQMSDataCollectSubmission_DigData_CQMSDataCollect] FOREIGN KEY([CQMSDataCollectId])
+REFERENCES [dbo].[DigData_CQMSDataCollect] ([CQMSDataCollectId])
+GO
+
+ALTER TABLE [dbo].[DigData_CQMSDataCollectSubmission] CHECK CONSTRAINT [FK_DigData_CQMSDataCollectSubmission_DigData_CQMSDataCollect]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectSubmission', @level2type=N'COLUMN',@level2name=N'CQMSDataCollectSubmissionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'外键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectSubmission', @level2type=N'COLUMN',@level2name=N'CQMSDataCollectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目CQMS月报提交情况' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DigData_CQMSDataCollectSubmission'
+GO
+
+
+----质量数据（月报）汇总
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('705F4212-4589-4367-9493-F7BC94753FF1',1,'本月发出整改项',1,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9FB77E9F-E8F4-4704-A2CE-26E00844FE76',2,'本月关闭整改项',2,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('55C1F1C0-98BB-4701-A138-5EB60B531C4D',3,'累计发出整改项',3,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('56140BCD-911D-4358-B8E8-71F9539B558C',4,'累计关闭整改项',4,'CQMSData','项')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('25166CF6-3930-43FA-B1E5-209A0F1E3B41',5,'本月拍片总数',5,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9078D7D7-7474-44C6-8BC1-DE7312D7765E',6,'本月不合格数',6,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9334B33A-5891-4A58-8415-D88EA9D6421E',7,'本月已返修数',7,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('07704B12-0BDB-4F99-B96A-FFE50E3DB766',8,'本月一次合格率',8,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('F51AA482-AAF7-4B57-8136-106A9A48A1B7',9,'累计拍片总数',9,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('BB0B6648-ACD6-4C99-8FCA-F0C4C5AB015C',10,'累计不合格数',10,'CQMSData','张')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('9995A90B-4898-460A-B751-2700B1338397',11,'累计一次合格率',11,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('EA2BF13C-A327-424F-BFBB-7A484B1D275B',12,'本月焊工入场总人数',12,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('756CDD1C-4FFE-4C6D-8163-C57CBAA9502C',13,'本月焊工入场合格人数',13,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('333E8F27-0F31-456A-8CCD-0F07CDF59687',14,'本月焊工入场合格率',14,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('3F54276E-C0B0-4036-9E82-6FE68BF5A434',15,'累计焊工入场总人数',15,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('35D0D209-65E0-42DD-86B5-4B0E59D0045F',16,'累计焊工入场合格人数',16,'CQMSData','人')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('7DDCFB3D-A3D8-4D5A-81BE-2B258E57756D',17,'累计焊工入场合格率',17,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('854E657C-0B57-47DC-A181-044D2B082872',18,'A级控制点总数',18,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('CA35E12C-D0CE-4832-97E1-0346723011F4',19,'A级控制点本月完成数',19,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('D267E862-6DE5-4CCA-AE31-07BCEE1BEFB1',20,'A级控制点累计完成数',20,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('A70F3229-388B-45C6-9749-46A8859F08FF',21,'A级控制点累计完成百分比',21,'CQMSData','百分比')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('05DA53CB-9DAF-4A5C-87DF-66ED945D6EB6',22,'B级控制点总数',22,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('8B031636-4436-40B1-9B74-241FFD705083',23,'B级控制点本月完成数',23,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('26C04EFE-F000-4AF6-B838-5FDE7ABA780F',24,'B级控制点累计完成数',24,'CQMSData','个')
+GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId,Remark)
+VALUES('FF60C455-1168-4B28-8F2D-37B351D3092C',25,'B级控制点累计完成百分比',25,'CQMSData','百分比')
+GO
+
+
+CREATE PROCEDURE [dbo].[Sp_DigData_CQMSDataCollect]
+(
+   @year int
+)
+AS
+/*安全数据汇总*/
+SELECT CQMSDataCollectItemId
+,CQMSDataCollectId
+,SortIndex
+,CQMSContent
+,MeasureUnit
+,Month1
+,Month2
+,Month3
+,Month4
+,Month5
+,Month6
+,Month7
+,Month8
+,Month9
+,Month10
+,Month11
+,Month12
+,(CASE WHEN  SortIndex=20 or SortIndex=36 or SortIndex=37 
+	THEN CAST((ISNULL(CAST(Month1 AS decimal(18,2)),0)+ISNULL(CAST(Month2 AS decimal(18,2)),0)+ISNULL(CAST(Month3 AS decimal(18,2)),0)+ISNULL(CAST(Month4 AS decimal(18,2)),0)+ISNULL(CAST(Month5 AS decimal(18,2)),0)
+	+ISNULL(CAST(Month6 AS decimal(18,2)),0)+ISNULL(CAST(Month7 AS decimal(18,2)),0)+ISNULL(CAST(Month8 AS decimal(18,2)),0)+ISNULL(CAST(Month9 AS decimal(18,2)),0)+ISNULL(CAST(Month10 AS decimal(18,2)),0)
+	+ISNULL(CAST(Month11 AS decimal(18,2)),0)+ISNULL(CAST(Month12 AS decimal(18,2)),0)) AS NVARCHAR(50))
+	ELSE  CAST((ISNULL(CAST(Month1 AS int),0)+ISNULL(CAST(Month2 AS int),0)+ISNULL(CAST(Month3 AS int),0)+ISNULL(CAST(Month4 AS int),0)+ISNULL(CAST(Month5 AS int),0)
+	+ISNULL(CAST(Month6 AS int),0)+ISNULL(CAST(Month7 AS int),0)+ISNULL(CAST(Month8 AS int),0)+ISNULL(CAST(Month9 AS int),0)+ISNULL(CAST(Month10 AS int),0)
+	+ISNULL(CAST(Month11 AS int),0)+ISNULL(CAST(Month12 AS int),0)) AS NVARCHAR(50))
+	END) AS MonthSum
+FROM dbo.DigData_CQMSDataCollectItem
+WHERE YEAR=@year
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_WBS]
+AS
+select '1' as Id,'0' as SupId ,'JZ' as Code, '建筑工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,
+ProjectId from dbo.WBS_UnitWork 
+Union
+select '2' as Id,'0' as SupId ,'AZ' as Code, '安装工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,
+ProjectId from dbo.WBS_UnitWork 
+Union
+select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
+ProjectId from dbo.WBS_UnitWork 
+Union all
+select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
+ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null
+Union all
+select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
+ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null
+
+
+
+
+
+
+
+
+
+GO
+
+
@@ -339,6 +339,7 @@
    <Compile Include="CQMS\WBS\WorkPackageParentDetailService.cs" />
    <Compile Include="CQMS\WBS\WorkPackageProjectService.cs" />
    <Compile Include="CQMS\WBS\WorkPackageService.cs" />
+    <Compile Include="DigData\CQMSDataCollectService.cs" />
    <Compile Include="DigData\CQMSDataDWService .cs" />
    <Compile Include="DigData\WBSAnalysisService.cs" />
    <Compile Include="DigData\HTGLDataDWService.cs" />
@@ -458,7 +458,7 @@ namespace BLL
        {
            if (isOK == "0")
            {
-                var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
+                var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.Code);
                int b = 1;
                foreach (var item in items)
                {
@@ -470,7 +470,7 @@ namespace BLL
            }
            else if (isOK == "1")
            {
-                var items = oldList.Where(x => x.SupId == id && x.RealEndDate != null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
+                var items = oldList.Where(x => x.SupId == id && x.RealEndDate != null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.Code);
                int b = 1;
                foreach (var item in items)
                {
@@ -482,7 +482,7 @@ namespace BLL
            }
            else if (isOK == "2")
            {
-                var items = oldList.Where(x => x.SupId == id && x.RealEndDate == null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
+                var items = oldList.Where(x => x.SupId == id && x.RealEndDate == null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.Code);
                int b = 1;
                foreach (var item in items)
                {
@@ -498,7 +498,7 @@ namespace BLL
        {
            if (isOK == "0")
            {
-                var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
+                var items = oldList.Where(x => x.SupId == id && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.Code);
                int b = 1;
                foreach (var item in items)
                {
@@ -511,7 +511,7 @@ namespace BLL
            }
            else if (isOK == "1")
            {
-                var items = oldList.Where(x => x.SupId == id && x.RealEndDate != null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
+                var items = oldList.Where(x => x.SupId == id && x.RealEndDate != null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.Code);
                int b = 1;
                foreach (var item in items)
                {
@@ -524,7 +524,7 @@ namespace BLL
            }
            else if (isOK == "2")
            {
-                var items = oldList.Where(x => x.SupId == id && x.RealEndDate == null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.WBSCode);
+                var items = oldList.Where(x => x.SupId == id && x.RealEndDate == null && (x.PlanStartDate <= Funs.GetNewDateTime(startTime) || string.IsNullOrEmpty(startTime)) && (x.PlanEndDate >= Funs.GetNewDateTime(endTime) || string.IsNullOrEmpty(endTime))).OrderBy(x => x.Code);
                int b = 1;
                foreach (var item in items)
                {
@@ -992,7 +992,7 @@ namespace BLL

        private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, DateTime startTime, DateTime endTime)
        {
-            var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.WBSCode);
+            var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.Code);
            int b = 1;
            foreach (var item in items)
            {
@@ -1005,7 +1005,7 @@ namespace BLL

        private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string prefix, DateTime startTime, DateTime endTime)
        {
-            var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.WBSCode);
+            var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.Code);
            int b = 1;
            foreach (var item in items)
            {
@@ -366,6 +366,10 @@ namespace BLL
        /// </summary>
        public const string Group_HSEData = "HSEData";
        /// <summary>
+        /// 安全数据（月报）汇总 组id
+        /// </summary>
+        public const string Group_CQMSData = "CQMSData";
+        /// <summary>
        /// 本部菜单
        /// </summary>
        public const string Group_MenuType_S = "MenuType_S";
@@ -137,8 +137,10 @@ namespace FineUIPro.Web.CQMS.Check
                    {
                        string rowID = Grid1.DataKeys[rowIndex][0].ToString();
                        var CheckMonth = BLL.MonthSpotCheckDetailService.GetMonthSpotCheckDetailsByCheckMonthId(rowID);
+                        Model.Check_CheckMonth checkMonth = CheckMonthService.GetCheckMonth(rowID);
                        if (CheckMonth != null)
                        {
+                            BLL.CQMSDataCollectService.DeleteCQMSDataCollectItem(checkMonth);
                            BLL.MonthRectifyService.DeleteMonthRectifysByCheckMonthId(rowID);
                            BLL.MonthNDTCheckService.DeleteMonthNDTChecksByCheckMonthId(rowID);
                            BLL.MonthWelderService.DeleteMonthWeldersByCheckMonthId(rowID);
@@ -146,7 +148,6 @@ namespace FineUIPro.Web.CQMS.Check
                            BLL.SpecialEquipmentDetailService.DeleteSpecialEquipmentDetailsByCheckMonthId(rowID);
                            BLL.MonthDesignService.DeleteMonthDesignsByCheckMonthId(rowID);
                        }
-
                        BLL.CheckMonthService.DeleteCheckMonth(rowID);

                    }
@@ -249,7 +249,7 @@
                                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                                        <Items>
                                            <f:TextBox ID="txtMonthOk" runat="server" Label="本月质量验收一次合格率" Width="400px" LabelWidth="190px"></f:TextBox>
-                                            <f:TextBox ID="txtAllOk" runat="server" Label="本月质量验收一次合格率" Width="400px" LabelWidth="190px"></f:TextBox>
+                                            <f:TextBox ID="txtAllOk" runat="server" Label="累计质量验收一次合格率" Width="400px" LabelWidth="190px"></f:TextBox>
                                        </Items>
                                    </f:Toolbar>
                                </Toolbars>
@@ -441,7 +441,7 @@

                            <Items>
                                <f:TextBox ID="txtMonthDataOk" runat="server" Label="本月质量记录同步率" Width="600px" LabelWidth="160px"></f:TextBox>
-                                <f:TextBox ID="txtAllDataOk" runat="server" Label="本月质量记录同步率" Width="600px" LabelWidth="160px"></f:TextBox>
+                                <f:TextBox ID="txtAllDataOk" runat="server" Label="累计质量记录同步率" Width="600px" LabelWidth="160px"></f:TextBox>
                                <f:TextArea ID="txtConstructionData" ShowRedStar="true" Required="true" runat="server" Width="1230px" MaxLength="3000"></f:TextArea>
                            </Items>

@@ -164,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Check
            }
            else if (e.Node.CommandName == "WorkPackage")   //展开工作包节点
            {
-                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
+                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x;
                if (workPackages.Count() > 0)   //存在子单位工程
                {
                    foreach (var workPackage in workPackages)
@@ -166,7 +166,7 @@ namespace FineUIPro.Web.CQMS.WBS
            }
            else if (e.Node.CommandName == "WorkPackage")   //展开工作包节点
            {
-                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
+                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x;
                if (workPackages.Count() > 0)   //存在子单位工程
                {
                    foreach (var workPackage in workPackages)
@@ -164,7 +164,7 @@ namespace FineUIPro.Web.CQMS.WBS
            }
            else if (e.Node.CommandName == "WorkPackage")   //展开工作包节点
            {
-                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode select x;
+                var workPackages = from x in Funs.DB.WBS_WorkPackage where x.SuperWorkPackageId == e.Node.NodeID && x.IsApprove == true orderby x.WorkPackageCode, x.WorkPackageId select x;
                if (workPackages.Count() > 0)   //存在子单位工程
                {
                    foreach (var workPackage in workPackages)
@@ -0,0 +1,163 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CQMSDataCollect.aspx.cs" Inherits="FineUIPro.Web.DigData.CQMSDataCollect" %>
+
+<!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>项目HSE数据汇总表</title>
+    <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch" AutoScroll="true">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                    <Items>
+                        <f:DropDownList ID="drpYear" runat="server" Label="年份" LabelAlign="Right" Width="250px"
+                            AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                        </f:DropDownList>
+                        <f:RadioButtonList runat="server" ID="rblShow"  Width="500px" AutoColumnWidth="true"
+                            AutoPostBack="true" OnSelectedIndexChanged="rblShow_SelectedIndexChanged">
+                            <f:RadioItem Value="-1" Text="全部"/>
+                            <f:RadioItem Value="1" Text="项目质量数据汇总表" Selected="true"/>
+                            <f:RadioItem Value="2" Text="项目质量月报提交情况"/>
+                        </f:RadioButtonList>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button runat="server" ID="btnDel" Icon="Delete" IconAlign="Left"  Text="删除" ToolTip="删除当年汇总数据" ConfirmText="确定删除当前数据？"
+                            OnClick="btnDel_Click" Hidden="true">
+                        </f:Button>
+                        <f:Button runat="server" ID="btnRefresh" Icon="ArrowRefresh" IconAlign="Left" Text="汇总" ToolTip="重新汇总月报数据"
+                            OnClick="btnRefresh_Click" Hidden="true">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="项目质量数据汇总表" 
+                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CQMSDataCollectItemId"
+                    DataParentIDField="ParentId" EnableTree="true" TreeColumn="CQMSContent" EnableCollapse="true"
+                    DataIDField="CQMSDataCollectItemId" AllowSorting="true" SortField="IntS" SortDirection="ASC"
+                    AllowPaging="false" IsDatabasePaging="true" PageSize="100" ForceFit="true"
+                    EnableTextSelection="True">
+                    <Columns>
+                        <f:RenderField Width="55px" ColumnID="SortIndex" DataField="SortIndex"
+                            SortField="SortIndex" FieldType="String" HeaderText="序号" HeaderTextAlign="Center"
+                            TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="240px" ColumnID="CQMSContent" DataField="CQMSContent"
+                            FieldType="String" HeaderText="质量管理内容" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="MeasureUnit" DataField="MeasureUnit"
+                            FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month1" DataField="Month1"
+                            FieldType="String" HeaderText="1月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month2" DataField="Month2"
+                            FieldType="String" HeaderText="2月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month3" DataField="Month3"
+                            FieldType="String" HeaderText="3月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month4" DataField="Month4"
+                            FieldType="String" HeaderText="4月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month5" DataField="Month5"
+                            FieldType="String" HeaderText="5月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month6" DataField="Month6"
+                            FieldType="String" HeaderText="6月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month7" DataField="Month7"
+                            FieldType="String" HeaderText="7月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month8" DataField="Month8"
+                            FieldType="String" HeaderText="8月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month9" DataField="Month9"
+                            FieldType="String" HeaderText="9月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month10" DataField="Month10"
+                            FieldType="String" HeaderText="10月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month11" DataField="Month11"
+                            FieldType="String" HeaderText="11月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="Month12" DataField="Month12"
+                            FieldType="String" HeaderText="12月" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="80px" ColumnID="MonthSum" DataField="MonthSum"
+                            FieldType="String" HeaderText="年度合计" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                </f:Grid>
+            </Items>
+            <Items>
+                <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="项目质量月报提交情况" Hidden="true" EnableCollapse="true"
+                    runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="CQMSDataCollectSubmissionId" ForceFit="true"
+                    DataIDField="CQMSDataCollectSubmissionId" AllowSorting="true" SortField="ProjectCode" SortDirection="ASC"
+                    AllowPaging="false" IsDatabasePaging="true" PageSize="50" EnableTextSelection="True" OnRowCommand="Grid2_RowCommand">
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center"
+                            TextAlign="Center" />
+                        <f:RenderField Width="140px" ColumnID="ProjectName" DataField="ProjectName"
+                            FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:GroupField ColumnID="xx" HeaderText="提交日期" TextAlign="Center">
+                            <Columns>
+                                <f:LinkButtonField Width="60px" ColumnID="Month1" DataTextField="Month1" CommandName="1"
+                                    HeaderText="1月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month2" DataTextField="Month2" CommandName="2"
+                                    HeaderText="2月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month3" DataTextField="Month3" CommandName="3"
+                                    HeaderText="3月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month4" DataTextField="Month4" CommandName="4"
+                                    HeaderText="4月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month5" DataTextField="Month5" CommandName="5"
+                                    HeaderText="5月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month6" DataTextField="Month6" CommandName="6"
+                                    HeaderText="6月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month7" DataTextField="Month7" CommandName="7"
+                                    HeaderText="7月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month8" DataTextField="Month8" CommandName="8"
+                                    HeaderText="8月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month9" DataTextField="Month9" CommandName="9"
+                                    HeaderText="9月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month10" DataTextField="Month10" CommandName="10"
+                                    HeaderText="10月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month11" DataTextField="Month11" CommandName="11"
+                                    HeaderText="11月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                                <f:LinkButtonField Width="60px" ColumnID="Month12" DataTextField="Month12" CommandName="12"
+                                    HeaderText="12月" HeaderTextAlign="Center" TextAlign="Center" EnableAjax="false">
+                                </f:LinkButtonField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:RenderField Width="1px" ColumnID="ProjectId" DataField="ProjectId" Hidden="true"
+                            FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="月报" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true"
+            Width="1300px" Height="600px">
+        </f:Window>
+    </form>
+</body>
+</html>
@@ -0,0 +1,346 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.DigData
+{
+    public partial class CQMSDataCollect : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, false);
+                this.drpYear.SelectedValue = DateTime.Now.Year.ToString();
+                var getCQMSDataCollect = CQMSDataCollectService.GetCQMSDataCollectByYear(DateTime.Now.Year);
+                if (getCQMSDataCollect == null)
+                {
+                    CQMSDataCollectService.CreateCQMSDataCollectByYear(DateTime.Now.Year);
+                }
+                // 绑定表格
+                this.BindGrid();
+                this.BindGrid2();
+                if (this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId)
+                {
+                    this.btnRefresh.Hidden = false;
+                    this.btnDel.Hidden = false;
+                }
+            }
+        }
+
+        #endregion
+
+        #region 绑定数据Grid1
+        /// <summary>
+        /// 绑定数据Grid1
+        /// </summary>
+        private void BindGrid()
+        {
+            var getData = Funs.DB.Sp_DigData_CQMSDataCollect(Funs.GetNewIntOrZero(this.drpYear.SelectedValue));
+            DataTable tb = GetTreeDataTable(getData.ToList()); //this.LINQToDataTable(getData.ToList());
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 获取模拟树表格
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetTreeDataTable(List<Model.DigDataCQMSDataCollectItem> getData)
+        {
+            DataTable table = new DataTable();
+            table.Columns.Add(new DataColumn("CQMSDataCollectItemId", typeof(string)));
+            table.Columns.Add(new DataColumn("ParentId", typeof(string)));
+            table.Columns.Add(new DataColumn("SortIndex", typeof(string)));
+            table.Columns.Add(new DataColumn("CQMSContent", typeof(string)));
+            table.Columns.Add(new DataColumn("MeasureUnit", typeof(string)));
+            table.Columns.Add(new DataColumn("Month1", typeof(string)));
+            table.Columns.Add(new DataColumn("Month2", typeof(string)));
+            table.Columns.Add(new DataColumn("Month3", typeof(string)));
+            table.Columns.Add(new DataColumn("Month4", typeof(string)));
+            table.Columns.Add(new DataColumn("Month5", typeof(string)));
+            table.Columns.Add(new DataColumn("Month6", typeof(string)));
+            table.Columns.Add(new DataColumn("Month7", typeof(string)));
+            table.Columns.Add(new DataColumn("Month8", typeof(string)));
+            table.Columns.Add(new DataColumn("Month9", typeof(string)));
+            table.Columns.Add(new DataColumn("Month10", typeof(string)));
+            table.Columns.Add(new DataColumn("Month11", typeof(string)));
+            table.Columns.Add(new DataColumn("Month12", typeof(string)));
+            table.Columns.Add(new DataColumn("MonthSum", typeof(string)));
+            table.Columns.Add(new DataColumn("IntS", typeof(int)));
+            DataRow row;
+            for (int i = 1; i <= 4; i++)
+            {
+                row = table.NewRow();
+                row[0] = i.ToString();
+                row[1] = "-1";
+                row[2] = i.ToString();
+                row[3] = getSupCQMSContent(i);
+                row[18] = i;
+                table.Rows.Add(row);
+            }
+
+            foreach (var item in getData)
+            {
+                row = table.NewRow();
+                row[0] = item.CQMSDataCollectItemId;
+                row[1] = getSupID(item.SortIndex);
+                row[2] = row[1].ToString() + "." + getNewSortIndex(item.SortIndex);
+                row[3] = item.CQMSContent;
+                row[4] = item.MeasureUnit;
+                row[5] = item.Month1;
+                row[6] = item.Month2;
+                row[7] = item.Month3;
+                row[8] = item.Month4;
+                row[9] = item.Month5;
+                row[10] = item.Month6;
+                row[11] = item.Month7;
+                row[12] = item.Month8;
+                row[13] = item.Month9;
+                row[14] = item.Month10;
+                row[15] = item.Month11;
+                row[16] = item.Month12;
+                row[17] = item.MonthSum;
+                row[18] = item.SortIndex;
+                table.Rows.Add(row);
+            }
+            return table;
+        }
+
+        #region 获取父级名称
+        /// <summary>
+        /// 获取父级名称
+        /// </summary>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        private string getSupCQMSContent(int i)
+        {
+            string name = string.Empty;
+            switch (i)
+            {
+                case 1:
+                    name = "质量缺陷/不合格项整改关闭情况";
+                    break;
+                case 2:
+                    name = "无损检测情况";
+                    break;
+                case 3:
+                    name = "焊工资格评定情况";
+                    break;
+                case 4:
+                    name = "质量验收情况";
+                    break;
+                default:
+                    name = "";
+                    break;
+            }
+            return name;
+        }
+        #endregion
+
+        #region 获取父级ID
+        /// <summary>
+        /// 获取父级名称
+        /// </summary>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        private string getSupID(int sortIndex)
+        {
+            string supId = "-1";
+            if (sortIndex <= 4)
+            {
+                supId = "1";
+            }
+            else if (sortIndex > 4 && sortIndex <= 11)
+            {
+                supId = "2";
+            }
+            else if (sortIndex > 11 && sortIndex <= 17)
+            {
+                supId = "3";
+            }
+            else if (sortIndex > 17)
+            {
+                supId = "4";
+            }
+            return supId;
+        }
+
+        private string getNewSortIndex(int sortIndex)
+        {
+            int supId = 1;
+            if (sortIndex <= 6)
+            {
+                supId = sortIndex;
+            }
+            else if (sortIndex >= 8 && sortIndex <= 18)
+            {
+                supId = sortIndex - 7;
+            }
+            else if (sortIndex >= 22 && sortIndex <= 24)
+            {
+                supId = sortIndex - 21;
+            }
+            else if (sortIndex >= 25 && sortIndex <= 35)
+            {
+                supId = sortIndex - 24;
+            }
+            else if (sortIndex >= 36 && sortIndex <= 37)
+            {
+                supId = sortIndex - 35;
+            }
+            else if (sortIndex >= 38 && sortIndex <= 39)
+            {
+                supId = sortIndex - 37;
+            }
+
+            return supId.ToString();
+        }
+        #endregion
+        #endregion
+
+        #region 绑定数据Grid2
+        /// <summary>
+        /// 绑定数据Grid2
+        /// </summary>
+        private void BindGrid2()
+        {
+            string strSql = @"SELECT CQMSDataCollectSubmissionId,CQMSDataCollectId,Year,C.ProjectId,P.ProjectCode,P.ProjectName, Month1,Month2,Month3,Month4,Month5,Month6,Month7,Month8,Month9,Month10,Month11,Month12
+                                FROM dbo.DigData_CQMSDataCollectSubmission AS C 
+                                LEFT JOIN Base_Project AS P ON C.ProjectId=P.ProjectId
+                                WHERE (Month1 IS NOT NULL OR Month2 IS NOT NULL OR Month3 IS NOT NULL OR Month4 IS NOT NULL OR Month5 IS NOT NULL OR Month6 IS NOT NULL OR Month7 IS NOT NULL OR Month8 IS NOT NULL OR Month9 IS NOT NULL OR Month10 IS NOT NULL OR Month11 IS NOT NULL OR Month12 IS NOT NULL)
+                                    AND  ProjectState ='1'  ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            if (this.drpYear.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND Year = @Year";
+                listStr.Add(new SqlParameter("@Year", Funs.GetNewInt(this.drpYear.SelectedValue)));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid2.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid2, tb);
+            Grid2.DataSource = table;
+            Grid2.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            int year = Funs.GetNewInt(this.drpYear.SelectedValue) ?? DateTime.Now.Year;
+            var getCQMSDataCollect = CQMSDataCollectService.GetCQMSDataCollectByYear(year);
+            if (getCQMSDataCollect == null)
+            {
+                CQMSDataCollectService.CreateCQMSDataCollectByYear(year);
+            }
+            this.BindGrid();
+            this.BindGrid2();
+        }
+        #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnRefresh_Click(object sender, EventArgs e)
+        {
+            int year = Funs.GetNewInt(this.drpYear.SelectedValue) ?? DateTime.Now.Year;
+            var getCheck_CheckMonths = from x in Funs.DB.Check_CheckMonth
+                                        where x.Months.Value.Year == year
+                                        orderby x.Months
+                                       select x;
+            if (getCheck_CheckMonths.Count() > 0)
+            {
+                foreach (var item in getCheck_CheckMonths)
+                {
+                    BLL.CQMSDataCollectService.SaveCQMSDataCollectItem(item);
+                }
+            }
+            this.BindGrid();
+            this.BindGrid2();
+            ShowNotify("刷新完成！", MessageBoxIcon.Success);
+        }
+
+        protected void Grid2_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            int? year = Funs.GetNewInt(this.drpYear.SelectedValue);
+            int? month = Funs.GetNewInt(e.CommandName);
+            if (year.HasValue && month.HasValue)
+            {
+                var getSubmission = Funs.DB.DigData_CQMSDataCollectSubmission.FirstOrDefault(x => x.CQMSDataCollectSubmissionId == e.RowID);
+                if (getSubmission != null)
+                {
+                    var getMont = Funs.DB.Check_CheckMonth.FirstOrDefault(x => x.Months.Value.Year == year.Value && x.Months.Value.Month == month.Value && x.ProjectId == getSubmission.ProjectId);
+                    if (getMont != null)
+                    {
+                        PrinterDocService.PrinterDocMethod(Const.CheckMonthMenuId, getMont.CheckMonthId, "质量月报");
+                    }
+                }
+            }
+            else
+            {
+                Alert.ShowInParent("当前月报不存在！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+
+        //protected void Grid1_Collapse(object sender, EventArgs e)
+        //{
+        //    this.Grid2.Collapsed = !this.Grid1.Collapsed;
+        //}
+
+        //protected void Grid2_Collapse(object sender, EventArgs e)
+        //{
+        //    this.Grid1.Collapsed = !this.Grid2.Collapsed;
+        //}
+
+        protected void rblShow_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.rblShow.SelectedValue == "1")
+            {
+                this.Grid1.Hidden = false;
+                this.Grid2.Hidden = true;
+            }
+            else if (this.rblShow.SelectedValue == "2")
+            {
+                this.Grid1.Hidden = true;
+                this.Grid2.Hidden = false;
+            }
+            else
+            {
+                this.Grid1.Hidden = false;
+                this.Grid2.Hidden = false;
+            }
+        }
+
+        protected void btnDel_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.drpYear.SelectedValue))
+            {
+                int year = Funs.GetNewInt(this.drpYear.SelectedValue) ?? DateTime.Now.Year;
+                CQMSDataCollectService.DeleteCQMSDataCollect(year);
+                this.BindGrid();
+                this.BindGrid2();
+                ShowNotify("删除成功！", MessageBoxIcon.Success);
+            }
+        }
+    }
+}
@@ -0,0 +1,123 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DigData {
+    
+    
+    public partial class CQMSDataCollect {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// drpYear 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpYear;
+        
+        /// <summary>
+        /// rblShow 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblShow;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDel;
+        
+        /// <summary>
+        /// btnRefresh 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnRefresh;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+    }
+}
@@ -17,3 +17,155 @@ IP地址:::1

 出错时间:09/07/2023 21:53:15

+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.CQMS.Check.EditCheckMonth.Page_Load(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\CQMS\Check\EditCheckMonth.aspx.cs:行号 39
+   在 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)
+出错时间:09/11/2023 11:02:10
+出错文件:http://localhost:6422/CQMS/Check/EditCheckMonth.aspx?months=2023-09-01
+IP地址:::1
+
+出错时间:09/11/2023 11:02:10
+
+
+错误信息开始=====>
+错误类型:HttpRequestValidationException
+错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m&#179;")中检测到有潜在危险的 Request.Form 值。
+错误堆栈:
+   在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.get_Form()
+   在 System.Web.HttpRequest.get_HasForm()
+   在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull)
+   在 System.Web.UI.Page.DeterminePostBackMode()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest()
+   在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context)
+   在 System.Web.UI.Page.ProcessRequest(HttpContext context)
+   在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:09/12/2023 09:47:37
+出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/12/2023 09:47:37
+
+
+错误信息开始=====>
+错误类型:HttpRequestValidationException
+错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m&#179;")中检测到有潜在危险的 Request.Form 值。
+错误堆栈:
+   在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.get_Form()
+   在 System.Web.HttpRequest.get_HasForm()
+   在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull)
+   在 System.Web.UI.Page.DeterminePostBackMode()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest()
+   在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context)
+   在 System.Web.UI.Page.ProcessRequest(HttpContext context)
+   在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:09/12/2023 09:47:40
+出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/12/2023 09:47:40
+
+
+错误信息开始=====>
+错误类型:HttpRequestValidationException
+错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m&#179;")中检测到有潜在危险的 Request.Form 值。
+错误堆栈:
+   在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.get_Form()
+   在 System.Web.HttpRequest.get_HasForm()
+   在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull)
+   在 System.Web.UI.Page.DeterminePostBackMode()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest()
+   在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context)
+   在 System.Web.UI.Page.ProcessRequest(HttpContext context)
+   在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:09/12/2023 09:47:42
+出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/12/2023 09:47:42
+
+
+错误信息开始=====>
+错误类型:HttpRequestValidationException
+错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m&#179;")中检测到有潜在危险的 Request.Form 值。
+错误堆栈:
+   在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.get_Form()
+   在 System.Web.HttpRequest.get_HasForm()
+   在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull)
+   在 System.Web.UI.Page.DeterminePostBackMode()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest()
+   在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context)
+   在 System.Web.UI.Page.ProcessRequest(HttpContext context)
+   在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:09/12/2023 09:48:38
+出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/12/2023 09:48:38
+
+
+错误信息开始=====>
+错误类型:HttpRequestValidationException
+错误信息:从客户端(Panel1$Grid1$ctl04$txtUnit="m&#179;")中检测到有潜在危险的 Request.Form 值。
+错误堆栈:
+   在 System.Web.HttpRequest.ValidateString(String value, String collectionKey, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.ValidateHttpValueCollection(HttpValueCollection collection, RequestValidationSource requestCollection)
+   在 System.Web.HttpRequest.get_Form()
+   在 System.Web.HttpRequest.get_HasForm()
+   在 System.Web.UI.Page.GetCollectionBasedOnMethod(Boolean dontReturnNull)
+   在 System.Web.UI.Page.DeterminePostBackMode()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+   在 System.Web.UI.Page.ProcessRequest()
+   在 System.Web.UI.Page.ProcessRequestWithNoAssert(HttpContext context)
+   在 System.Web.UI.Page.ProcessRequest(HttpContext context)
+   在 ASP.jdgl_check_planset_aspx.ProcessRequest(HttpContext context)
+   在 System.Web.HttpApplication.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:09/12/2023 09:48:39
+出错文件:http://localhost:6422/JDGL/Check/PlanSet.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:09/12/2023 09:48:39
+
@@ -525,6 +525,7 @@
    <Content Include="DataShow\SecurityRiskItem.aspx" />
    <Content Include="DataShow\WorkingHours.aspx" />
    <Content Include="DataShow\WorkingHoursItem.aspx" />
+    <Content Include="DigData\CQMSDataCollect.aspx" />
    <Content Include="DigData\CQMSDataDW.aspx" />
    <Content Include="DigData\HSEDataDW.aspx" />
    <Content Include="DigData\HTGLDataDW.aspx" />
@@ -7612,6 +7613,13 @@
    <Compile Include="DataShow\WorkingHoursItem.aspx.designer.cs">
      <DependentUpon>WorkingHoursItem.aspx</DependentUpon>
    </Compile>
+    <Compile Include="DigData\CQMSDataCollect.aspx.cs">
+      <DependentUpon>CQMSDataCollect.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="DigData\CQMSDataCollect.aspx.designer.cs">
+      <DependentUpon>CQMSDataCollect.aspx</DependentUpon>
+    </Compile>
    <Compile Include="DigData\CQMSDataDW.aspx.cs">
      <DependentUpon>CQMSDataDW.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PlanSet.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.PlanSet" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PlanSet.aspx.cs" Inherits="FineUIPro.Web.JDGL.Check.PlanSet" ValidateRequest="false" %>

 <!DOCTYPE html>

@@ -110,6 +110,10 @@ namespace FineUIPro.Web.JDGL.Check
                        {
                            string weights = values.Value<string>("JDWeights");
                            string unit = values.Value<string>("Unit");
+                            if (unit == "m&#179;")
+                            {
+                                unit = "m³";
+                            }
                            string planProjectQuantity = values.Value<string>("PlanProjectQuantity");
                            string realProjectQuantity = values.Value<string>("RealProjectQuantity");
                            string planStartDate = values.Value<string>("PlanStartDate");
@@ -3,7 +3,7 @@
  <TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
    <TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
    </TreeNode>
-<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据仓库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
+<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
 <TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@@ -12,7 +12,7 @@
 </TreeNode>
 <TreeNode id="E7F7BC38-7357-49C0-9242-68289031F618" Text="进度数据库" NavigateUrl=""><TreeNode id="44D51E89-267D-4D72-AB6D-1F4CA4E7D19D" Text="进度数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/HTGLDataDW.aspx"></TreeNode>
+<TreeNode id="381A4608-2CDE-42AF-BC4D-FF554785B9F8" Text="合同数据库" NavigateUrl=""><TreeNode id="ABC4323E-2F6F-4147-AA7A-8726131D7044" Text="合同数据库" NavigateUrl="DigData/JDGLDataDW.aspx"></TreeNode>
 <TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
 <TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
 </TreeNode>
@@ -20,7 +20,7 @@
 </TreeNode>
 <TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
 <TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
-<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl=""></TreeNode>
+<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
 <TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
 </TreeNode>
 </TreeNode>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
+  <TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划设置" NavigateUrl="JDGL/Check/PlanSet.aspx">
  </TreeNode>
 <TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
 <TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
@@ -13,6 +13,7 @@
 <TreeNode id="87867EA8-576A-4166-AE7A-7416115DF30B" Text="工程联络单" NavigateUrl="CQMS/Check/TechnicalContactList.aspx"></TreeNode>
 <TreeNode id="38F11FC6-E9F0-4ABD-BD78-BB1807EA3CE3" Text="设计变更" NavigateUrl="CQMS/Check/Design.aspx"></TreeNode>
 <TreeNode id="3A9039B2-20DC-47FA-A943-E3604FBBF699" Text="施工图纸" NavigateUrl="CQMS/Check/Draw.aspx"></TreeNode>
+<TreeNode id="F50EDEF0-FCDE-4B84-8D30-1F16E03FE26F" Text="施工月报" NavigateUrl="PZHGL/InformationProject/ConstructionMonthReport.aspx"></TreeNode>
 <TreeNode id="25AC041E-0B27-4D7C-860B-1A06518B6673" Text="文件柜" NavigateUrl=""><TreeNode id="F274F84A-B648-4ABA-99D4-993AA6D1143A" Text="工作联系单" NavigateUrl="CQMS/Check/WorkContactFile.aspx"></TreeNode>
 </TreeNode>
 </Tree>
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="831FA803-E2E9-4674-9B56-44E5A5DDCB1A" Text="自动上报集团对接" NavigateUrl="">
-    <TreeNode id="FFD221D7-AE05-447F-8727-80058A04F401" Text="接口设置" NavigateUrl="TaskScheduling/InterFace/InterFaceSet.aspx">
+  <TreeNode id="D78C6E54-4240-4E82-B9B5-8ED76CF62981" Text="劳务实名制对接" NavigateUrl="">
+    <TreeNode id="1E451E0C-A125-4117-B8AC-14E74011B52B" Text="同步设置" NavigateUrl="ZHGL/RealName/SynchroSet.aspx">
    </TreeNode>
-<TreeNode id="FFD221D7-AE05-447F-8727-80058A04F402" Text="任务清单" NavigateUrl="TaskScheduling/InterFace/InterFaceTask.aspx"></TreeNode>
-<TreeNode id="FFD221D7-AE05-447F-8727-80058A04F404" Text="数据调用日志" NavigateUrl="TaskScheduling/InterFace/IFLogList.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="D78C6E54-4240-4E82-B9B5-8ED76CF62981" Text="劳务实名制对接" NavigateUrl=""><TreeNode id="1E451E0C-A125-4117-B8AC-14E74011B52B" Text="同步设置" NavigateUrl="ZHGL/RealName/SynchroSet.aspx"></TreeNode>
 <TreeNode id="C0B52610-ED93-4881-AC61-1764C243F84A" Text="基础数据" NavigateUrl="ZHGL/RealName/BasicData.aspx"></TreeNode>
 <TreeNode id="F36E6C54-E39F-4032-874D-548EE090A35B" Text="同步记录" NavigateUrl="ZHGL/RealName/SynchroRecord.aspx"></TreeNode>
 </TreeNode>
@@ -19,19 +15,11 @@
 <TreeNode id="C619988F-307B-4A39-B518-7F45CA7326F5" Text="检查记录" NavigateUrl=""></TreeNode>
 <TreeNode id="DEE90726-E00D-462B-A4BF-7E36180DD5B8" Text="项目绩效评价" NavigateUrl="OfficeCheck/ProjectEvaluation/ProjectEvaluation.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="企业安全数据统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
+<TreeNode id="ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001" Text="安全信息上报" NavigateUrl=""><TreeNode id="3156A9F0-276D-4AD4-BF84-45CF6DFC215C" Text="百万工时安全统计月报" NavigateUrl="ZHGL/Information/MillionsMonthlyReport.aspx"></TreeNode>
 <TreeNode id="4BC71D2E-7D94-48C1-A61A-139637825AA5" Text="职工伤亡事故原因分析报" NavigateUrl="ZHGL/Information/AccidentCauseReport.aspx"></TreeNode>
+<TreeNode id="A3894BAD-3F4A-4BB4-98CF-A76C588AE53F" Text="安全生产数据季报" NavigateUrl="ZHGL/Information/SafetyQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="7985C759-8EB9-4B7D-AC65-00541280B46C" Text="应急演练开展情况季报" NavigateUrl="ZHGL/Information/DrillConductedQuarterlyReport.aspx"></TreeNode>
 <TreeNode id="70DEB27A-D6FF-4D57-879B-0270F2967FA0" Text="应急演练工作计划半年报" NavigateUrl="ZHGL/Information/DrillPlanHalfYearReport.aspx"></TreeNode>
-<TreeNode id="AAC7C263-6E25-49DC-985B-DC3FA7AAF3A1" Text="实业安全简报" NavigateUrl="ZHGL/Information/SafetyBriefing.aspx"></TreeNode>
-<TreeNode id="07FEEC9D-09C1-4C19-9269-62F69532086C" Text="安全管理工作总结报告" NavigateUrl="ZHGL/Information/WorkSummaryReport.aspx"></TreeNode>
-<TreeNode id="CF9C1F00-34B8-42E5-B2D1-704094169CA3" Text="季度工程项目质量信息表" NavigateUrl="ZHGL/Information/QuarterlyProjectQuality.aspx"></TreeNode>
-<TreeNode id="12941594-2171-411A-8CC8-32E3BD9FCDDF" Text="质量管理工作总结报告" NavigateUrl="ZHGL/Information/QualityWorkSummaryReport.aspx"></TreeNode>
-<TreeNode id="5B344750-79DD-40AA-8AA7-34B04E41FA72" Text="生态环保工作总结报告" NavigateUrl="ZHGL/Information/EPSummaryReport.aspx"></TreeNode>
-<TreeNode id="7C47F078-D4C9-40D9-BEEF-E657EAFEC650" Text="建筑行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ArchitectureReport.aspx"></TreeNode>
-<TreeNode id="ECDD89AC-1E16-4D82-B3BE-5D62F31B7A14" Text="化工行业能源节约与生态环境保护汇总表" NavigateUrl="ZHGL/Environmental/ChemicalReport.aspx"></TreeNode>
-<TreeNode id="7652D239-1897-4886-8DF2-B71E3B060D21" Text="中央企业节能环保产业企业基本情况和经营情况报表" NavigateUrl="ZHGL/Environmental/OperationReport.aspx"></TreeNode>
-<TreeNode id="30579BFE-AB4B-49A7-A73D-B7CE902A8B69" Text="中央企业节能环保产业企业生产和服务业务情况报表" NavigateUrl="ZHGL/Environmental/EnergyReport.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="76E236DA-DDFC-4CE8-8CB8-02F8A27A8535" Text="专业技术方案评审" NavigateUrl=""><TreeNode id="B6A2B6EB-6B90-4953-B544-83FFF4F0EC19" Text="安全实施计划" NavigateUrl="ZHGL/Plan/ActionPlanList.aspx"></TreeNode>
 <TreeNode id="B9ADD006-BA46-4191-BCD1-CCB56767C82B" Text="总包施工质量计划" NavigateUrl="ZHGL/Plan/MainPlan.aspx"></TreeNode>
@@ -90,9 +78,4 @@
 </TreeNode>
 <TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
 <TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""></TreeNode>
-<TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
-<TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
-<TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>
-<TreeNode id="S89E5EC2-F725-4656-9110-5AF83C18FB6C" Text="实业数据" NavigateUrl="ZHGL/DataSync/SYHSEData_Data.aspx"></TreeNode>
-</TreeNode>
 </Tree>
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class DigDataCQMSDataCollectItem
+    {
+        public string CQMSDataCollectItemId
+        {
+            get;
+            set;
+        }
+        public string CQMSDataCollectId
+        {
+            get;
+            set;
+        }
+        public int SortIndex
+        {
+            get;
+            set;
+        }
+
+        public string CQMSContent
+        {
+            get;
+            set;
+        }
+        public string MeasureUnit
+        {
+            get;
+            set;
+        }
+
+        public string Month1
+        {
+            get;
+            set;
+        }
+        public string Month2
+        {
+            get;
+            set;
+        }
+        public string Month3
+        {
+            get;
+            set;
+        }
+        public string Month4
+        {
+            get;
+            set;
+        }
+        public string Month5
+        {
+            get;
+            set;
+        }
+        public string Month6
+        {
+            get;
+            set;
+        }
+        public string Month7
+        {
+            get;
+            set;
+        }
+        public string Month8
+        {
+            get;
+            set;
+        }
+        public string Month9
+        {
+            get;
+            set;
+        }
+        public string Month10
+        {
+            get;
+            set;
+        }
+        public string Month11
+        {
+            get;
+            set;
+        }
+        public string Month12
+        {
+            get;
+            set;
+        }
+        public string MonthSum
+        {
+            get;
+            set;
+        }
+    }
+}
@@ -177,6 +177,7 @@
    <Compile Include="Chart\DataSourcePoint.cs" />
    <Compile Include="Chart\DataSourceTeam.cs" />
    <Compile Include="CQMS\CheckItem.cs" />
+    <Compile Include="CQMS\DigDataCQMSDataCollectItem.cs" />
    <Compile Include="CQMS\FileCabinetItem.cs" />
    <Compile Include="CQMS\NDTCheckItem.cs" />
    <Compile Include="CQMS\QualityAcceptanceItem.cs" />
@@ -85,5 +85,18 @@ namespace Model
            IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), year);
            return (ISingleResult<DigDataHSEDataCollectItem>)result.ReturnValue;
        }
+
+        /// <summary>
+        /// »ñÈ¡ÖÊÁ¿Êý¾Ý»ã×Ü
+        /// </summary>
+        /// <param name="unitcode"></param>
+        /// <param name="isono"></param>
+        /// <returns></returns>
+        [Function(Name = "[dbo].[Sp_DigData_CQMSDataCollect]")]
+        public IEnumerable<DigDataCQMSDataCollectItem> Sp_DigData_CQMSDataCollect([Parameter(DbType = "INT")] int year)
+        {
+            IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), year);
+            return (ISingleResult<DigDataCQMSDataCollectItem>)result.ReturnValue;
+        }
    }
 }
@@ -338,6 +338,26 @@ namespace Mvc.Controllers
                            {
                                item.IsShow = true;
                            }
+                            //处理工作包实际完成时间
+                            if (c.CheckNum != null && c.CheckNum != 0) //检查次数为0表示一直检查
+                            {
+                                if (c.CheckNum == 1)   //检查一次
+                                {
+                                    c.RealEndDate = DateTime.Now;
+                                    BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c);
+                                    BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
+                                }
+                                else  //检查多次
+                                {
+                                    List<Model.Check_SpotCheckDetail> details = BLL.SpotCheckDetailService.GetSpotCheckDetailsByControlItemAndCycleId(c.ControlItemAndCycleId);
+                                    if (details.Count == c.CheckNum)  //检查次数已达到最大值
+                                    {
+                                        c.RealEndDate = DateTime.Now;
+                                        BLL.ControlItemAndCycleService.UpdateControlItemAndCycle(c);
+                                        BLL.WorkPackageService.UpdateWorkPackageRealEndDate(c.WorkPackageId);
+                                    }
+                                }
+                            }
                        }
                        item.State = BLL.Const.SpotCheck_Audit5;
                        item.HandleMan = spotCheck1.CreateMan;