20210520

DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-19-001.sql

@@ -0,0 +1,613 @@
+alter table JDGL_QuantityCompletion add StartDate datetime null
+alter table JDGL_QuantityCompletion add EndDate datetime null
+GO
+
+
+ALTER VIEW [dbo].[View_JDGL_QuantityCompletion]
+AS
+select qc.*,ql.DesignNum,ql.Name,ql.Unit,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalPlanNum,
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalRealNum,
+                            CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(qc.PlanNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL(qc.RealNum,0) / (1.0 *qc.PlanNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE (select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and EndDate<=getdate()) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and EndDate<=getdate())) END AS DECIMAL(9,2)))))+'%'
+		AS TotalRate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ql.DesignNum,0) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *ql.DesignNum) END AS DECIMAL(9,2)))))+'%'
+		AS SumRate,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalPlanNum, 
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalRealNum
+                            from [dbo].JDGL_QuantityList ql
+							left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
+where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from [JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId order by q.EndDate desc)
+
+
+
+GO
+
+
+
+CREATE TABLE [dbo].[JDGL_SteelStructureCompletion](
+	[SteelStructureCompletionId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[TotalNum] [decimal](18, 2) NULL,
+	[ArrivalNum] [decimal](18, 2) NULL,
+	[ThisNum] [decimal](18, 2) NULL,
+	[StartDate] [datetime] NULL,
+	[EndDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JDGL_SteelStructureCompletion] PRIMARY KEY CLUSTERED 
+(
+	[SteelStructureCompletionId] 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].[JDGL_SteelStructureCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_SteelStructureCompletion_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JDGL_SteelStructureCompletion] CHECK CONSTRAINT [FK_JDGL_SteelStructureCompletion_Base_Project]
+GO
+
+ALTER TABLE [dbo].[JDGL_SteelStructureCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_SteelStructureCompletion_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[JDGL_SteelStructureCompletion] CHECK CONSTRAINT [FK_JDGL_SteelStructureCompletion_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[JDGL_SteelStructureCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_SteelStructureCompletion_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[JDGL_SteelStructureCompletion] CHECK CONSTRAINT [FK_JDGL_SteelStructureCompletion_Sys_User]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'SteelStructureCompletionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'总量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'TotalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'到货数量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'ArrivalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本周期安装数量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'ThisNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'StartDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'EndDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'钢结构完成情况表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_SteelStructureCompletion'
+GO
+
+
+
+CREATE VIEW [dbo].[View_JDGL_SteelStructureCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_SteelStructureCompletion where UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_SteelStructureCompletion where UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_SteelStructureCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.SteelStructureCompletionId=(select top 1 SteelStructureCompletionId from JDGL_SteelStructureCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+GO
+
+
+
+CREATE TABLE [dbo].[JDGL_EquipmentCompletion](
+	[EquipmentCompletionId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[TotalNum] [decimal](18, 2) NULL,
+	[ArrivalNum] [decimal](18, 2) NULL,
+	[ThisNum] [decimal](18, 2) NULL,
+	[StartDate] [datetime] NULL,
+	[EndDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JDGL_EquipmentCompletion] PRIMARY KEY CLUSTERED 
+(
+	[EquipmentCompletionId] 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].[JDGL_EquipmentCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_EquipmentCompletion_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JDGL_EquipmentCompletion] CHECK CONSTRAINT [FK_JDGL_EquipmentCompletion_Base_Project]
+GO
+
+ALTER TABLE [dbo].[JDGL_EquipmentCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_EquipmentCompletion_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[JDGL_EquipmentCompletion] CHECK CONSTRAINT [FK_JDGL_EquipmentCompletion_Base_Unit]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'EquipmentCompletionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设备总数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'TotalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'已到场数量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'ArrivalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安装就位数量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'ThisNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'StartDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'EndDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'设备完成情况表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_EquipmentCompletion'
+GO
+
+
+
+CREATE VIEW [dbo].[View_JDGL_EquipmentCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_EquipmentCompletion where UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(FLOAT,ss.ArrivalNum-(select sum(ISNULL(ThisNum,0)) from JDGL_EquipmentCompletion where UnitId=ss.UnitId and EndDate<=getdate())) as TotalLastThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_EquipmentCompletion where UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_EquipmentCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.EquipmentCompletionId=(select top 1 EquipmentCompletionId from JDGL_EquipmentCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+GO
+
+
+
+CREATE TABLE [dbo].[JDGL_PipelineCompletion](
+	[PipelineCompletionId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[TotalNum] [decimal](18, 2) NULL,
+	[ThisNum] [decimal](18, 2) NULL,
+	[StartDate] [datetime] NULL,
+	[EndDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JDGL_PipelineCompletion] PRIMARY KEY CLUSTERED 
+(
+	[PipelineCompletionId] 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].[JDGL_PipelineCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_PipelineCompletion_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JDGL_PipelineCompletion] CHECK CONSTRAINT [FK_JDGL_PipelineCompletion_Base_Project]
+GO
+
+ALTER TABLE [dbo].[JDGL_PipelineCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_PipelineCompletion_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[JDGL_PipelineCompletion] CHECK CONSTRAINT [FK_JDGL_PipelineCompletion_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[JDGL_PipelineCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_PipelineCompletion_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[JDGL_PipelineCompletion] CHECK CONSTRAINT [FK_JDGL_PipelineCompletion_Sys_User]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'PipelineCompletionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'总试压包数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'TotalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本期完成量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'ThisNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'StartDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'EndDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'管道完成情况表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_PipelineCompletion'
+GO
+
+
+CREATE VIEW [dbo].[View_JDGL_PipelineCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_PipelineCompletion where UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(FLOAT,ss.TotalNum-(select sum(ISNULL(ThisNum,0)) from JDGL_PipelineCompletion where UnitId=ss.UnitId and EndDate<=getdate())) as TotalLastThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_PipelineCompletion where UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_PipelineCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.PipelineCompletionId=(select top 1 PipelineCompletionId from JDGL_PipelineCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+GO
+
+
+CREATE TABLE [dbo].[JDGL_ElectricalCompletion](
+	[ElectricalCompletionId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[Name] [nvarchar](50) NULL,
+	[Unit] [nvarchar](50) NULL,
+	[TotalNum] [decimal](18, 2) NULL,
+	[ThisNum] [decimal](18, 2) NULL,
+	[StartDate] [datetime] NULL,
+	[EndDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JDGL_ElectricalCompletion] PRIMARY KEY CLUSTERED 
+(
+	[ElectricalCompletionId] 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].[JDGL_ElectricalCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_ElectricalCompletion_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JDGL_ElectricalCompletion] CHECK CONSTRAINT [FK_JDGL_ElectricalCompletion_Base_Project]
+GO
+
+ALTER TABLE [dbo].[JDGL_ElectricalCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_ElectricalCompletion_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[JDGL_ElectricalCompletion] CHECK CONSTRAINT [FK_JDGL_ElectricalCompletion_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[JDGL_ElectricalCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_ElectricalCompletion_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[JDGL_ElectricalCompletion] CHECK CONSTRAINT [FK_JDGL_ElectricalCompletion_Sys_User]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'ElectricalCompletionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工作项' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'Name'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'Unit'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工程量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'TotalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本期完成量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'ThisNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'StartDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'EndDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'电气完成情况表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ElectricalCompletion'
+GO
+
+
+CREATE VIEW [dbo].[View_JDGL_ElectricalCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_ElectricalCompletion where UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate())) as TotalThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_ElectricalCompletion where UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_ElectricalCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.ElectricalCompletionId=(select top 1 ElectricalCompletionId from JDGL_ElectricalCompletion q where q.UnitId=ss.UnitId and q.Name=ss.Name order by q.EndDate desc)
+
+
+
+
+
+GO
+
+
+CREATE TABLE [dbo].[JDGL_MeterCompletion](
+	[MeterCompletionId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[Name] [nvarchar](50) NULL,
+	[Unit] [nvarchar](50) NULL,
+	[TotalNum] [decimal](18, 2) NULL,
+	[ThisNum] [decimal](18, 2) NULL,
+	[StartDate] [datetime] NULL,
+	[EndDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JDGL_MeterCompletion] PRIMARY KEY CLUSTERED 
+(
+	[MeterCompletionId] 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].[JDGL_MeterCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_MeterCompletion_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[JDGL_MeterCompletion] CHECK CONSTRAINT [FK_JDGL_MeterCompletion_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[JDGL_MeterCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_MeterCompletion_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[JDGL_MeterCompletion] CHECK CONSTRAINT [FK_JDGL_MeterCompletion_Sys_User]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'MeterCompletionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工作项' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'Name'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'Unit'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'工程量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'TotalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本期完成量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'ThisNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'StartDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'EndDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'仪表完成情况表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_MeterCompletion'
+GO
+
+
+CREATE VIEW [dbo].[View_JDGL_MeterCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_MeterCompletion where UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate())) as TotalThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_MeterCompletion where UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_MeterCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.MeterCompletionId=(select top 1 MeterCompletionId from JDGL_MeterCompletion q where q.UnitId=ss.UnitId and q.Name=ss.Name order by q.EndDate desc)
+
+
+
+
+
+GO
+
+
+
+CREATE TABLE [dbo].[JDGL_UndergroundPipeCompletion](
+	[UndergroundPipeCompletionId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[TotalNum] [decimal](18, 2) NULL,
+	[ThisNum] [decimal](18, 2) NULL,
+	[StartDate] [datetime] NULL,
+	[EndDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JDGL_UndergroundPipeCompletion] PRIMARY KEY CLUSTERED 
+(
+	[UndergroundPipeCompletionId] 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].[JDGL_UndergroundPipeCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_UndergroundPipeCompletion_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JDGL_UndergroundPipeCompletion] CHECK CONSTRAINT [FK_JDGL_UndergroundPipeCompletion_Base_Project]
+GO
+
+ALTER TABLE [dbo].[JDGL_UndergroundPipeCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_UndergroundPipeCompletion_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[JDGL_UndergroundPipeCompletion] CHECK CONSTRAINT [FK_JDGL_UndergroundPipeCompletion_Base_Unit]
+GO
+
+ALTER TABLE [dbo].[JDGL_UndergroundPipeCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_UndergroundPipeCompletion_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[JDGL_UndergroundPipeCompletion] CHECK CONSTRAINT [FK_JDGL_UndergroundPipeCompletion_Sys_User]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'UndergroundPipeCompletionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'UnitId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'DIN/米' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'TotalNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'本期完成量' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'ThisNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'StartDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'EndDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'全厂地下管网完成情况表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_UndergroundPipeCompletion'
+GO
+
+
+CREATE VIEW [dbo].[View_JDGL_UndergroundPipeCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_UndergroundPipeCompletion where UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(FLOAT,ss.TotalNum-(select sum(ISNULL(ThisNum,0)) from JDGL_UndergroundPipeCompletion where UnitId=ss.UnitId and EndDate<=getdate())) as TotalLastThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_UndergroundPipeCompletion where UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_UndergroundPipeCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.UndergroundPipeCompletionId=(select top 1 UndergroundPipeCompletionId from JDGL_UndergroundPipeCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+GO
+
+
+
+/*******安全隐患********/
+ALTER VIEW [dbo].[View_Technique_RectifyItem]
+AS
+SELECT M.RectifyItemId, 
+	M.RectifyId, 
+	M.HazardSourcePoint, 
+	M.RiskAnalysis, 
+	M.RiskPrevention, 
+	M.SimilarRisk,
+	R.RectifyName,
+	R.RectifyCode,
+	M.CompileMan,
+	M.CompileDate,
+	M.AuditMan,
+	M.AuditDate,
+	M.IsPass,
+	U.UserName AS CompileManName,
+	UR.UserName AS AuditManName,
+	CAST(0 AS BIT) as IsSelected
+FROM dbo.Technique_RectifyItem AS M
+LEFT JOIN dbo.Technique_Rectify AS R ON R.RectifyId=M.RectifyId
+LEFT JOIN dbo.Sys_User AS U ON U.UserId=M.CompileMan
+LEFT JOIN dbo.Sys_User AS UR ON U.UserId=M.AuditMan
+
+GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('29F27641-06ED-435A-9F9B-FCE6366801BE','企业监督检查整改','HSSE/Hazard/ProjectSuperviseCheckRectify.aspx',65,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
+GO
+--企业监督检查整改
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+VALUES('B6BC2531-A381-4843-9E08-C49EFB3B541B','29F27641-06ED-435A-9F9B-FCE6366801BE','修改',2)	
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+VALUES('FBBC83E5-DF22-4995-8086-CB7A970CE2D3','29F27641-06ED-435A-9F9B-FCE6366801BE','保存',4)  
+GO

DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-21-001.sql

@@ -0,0 +1,232 @@
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('F3AA42B3-5776-4992-A625-1216C579FEDE','项目进度情况','JDGL/Check/ProgressCompletion.aspx',60,'0','Menu_JDGL',0,1,1)
+GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('8232DE3C-307C-49ED-9A37-6C29A94AABDF','F3AA42B3-5776-4992-A625-1216C579FEDE','增加',1)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('BFF4796D-734B-49C3-BAEA-D15437D72BA4','F3AA42B3-5776-4992-A625-1216C579FEDE','修改',2)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('9884E883-9C71-4F76-A7E0-BBC030911548','F3AA42B3-5776-4992-A625-1216C579FEDE','删除',3)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('08C87DB8-494D-47F3-B271-7548CCE72E7A','F3AA42B3-5776-4992-A625-1216C579FEDE','保存',4)
+     GO
+
+
+
+CREATE TABLE [dbo].[JDGL_ProgressCompletion](
+	[ProgressCompletionId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[Months] [datetime] NULL,
+	[PlanNum] [decimal](9, 2) NULL,
+	[RealNum] [decimal](9, 2) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+ CONSTRAINT [PK_JDGL_ProgressCompletion] PRIMARY KEY CLUSTERED 
+(
+	[ProgressCompletionId] 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].[JDGL_ProgressCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_ProgressCompletion_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[JDGL_ProgressCompletion] CHECK CONSTRAINT [FK_JDGL_ProgressCompletion_Base_Project]
+GO
+
+ALTER TABLE [dbo].[JDGL_ProgressCompletion]  WITH CHECK ADD  CONSTRAINT [FK_JDGL_ProgressCompletion_Sys_User] FOREIGN KEY([CompileMan])
+REFERENCES [dbo].[Sys_User] ([UserId])
+GO
+
+ALTER TABLE [dbo].[JDGL_ProgressCompletion] CHECK CONSTRAINT [FK_JDGL_ProgressCompletion_Sys_User]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ProgressCompletion', @level2type=N'COLUMN',@level2name=N'ProgressCompletionId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ProgressCompletion', @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'JDGL_ProgressCompletion', @level2type=N'COLUMN',@level2name=N'Months'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'当月计划值' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ProgressCompletion', @level2type=N'COLUMN',@level2name=N'PlanNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'当月完成值' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ProgressCompletion', @level2type=N'COLUMN',@level2name=N'RealNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ProgressCompletion', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ProgressCompletion', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目进度情况表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'JDGL_ProgressCompletion'
+GO
+
+
+CREATE VIEW [dbo].[View_JDGL_ProgressCompletion]
+AS
+select ss.ProgressCompletionId,ss.ProjectId,ss.Months,CONVERT(NVARCHAR(10),Year(ss.Months))+'-'+CONVERT(NVARCHAR(10),Month(ss.Months)) as MonthStr,CONVERT(NVARCHAR(10),CONVERT(FLOAT,ss.PlanNum))+'%' as PlanNumStr,CONVERT(NVARCHAR(10),CONVERT(FLOAT,ss.RealNum))+'%' as RealNumStr,
+        CONVERT(FLOAT,ISNULL(PlanNum,0)) as PlanNum,CONVERT(FLOAT,ISNULL(RealNum,0)) as RealNum,
+		CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_ProgressCompletion where ProjectId=ss.ProjectId and Months<=ss.Months)) as TotalPlanNum,
+		CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_ProgressCompletion where ProjectId=ss.ProjectId and Months<=ss.Months)) as TotalRealNum,
+		CONVERT(NVARCHAR(10),CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_ProgressCompletion where ProjectId=ss.ProjectId and Months<=ss.Months)))+'%' as TotalPlanNumStr,
+		CONVERT(NVARCHAR(10),CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_ProgressCompletion where ProjectId=ss.ProjectId and Months<=ss.Months)))+'%' as TotalRealNumStr
+                            from dbo.JDGL_ProgressCompletion ss
+
+GO
+
+
+ALTER VIEW [dbo].[View_JDGL_ElectricalCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_ElectricalCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate())) as TotalThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_ElectricalCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_ElectricalCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.ElectricalCompletionId=(select top 1 ElectricalCompletionId from JDGL_ElectricalCompletion q where q.UnitId=ss.UnitId and q.Name=ss.Name order by q.EndDate desc)
+
+
+
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_JDGL_EquipmentCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_EquipmentCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(FLOAT,ss.ArrivalNum-(select sum(ISNULL(ThisNum,0)) from JDGL_EquipmentCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate())) as TotalLastThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_EquipmentCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_EquipmentCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.EquipmentCompletionId=(select top 1 EquipmentCompletionId from JDGL_EquipmentCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_JDGL_MeterCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_MeterCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate())) as TotalThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_MeterCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and Name=ss.Name and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_MeterCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.MeterCompletionId=(select top 1 MeterCompletionId from JDGL_MeterCompletion q where q.UnitId=ss.UnitId and q.Name=ss.Name order by q.EndDate desc)
+
+
+
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_JDGL_PipelineCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_PipelineCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(FLOAT,ss.TotalNum-(select sum(ISNULL(ThisNum,0)) from JDGL_PipelineCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate())) as TotalLastThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_PipelineCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_PipelineCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.PipelineCompletionId=(select top 1 PipelineCompletionId from JDGL_PipelineCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_JDGL_QuantityCompletion]
+AS
+select qc.*,ql.DesignNum,ql.Name,ql.Unit,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalPlanNum,
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) as TotalRealNum,
+                            CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(qc.PlanNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL(qc.RealNum,0) / (1.0 *qc.PlanNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE (select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate())) END AS DECIMAL(9,2)))))+'%'
+		AS TotalRate,
+		                    CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ql.DesignNum,0) WHEN 0 THEN 0
+		ELSE 100*(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and EndDate<=getdate()) / (1.0 *ql.DesignNum) END AS DECIMAL(9,2)))))+'%'
+		AS SumRate,
+                            CONVERT(FLOAT,(select sum(ISNULL(PlanNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalPlanNum, 
+                            CONVERT(FLOAT,(select sum(ISNULL(RealNum,0)) from JDGL_QuantityCompletion where ProjectId=ql.ProjectId and QuantityListId=qc.QuantityListId and Months<qc.Months)) as LastTotalRealNum
+                            from [dbo].JDGL_QuantityList ql
+							left join dbo.[JDGL_QuantityCompletion] qc on ql.QuantityListId=qc.QuantityListId
+where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from [JDGL_QuantityCompletion] q where q.QuantityListId=qc.QuantityListId order by q.EndDate desc)
+
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_JDGL_SteelStructureCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_SteelStructureCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_SteelStructureCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_SteelStructureCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.SteelStructureCompletionId=(select top 1 SteelStructureCompletionId from JDGL_SteelStructureCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+
+GO
+
+
+
+ALTER VIEW [dbo].[View_JDGL_UndergroundPipeCompletion]
+AS
+select distinct ss.*,u.UnitName,
+                            CONVERT(FLOAT,(select sum(ISNULL(ThisNum,0)) from JDGL_UndergroundPipeCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate())) as TotalThisNum,
+                            CONVERT(FLOAT,ss.TotalNum-(select sum(ISNULL(ThisNum,0)) from JDGL_UndergroundPipeCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate())) as TotalLastThisNum,
+							CONVERT(NVARCHAR(10),((CAST(CASE ISNULL(ss.TotalNum,0) WHEN 0 THEN 0
+		ELSE 100*ISNULL((select sum(ISNULL(ThisNum,0)) from JDGL_UndergroundPipeCompletion where ProjectId=ss.ProjectId and UnitId=ss.UnitId and EndDate<=getdate()),0) / (1.0 *ss.TotalNum) END AS DECIMAL(9,2)))))+'%'
+		AS Rate
+                            from dbo.JDGL_UndergroundPipeCompletion ss
+							left join dbo.Base_Unit u on ss.UnitId=u.UnitId
+where ss.UndergroundPipeCompletionId=(select top 1 UndergroundPipeCompletionId from JDGL_UndergroundPipeCompletion q where q.UnitId=ss.UnitId order by q.EndDate desc)
+
+
+
+
+
+
+GO
+
+

DataBase/版本日志/已更新脚本/SGGLDB_V2021-04-24-001.sql

@@ -0,0 +1,60 @@
+ALTER PROCEDURE [dbo].[SpCheckDayStatistic]     
+	@ProjectId NVARCHAR(50),
+	@StartTime NVARCHAR(15)=NULL,        
+	@EndTime NVARCHAR(15)=NULL,
+	@States CHAR(1)=NULL,
+	@UnitName NVARCHAR(200)=NULL,
+	@WorkAreaName NVARCHAR(200)=NULL
+AS  
+/*日常巡检检查*/          
+BEGIN
+SELECT 	CheckDayDetail.CheckDayDetailId
+	,CheckDay.CheckDayId
+	,CheckDay.CheckDayId+','+ISNULL(CheckDayDetail.CheckDayDetailId,'') AS NewChcekId
+	,CodeRecords.Code AS CheckDayCode
+	,ISNULL(Checks.CheckCount,0) AS CheckCount	
+	,CheckDayDetail.WorkArea
+	,Unit.UnitName
+	,CheckDayDetail.CompleteStatus
+	,(CASE WHEN CheckDayDetail.CompleteStatus=1 THEN '已完成' ELSE '' END) AS CompleteStatusName
+	,CONVERT(VARCHAR(100), CheckDayDetail.LimitedDate, 23) AS LimitedDate
+	,CheckDayDetail.CompletedDate
+	,CheckDay.CheckPerson
+	,CONVERT(VARCHAR(100), CheckDay.CheckTime, 23) AS CheckTime
+	--,CheckDay.CheckTime
+	,CheckDayDetail.CheckItemType
+	,CheckDayDetail.CheckItem
+	,CheckDayDetail.HandleStep
+	,CheckDayDetail.Unqualified
+	,(CASE WHEN CheckDay.States='0' OR CheckDay.States IS NULL THEN '待['+ISNULL(OperateUser.UserName,Users.UserName)+']提交' WHEN CheckDay.States='2' THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS  FlowOperateName
+	,CheckPersonUsers.UserName AS CheckPersonName
+	,person.PersonName
+	,CheckDayDetail.HiddenDangerType
+	,CheckDayDetail.HiddenDangerLevel
+	,checkDayDetail.Suggestions
+FROM Check_CheckDay AS CheckDay 
+LEFT JOIN Sys_CodeRecords AS CodeRecords ON CheckDay.CheckDayId=CodeRecords.DataId
+LEFT JOIN Check_CheckDayDetail AS CheckDayDetail ON CheckDayDetail.CheckDayId = CheckDay.CheckDayId AND  CheckDayDetail.CheckDayDetailId IS NOT NULL 
+--LEFT JOIN ProjectData_WorkArea AS WorkArea on WorkArea.WorkAreaId=CheckDayDetail.CheckArea        
+LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=CheckDayDetail.UnitId        
+LEFT JOIN (SELECT COUNT(*)  AS CheckCount, CheckDayId 
+			FROM Check_CheckDayDetail GROUP BY CheckDayId) AS Checks ON Checks.CheckDayId = CheckDay.CheckDayId 
+LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckDay.CheckDayId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1
+LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId
+LEFT JOIN Sys_User AS Users ON CheckDay.CompileMan=Users.UserId
+LEFT JOIN Sys_User AS CheckPersonUsers ON CheckDay.CheckPerson=CheckPersonUsers.UserId
+LEFT JOIN dbo.SitePerson_Person AS person ON person.PersonId = CheckDayDetail.PersonId
+WHERE  (@StartTime IS NULL OR CheckDay.CheckTime>=@StartTime) 
+		AND (@EndTime IS NULL OR CheckDay.CheckTime <=@EndTime ) 
+		AND CheckDay.ProjectId=@ProjectId
+		AND (@States IS NULL OR CheckDay.States=@States) 
+		AND (@UnitName IS NULL OR Unit.UnitName LIKE '%'+@UnitName+'%' ) 
+		AND (@WorkAreaName IS NULL OR CheckDayDetail.WorkArea LIKE '%'+@WorkAreaName+'%' ) 
+ORDER BY CheckDayCode DESC
+   
+END
+
+
+GO
+
+

DataBase/菜单初始化脚本/0-8综合管理（Menu_ZHGL）.sql

@@ -1,7 +1,7 @@
---delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_ZHGL')
+delete from Sys_ButtonToMenu where MenuId in (select MenuId from Sys_Menu where MenuType='Menu_ZHGL')
---go
+go
---delete from Sys_Menu where MenuType='Menu_ZHGL'
+delete from Sys_Menu where MenuType='Menu_ZHGL'
---go
+go
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 VALUES('2572CDC8-BA26-4C74-B6F7-CB3D63E91E72','安全体系','',10,'0','Menu_ZHGL',1,0,1)
 GO

DataBase/菜单初始化脚本/1-3安全管理（Menu_HSSE）.sql

@@ -616,16 +616,6 @@ GO
 	INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
 	VALUES('D4220548-0C59-42DE-8B1C-17FF237A4DF2','F910062E-98B0-486F-A8BD-D5B0035F808F','保存',4)
 	GO
-
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('29F27641-06ED-435A-9F9B-FCE6366801BE','企业监督检查整改','Hazard/ProjectSuperviseCheckRectify.aspx',65,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
-	GO
-	--企业监督检查整改
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('B6BC2531-A381-4843-9E08-C49EFB3B541B','29F27641-06ED-435A-9F9B-FCE6366801BE','修改',2)	
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('FBBC83E5-DF22-4995-8086-CB7A970CE2D3','29F27641-06ED-435A-9F9B-FCE6366801BE','保存',4)  
-	GO
 	INSERT INTO Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 	VALUES('F057C207-4549-48AE-B838-A1920E5709D8','联系单','HSSE/Check/ContactList.aspx',70,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
 	GO

DataBase/菜单初始化脚本/1-4进度管理（Menu_JDGL）.sql

@@ -3,87 +3,142 @@ go
 delete from Sys_Menu where MenuType='Menu_JDGL'
 go
 
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('B707B4E0-EF73-4010-A13B-59263A5029C7','单位、分部、分项工程设置','',10,'0','Menu_JDGL',0,0,1)
+--VALUES('B707B4E0-EF73-4010-A13B-59263A5029C7','单位、分部、分项工程设置','',10,'0','Menu_JDGL',0,0,1)
-GO
+--GO
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('858E83E9-ADE5-452E-BD65-82D8DFF872C0','单位、分部、分项工程设置','JDGL/WBS/WBSSetAudit.aspx',10,'B707B4E0-EF73-4010-A13B-59263A5029C7','Menu_JDGL',0,1,1)
+--	VALUES('858E83E9-ADE5-452E-BD65-82D8DFF872C0','单位、分部、分项工程设置','JDGL/WBS/WBSSetAudit.aspx',10,'B707B4E0-EF73-4010-A13B-59263A5029C7','Menu_JDGL',0,1,1)
-	GO
+--	GO
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('004CD808-1E02-4AD8-8C4B-7F805C12CCDC','858E83E9-ADE5-452E-BD65-82D8DFF872C0','增加',1)
+--	VALUES('004CD808-1E02-4AD8-8C4B-7F805C12CCDC','858E83E9-ADE5-452E-BD65-82D8DFF872C0','增加',1)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('B7FBE5AB-C02A-4FE7-9D6D-D8C4B5EAE146','858E83E9-ADE5-452E-BD65-82D8DFF872C0','修改',2)
+--	VALUES('B7FBE5AB-C02A-4FE7-9D6D-D8C4B5EAE146','858E83E9-ADE5-452E-BD65-82D8DFF872C0','修改',2)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('04075797-5B97-41D0-B596-B8CF18B27A35','858E83E9-ADE5-452E-BD65-82D8DFF872C0','删除',3)
+--	VALUES('04075797-5B97-41D0-B596-B8CF18B27A35','858E83E9-ADE5-452E-BD65-82D8DFF872C0','删除',3)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('6E53397A-00FB-425B-B884-7AC9710D0924','858E83E9-ADE5-452E-BD65-82D8DFF872C0','保存',4)
+--	VALUES('6E53397A-00FB-425B-B884-7AC9710D0924','858E83E9-ADE5-452E-BD65-82D8DFF872C0','保存',4)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('D448EC81-6C97-4B30-A715-D82D1535C58B','858E83E9-ADE5-452E-BD65-82D8DFF872C0','审核',5)
+--	VALUES('D448EC81-6C97-4B30-A715-D82D1535C58B','858E83E9-ADE5-452E-BD65-82D8DFF872C0','审核',5)
-	GO
+--	GO
+
+--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--VALUES('27C1D718-2DC0-42A5-96C0-F7A2D0DBC5F6','进度测量标志（权重）设置','',20,'0','Menu_JDGL',0,0,1)
+--GO
+--	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--	VALUES('6844F671-8545-4DD9-B9A0-AA36CB5F1D6F','进度测量标志（权重）设置','JDGL/WBSWeights/WeightsAudit.aspx',10,'27C1D718-2DC0-42A5-96C0-F7A2D0DBC5F6','Menu_JDGL',0,1,1)
+--	GO
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('DCC4B8BA-9B20-47B8-9067-DD1DC3D55415','6844F671-8545-4DD9-B9A0-AA36CB5F1D6F','保存',1)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('170A1EB4-5102-4A86-B57E-5F61B13A3236','6844F671-8545-4DD9-B9A0-AA36CB5F1D6F','审核',2)
+--	GO
+
+--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--VALUES('BE150D8E-9BAB-4207-9CDD-5B05E847D906','进度计划及计划值设置','',30,'0','Menu_JDGL',0,0,1)
+--GO
+--	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--	VALUES('9FEB264F-4124-48E8-A43C-5663BBFB55F0','进度计划及计划值设置','JDGL/WBSPlan/WBSPlanAudit.aspx',10,'BE150D8E-9BAB-4207-9CDD-5B05E847D906','Menu_JDGL',0,1,1)
+--	GO
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('0B90094F-1428-47F9-8939-F997B0E50AC7','9FEB264F-4124-48E8-A43C-5663BBFB55F0','保存',1)
+--	GO
+
+--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--VALUES('0B9BFD3F-AD3A-41D0-9144-9BABCB8E8422','实际进度（完成值/实耗值）测量','',40,'0','Menu_JDGL',0,0,1)
+--GO
+--	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--	VALUES('6CFA0EE1-F075-417E-9D96-05B31122BB95','实际进度（完成值/实耗值）测量录入','JDGL/WBSCompleteAndReal/WBSCompleteAudit.aspx',10,'0B9BFD3F-AD3A-41D0-9144-9BABCB8E8422','Menu_JDGL',0,1,1)
+--	GO
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('C9801907-F716-47CF-ACDA-CCE884123AE9','6CFA0EE1-F075-417E-9D96-05B31122BB95','保存',1)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('F3FFB663-83F8-463D-9643-99D564B79BDF','6CFA0EE1-F075-417E-9D96-05B31122BB95','提交',2)
+--	GO
+--	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--	VALUES('4FB962B3-905B-4560-9957-46A11392BB0B','进度（完成值）测量报告','JDGL/WBSCompleteAndReal/WBSReport.aspx',20,'0B9BFD3F-AD3A-41D0-9144-9BABCB8E8422','Menu_JDGL',0,1,1)
+--	GO
+
+--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--VALUES('3478449A-681A-4DB1-8E79-598BB24DD0C4','进度/费用偏差分析与纠偏','',50,'0','Menu_JDGL',0,0,1)
+--GO
+--	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--	VALUES('64197BF4-2622-4588-B49B-815188184CE2','赢得值曲线','JDGL/CostAnalysis/EarnedValueCurve.aspx',10,'3478449A-681A-4DB1-8E79-598BB24DD0C4','Menu_JDGL',0,1,1)
+--	GO
+--	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--	VALUES('AA5C8AB2-CE89-41BC-B7B5-C689ED368B98','计划调整及纠偏措施设置','JDGL/CostAnalysis/PlanAdjust.aspx',20,'3478449A-681A-4DB1-8E79-598BB24DD0C4','Menu_JDGL',0,1,1)
+--	GO
+
+--INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+--VALUES('2344465A-F43E-495E-98E7-9AC1C6484F5C','工程量清单设置','JDGL/Check/QuantityList.aspx',60,'0','Menu_JDGL',0,1,1)
+--GO
+--   INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('35BBBD54-29F1-4D46-9745-3500B6B00267','2344465A-F43E-495E-98E7-9AC1C6484F5C','增加',1)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('52B28F04-AECA-4FDD-B5FA-45EC22CAC50B','2344465A-F43E-495E-98E7-9AC1C6484F5C','修改',2)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('FC4DAA4C-7E3A-4627-A2A8-1286018C4B30','2344465A-F43E-495E-98E7-9AC1C6484F5C','删除',3)
+--	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+--	VALUES('4705582D-0389-4226-9D44-D906691F3310','2344465A-F43E-495E-98E7-9AC1C6484F5C','保存',4)
+--	GO
 
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('27C1D718-2DC0-42A5-96C0-F7A2D0DBC5F6','进度测量标志（权重）设置','',20,'0','Menu_JDGL',0,0,1)
+VALUES('F3AA42B3-5776-4992-A625-1216C579FEDE','项目进度情况','JDGL/Check/ProgressCompletion.aspx',60,'0','Menu_JDGL',0,1,1)
 GO
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('6844F671-8545-4DD9-B9A0-AA36CB5F1D6F','进度测量标志（权重）设置','JDGL/WBSWeights/WeightsAudit.aspx',10,'27C1D718-2DC0-42A5-96C0-F7A2D0DBC5F6','Menu_JDGL',0,1,1)
-	GO
 	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('DCC4B8BA-9B20-47B8-9067-DD1DC3D55415','6844F671-8545-4DD9-B9A0-AA36CB5F1D6F','保存',1)
+	VALUES('8232DE3C-307C-49ED-9A37-6C29A94AABDF','F3AA42B3-5776-4992-A625-1216C579FEDE','增加',1)
 	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('170A1EB4-5102-4A86-B57E-5F61B13A3236','6844F671-8545-4DD9-B9A0-AA36CB5F1D6F','审核',2)
+	VALUES('BFF4796D-734B-49C3-BAEA-D15437D72BA4','F3AA42B3-5776-4992-A625-1216C579FEDE','修改',2)
-	GO
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('BE150D8E-9BAB-4207-9CDD-5B05E847D906','进度计划及计划值设置','',30,'0','Menu_JDGL',0,0,1)
-GO
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('9FEB264F-4124-48E8-A43C-5663BBFB55F0','进度计划及计划值设置','JDGL/WBSPlan/WBSPlanAudit.aspx',10,'BE150D8E-9BAB-4207-9CDD-5B05E847D906','Menu_JDGL',0,1,1)
-	GO
 	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('0B90094F-1428-47F9-8939-F997B0E50AC7','9FEB264F-4124-48E8-A43C-5663BBFB55F0','保存',1)
+	VALUES('9884E883-9C71-4F76-A7E0-BBC030911548','F3AA42B3-5776-4992-A625-1216C579FEDE','删除',3)
-	GO
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('0B9BFD3F-AD3A-41D0-9144-9BABCB8E8422','实际进度（完成值/实耗值）测量','',40,'0','Menu_JDGL',0,0,1)
-GO
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('6CFA0EE1-F075-417E-9D96-05B31122BB95','实际进度（完成值/实耗值）测量录入','JDGL/WBSCompleteAndReal/WBSCompleteAudit.aspx',10,'0B9BFD3F-AD3A-41D0-9144-9BABCB8E8422','Menu_JDGL',0,1,1)
-	GO
 	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('C9801907-F716-47CF-ACDA-CCE884123AE9','6CFA0EE1-F075-417E-9D96-05B31122BB95','保存',1)
+	VALUES('08C87DB8-494D-47F3-B271-7548CCE72E7A','F3AA42B3-5776-4992-A625-1216C579FEDE','保存',4)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+     GO
-	VALUES('F3FFB663-83F8-463D-9643-99D564B79BDF','6CFA0EE1-F075-417E-9D96-05B31122BB95','提交',2)
-	GO
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('4FB962B3-905B-4560-9957-46A11392BB0B','进度（完成值）测量报告','JDGL/WBSCompleteAndReal/WBSReport.aspx',20,'0B9BFD3F-AD3A-41D0-9144-9BABCB8E8422','Menu_JDGL',0,1,1)
-	GO
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('3478449A-681A-4DB1-8E79-598BB24DD0C4','进度/费用偏差分析与纠偏','',50,'0','Menu_JDGL',0,0,1)
-GO
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('64197BF4-2622-4588-B49B-815188184CE2','赢得值曲线','JDGL/CostAnalysis/EarnedValueCurve.aspx',10,'3478449A-681A-4DB1-8E79-598BB24DD0C4','Menu_JDGL',0,1,1)
-	GO
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('AA5C8AB2-CE89-41BC-B7B5-C689ED368B98','计划调整及纠偏措施设置','JDGL/CostAnalysis/PlanAdjust.aspx',20,'3478449A-681A-4DB1-8E79-598BB24DD0C4','Menu_JDGL',0,1,1)
-	GO
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('2344465A-F43E-495E-98E7-9AC1C6484F5C','工程量清单设置','JDGL/Check/QuantityList.aspx',60,'0','Menu_JDGL',0,1,1)
-GO
-   INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('35BBBD54-29F1-4D46-9745-3500B6B00267','2344465A-F43E-495E-98E7-9AC1C6484F5C','增加',1)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('52B28F04-AECA-4FDD-B5FA-45EC22CAC50B','2344465A-F43E-495E-98E7-9AC1C6484F5C','修改',2)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('FC4DAA4C-7E3A-4627-A2A8-1286018C4B30','2344465A-F43E-495E-98E7-9AC1C6484F5C','删除',3)
-	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	VALUES('4705582D-0389-4226-9D44-D906691F3310','2344465A-F43E-495E-98E7-9AC1C6484F5C','保存',4)
-	GO
 
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 VALUES('2AE9D982-A499-497F-8F54-ADDA5856887E','工程量完成情况','JDGL/Check/QuantityCompletion.aspx',70,'0','Menu_JDGL',0,1,1)
 GO
 	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
 	VALUES('BDBABEE5-DE52-47BA-9799-ACB7EE76F3FA','2AE9D982-A499-497F-8F54-ADDA5856887E','保存',1)
+	GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('4ACA0647-4D44-462E-8277-1EF9F100566A','钢结构完成情况','JDGL/Check/SteelStructureCompletion.aspx',80,'0','Menu_JDGL',0,1,1)
+GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('9EACCE68-163F-4E47-B1AF-179E813B3A12','4ACA0647-4D44-462E-8277-1EF9F100566A','保存',1)
+	GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('92FD1845-F56C-4111-8BA0-91838A18B750','设备完成情况','JDGL/Check/EquipmentCompletion.aspx',90,'0','Menu_JDGL',0,1,1)
+GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('B69B59B4-E58D-40F6-8097-D6782FE3ED68','92FD1845-F56C-4111-8BA0-91838A18B750','保存',1)
+	GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('9AE07A76-3A54-4414-BC8C-C86A18C737BA','管道完成情况','JDGL/Check/PipelineCompletion.aspx',100,'0','Menu_JDGL',0,1,1)
+GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('EB18C5C6-3303-410B-ACA9-A82B3239CDA4','9AE07A76-3A54-4414-BC8C-C86A18C737BA','保存',1)
+	GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('8A8A1050-F227-42ED-9456-8CB5ECA36512','电气完成情况','JDGL/Check/ElectricalCompletion.aspx',110,'0','Menu_JDGL',0,1,1)
+GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('5EDC2141-3218-4C80-9A69-AD1FBD5BCEF5','8A8A1050-F227-42ED-9456-8CB5ECA36512','保存',1)
+	GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('7EC1FBAF-BEC9-46CD-9E3B-0D0093B4E1C2','仪表完成情况','JDGL/Check/MeterCompletion.aspx',120,'0','Menu_JDGL',0,1,1)
+GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('10527FF2-975E-49DA-B4C7-3FE69FCBA7B3','7EC1FBAF-BEC9-46CD-9E3B-0D0093B4E1C2','保存',1)
+	GO
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('C7037A5D-D8A6-4C1C-A5B8-2083C31C0A7B','全厂地下管网完成情况','JDGL/Check/UndergroundPipeCompletion.aspx',130,'0','Menu_JDGL',0,1,1)
+GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('BECB2F6E-90D5-432C-A56C-9F8AAF62C511','C7037A5D-D8A6-4C1C-A5B8-2083C31C0A7B','保存',1)
 	GO

SGGL/BLL/API/APIBaseInfoService.cs

@@ -39,7 +39,7 @@ namespace BLL
                                     {
                                         BaseInfoId = x.ProjectId,
                                         BaseInfoCode = x.ProjectCode,
-                                        BaseInfoName =  x.ProjectName
+                                        BaseInfoName = x.ProjectName
                                     }
                                 ).ToList();
                 return getDataLists;

SGGL/BLL/API/APIPersonService.cs

@@ -1551,29 +1551,32 @@ namespace BLL
         /// <returns></returns>
         public static List<Model.PersonInOutItem> getPersonInOutLists(string projectId, string unitId, DateTime startTimeD, DateTime endTimeD)
         {
-            var personInOuts = from x in Funs.DB.SitePerson_PersonInOut
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
-                               join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
-                               where x.ProjectId == projectId && x.ChangeTime >= startTimeD && x.ChangeTime <= endTimeD
-                               select new Model.PersonInOutItem
-                               {
-                                   PersonId = x.PersonId,
-                                   PersonName = y.PersonName,
-                                   ProjectId = x.ProjectId,
-                                   UnitId = y.UnitId,
-                                   UnitName = Funs.DB.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
-                                   WorkPostId = y.WorkPostId,
-                                   WorkPostName = Funs.DB.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
-                                   IsIn = x.IsIn,
-                                   IsInName = x.IsIn == true ? "进场" : "出场",
-                                   ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
-                                   ChangeTimeD = x.ChangeTime,
-                               };
-            if (!string.IsNullOrEmpty(unitId))
             {
-                personInOuts = personInOuts.Where(x => x.UnitId == unitId);
+                var personInOuts = from x in db.SitePerson_PersonInOut
-            }
+                                   join y in db.SitePerson_Person on x.PersonId equals y.PersonId
+                                   where x.ProjectId == projectId && x.ChangeTime >= startTimeD && x.ChangeTime <= endTimeD
+                                   select new Model.PersonInOutItem
+                                   {
+                                       PersonId = x.PersonId,
+                                       PersonName = y.PersonName,
+                                       ProjectId = x.ProjectId,
+                                       UnitId = y.UnitId,
+                                       UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
+                                       WorkPostId = y.WorkPostId,
+                                       WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
+                                       IsIn = x.IsIn,
+                                       IsInName = x.IsIn == true ? "进场" : "出场",
+                                       ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
+                                       ChangeTimeD = x.ChangeTime,
+                                   };
+                if (!string.IsNullOrEmpty(unitId))
+                {
+                    personInOuts = personInOuts.Where(x => x.UnitId == unitId);
+                }
 
-            return personInOuts.ToList();
+                return personInOuts.ToList();
+            }
         }
         #endregion
 

SGGL/BLL/API/APIUserService.cs

@@ -265,5 +265,68 @@ namespace BLL
                 }
             }
         }
+
+        /// <summary>
+        ///  根据单位类型获取用户信息
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="userIds"></param>
+        /// <param name="strParam"></param>
+        /// <returns></returns>
+        public static List<Model.UserItem> getUserByProjectIdUserIdsQuery(string projectId, string userIds, string strParam)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.UserItem> getDataList = new List<Model.UserItem>();
+                List<string> userList = Funs.GetStrListByStr(userIds, ',');
+                if (userList.Count() > 0)
+                {
+                    var getDataLists = (from x in db.Sys_User
+                                        join y in db.Project_ProjectUser on x.UserId equals y.UserId
+                                        where y.ProjectId == projectId
+                                        select new Model.UserItem
+                                        {
+                                            UserId = x.UserId,
+                                            Account = x.Account,
+                                            UserCode = x.UserCode,
+                                            Password = x.Password,
+                                            UserName = x.UserName,
+                                            RoleId = y.RoleId,
+                                            RoleName = RoleService.getRoleNamesRoleIds(y.RoleId),
+                                            UnitId = y.UnitId,
+                                            UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
+                                            LoginProjectId = y.ProjectId,
+                                            LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName,
+                                            IdentityCard = x.IdentityCard,
+                                            Email = x.Email,
+                                            Telephone = x.Telephone,
+                                            IsOffice = x.IsOffice,
+                                            SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
+                                        });
+                    if (!string.IsNullOrEmpty(strParam))
+                    {
+                        getDataLists = getDataLists.Where(x => x.UserName.Contains(strParam));
+                    }
+
+                    string unitId = Const.UnitId_CWCEC;
+                    var unitList = (from x in db.Sys_User where userList.Contains(x.UserId) select x.UnitId).Distinct().ToList();
+                    if (unitList.Count() == 1)
+                    {
+                        unitId = unitList.FirstOrDefault();
+                        getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
+
+                    }
+                    else if (!unitList.Contains(unitId))
+                    {
+                        getDataList = getDataLists.Where(x => unitList.Contains(x.UnitId)).ToList();
+                    }
+                    else
+                    {
+                        getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
+                    }
+                }
+                return getDataList.OrderBy(x => x.UnitName).ThenBy(x => x.UserName).ToList();
+            }
+        }
     }
 }

SGGL/BLL/BLL.csproj

@@ -515,8 +515,15 @@
     <Compile Include="HSSE\Technique\SpecialSchemeService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemDetailService.cs" />
     <Compile Include="HSSE\Technique\Technique_CheckItemSetService.cs" />
+    <Compile Include="JDGL\Check\ElectricalCompletionService.cs" />
+    <Compile Include="JDGL\Check\EquipmentCompletionService.cs" />
+    <Compile Include="JDGL\Check\MeterCompletionService.cs" />
+    <Compile Include="JDGL\Check\PipelineCompletionService.cs" />
+    <Compile Include="JDGL\Check\ProgressCompletionService.cs" />
     <Compile Include="JDGL\Check\QuantityCompletionService.cs" />
     <Compile Include="JDGL\Check\QuantityListService.cs" />
+    <Compile Include="JDGL\Check\SteelStructureCompletionService.cs" />
+    <Compile Include="JDGL\Check\UndergroundPipeCompletionService.cs" />
     <Compile Include="JDGL\WBSCompleteAndReal\WBSReportService.cs" />
     <Compile Include="JDGL\WBS\CnProfessionInitService.cs" />
     <Compile Include="JDGL\WBS\CnProfessionService.cs" />

SGGL/BLL/BaseInfo/SteelService.cs

@@ -271,7 +271,7 @@ namespace BLL
         /// <param name="isShowPlease"></param>
         public static void InitSteel(FineUIPro.DropDownList dropName, bool isShowPlease)
         {
-            dropName.DataValueField = "Text";
+            dropName.DataValueField = "Value";
             dropName.DataTextField = "Text";
             dropName.DataSource = GetSteelList();
             dropName.DataBind();

SGGL/BLL/Common/Const.cs

@@ -6,7 +6,7 @@ using System.Text;
 namespace BLL
 {
     public static class Const
-    {        
+    {
         #region 查询字段：系统设置
         /// <summary>
         /// 系统管理员ID
@@ -57,7 +57,7 @@ namespace BLL
         /// 入场培训类型ID
         /// </summary>
         public const string EntryTrainTypeId = "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7";
-        
+
         /// <summary>
         /// 微信订阅模板ID
         /// </summary>
@@ -217,7 +217,7 @@ namespace BLL
         /// </summary>
         public const string ProjectState_3 = "3";
         #endregion
-       
+
         #region 项目单位类型
         /// <summary>
         /// 总包
@@ -230,11 +230,11 @@ namespace BLL
         /// <summary>
         /// 监理
         /// </summary>
-        public const string ProjectUnitType_3 = "3"; 
+        public const string ProjectUnitType_3 = "3";
         /// <summary>
         /// 业主
         /// </summary>
-        public const string ProjectUnitType_4 = "4"; 
+        public const string ProjectUnitType_4 = "4";
         /// <summary>
         /// 检测单位
         /// </summary>
@@ -272,22 +272,117 @@ namespace BLL
         /// <summary>
         /// HSE工程师岗位Id
         /// </summary>
-        public static string WorkPost_HSSEEngineer = "9b15af2e-6131-462c-9f8a-71533957ca0e";       
+        public static string WorkPost_HSSEEngineer = "9b15af2e-6131-462c-9f8a-71533957ca0e";
 
         /// <summary>
         /// HSE经理岗位Id
         /// </summary>
         public static string WorkPost_SafetyManager = "e426e560-9906-4aba-843e-2daef9ebeb05";
 
-        /// <summary>
-        /// 焊工岗位Id
-        /// </summary>
-        public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228";
-
         /// <summary>
         /// 无损检测工岗位Id
         /// </summary>
         public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297";
+
+        /// <summary>
+        /// 木工岗位Id
+        /// </summary>
+        public static string WorkPost_Carpentry = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881";
+
+        /// <summary>
+        /// 钢筋工岗位Id
+        /// </summary>
+        public static string WorkPost_SteelWorker = "E735CF61-096B-4134-B6D4-766B4B8EF790";
+
+        /// <summary>
+        /// 瓦工岗位Id
+        /// </summary>
+        public static string WorkPost_Bricklayer = "5E07B570-2E2C-470E-8379-7FEAECF8F62A";
+
+        /// <summary>
+        /// 混凝土工岗位Id
+        /// </summary>
+        public static string WorkPost_ConcreteWorker = "14f1fa16-965e-427d-a342-edbb3230ae3c";
+
+        /// <summary>
+        /// 钳工岗位Id
+        /// </summary>
+        public static string WorkPost_Fitter1 = "c7431c69-fb64-4960-a9da-2c7b8d380097";
+
+        /// <summary>
+        /// 钳工岗位Id
+        /// </summary>
+        public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5";
+
+        /// <summary>
+        /// 焊工岗位Id
+        /// </summary>
+        public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
+
+        /// <summary>
+        /// 焊工岗位Id
+        /// </summary>
+        public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f";
+
+        /// <summary>
+        /// 焊工岗位Id
+        /// </summary>
+        public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1";
+
+        /// <summary>
+        /// 焊工岗位Id
+        /// </summary>
+        public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa";
+
+        /// <summary>
+        /// 焊工岗位Id
+        /// </summary>
+        public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
+
+        /// <summary>
+        /// 焊工岗位Id
+        /// </summary>
+        public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C";
+
+        /// <summary>
+        /// 铆工岗位Id
+        /// </summary>
+        public static string WorkPost_Riveter = "338A8CB9-FB41-4E09-A2BD-ADD27BDBE9DE";
+
+        /// <summary>
+        /// 管工岗位Id
+        /// </summary>
+        public static string WorkPost_Foreman = "edc167d9-e2ed-4ed9-8c4d-9c179ff0286f";
+
+        /// <summary>
+        /// 电工岗位Id
+        /// </summary>
+        public static string WorkPost_Electrician1 = "29999836-fcdd-43f5-ab6c-77c5e0d6ce0d";
+
+        /// <summary>
+        /// 电工岗位Id
+        /// </summary>
+        public static string WorkPost_Electrician2 = "5CBA1BD0-B66B-4362-8CF3-CEA9D3F425DB";
+
+        /// <summary>
+        /// 电工岗位Id
+        /// </summary>
+        public static string WorkPost_Electrician3 = "bb71b5f6-d6c6-49d8-83aa-577c6f0808a0";
+
+        /// <summary>
+        /// 仪表工岗位Id
+        /// </summary>
+        public static string WorkPost_Instrumentalist = "EFBA9A9A-FF98-47B4-949E-951A8F4E42E5";
+
+        /// <summary>
+        /// 防腐保温工岗位Id
+        /// </summary>
+        public static string WorkPost_AnticorrosionWorker = "010CBFD3-51B9-4C48-A6F8-15326D810AA5";
+
+        /// <summary>
+        /// 其他岗位Id
+        /// </summary>
+        public static string WorkPost_Other = "71D6437A-6EE4-434A-A68C-BBB2B00FB6C6";
         #endregion
 
         #region 系统环境设置常量
@@ -585,7 +680,7 @@ namespace BLL
         /// 党建群团
         /// </summary>
         public const string Menu_Party = "Menu_Party";
-        
+
         /*项目*/
         /// <summary>
         /// 项目设置
@@ -674,6 +769,8 @@ namespace BLL
         /// </summary>
         public const string ActionPlan_ProjectManagerRuleMenuId = "ec0942af-b1ae-4676-8442-4be3a5e22ea0";
 
+        
+
         #region 本部检查
         /// <summary>
         /// 检查通知单
@@ -970,7 +1067,7 @@ namespace BLL
         /// <summary>
         /// 安全组织体系
         /// </summary>
-        public const string HSSEOrganizeMenuId = "8IDKGJE2-09B1-6UIO-3EFM-5TGED48F0001"; 
+        public const string HSSEOrganizeMenuId = "8IDKGJE2-09B1-6UIO-3EFM-5TGED48F0001";
         /// <summary>
         /// 安全管理机构
         /// </summary>
@@ -1212,7 +1309,7 @@ namespace BLL
         public const string ServerSafeUnitReportMenuId = "2C673125-AAA4-4F41-A827-0F04DFE55DED";
 
         #endregion
-        
+
         #region 企业安全大检查
         /// <summary>
         /// 安全监督检查报告
@@ -1441,15 +1538,15 @@ namespace BLL
         /// <summary>
         /// 安全组织机构
         /// </summary>
-        public const string ProjectSafetyOrganizationMenuId = "1EDD072E-473A-4CDB-A2D3-E401C146B2B2"; 
+        public const string ProjectSafetyOrganizationMenuId = "1EDD072E-473A-4CDB-A2D3-E401C146B2B2";
         /// <summary>
         /// 安全体系
         /// </summary>
-        public const string ProjectSafetySystemMenuId = "21C779D6-269B-4CB7-AFFB-F59958AC0EF0"; 
+        public const string ProjectSafetySystemMenuId = "21C779D6-269B-4CB7-AFFB-F59958AC0EF0";
         /// <summary>
         /// 安全制度
         /// </summary>
-        public const string ProjectSafetyInstitutionMenuId = "9D04CD8B-575C-4854-B8B0-F90CEEB75815";        
+        public const string ProjectSafetyInstitutionMenuId = "9D04CD8B-575C-4854-B8B0-F90CEEB75815";
         /// <summary>
         /// 安全管理组织机构
         /// </summary>
@@ -1654,8 +1751,8 @@ namespace BLL
         /// <summary>
         /// 现场人员统计
         /// </summary>
-        public const string PersonStatisticMenuId = "7D36E853-CC79-48B9-9E7F-E34797B4E87E";  
+        public const string PersonStatisticMenuId = "7D36E853-CC79-48B9-9E7F-E34797B4E87E";
-        
+
         /// <summary>
         /// 人员变化
         /// </summary>
@@ -1772,7 +1869,7 @@ namespace BLL
         /// <summary>
         /// HSSE专项检查
         /// </summary>
-        public const string ProjectCheckSpecialMenuId = "1B08048F-93ED-4E84-AE65-DB7917EA2DFB"; 
+        public const string ProjectCheckSpecialMenuId = "1B08048F-93ED-4E84-AE65-DB7917EA2DFB";
         /// <summary>
         /// HSSE综合检查
         /// </summary>
@@ -1784,11 +1881,11 @@ namespace BLL
         /// <summary>
         /// 开工前HSSE检查
         /// </summary>
-        public const string ProjectCheckWorkMenuId = "9212291A-FBC5-4F6D-A5F6-60BFF4E30F6F";  
+        public const string ProjectCheckWorkMenuId = "9212291A-FBC5-4F6D-A5F6-60BFF4E30F6F";
         /// <summary>
         /// 季节性/节假日HSSE检查
         /// </summary>
-        public const string ProjectCheckHolidayMenuId = "0D23A707-ADA0-4C2B-9665-611134243529"; 
+        public const string ProjectCheckHolidayMenuId = "0D23A707-ADA0-4C2B-9665-611134243529";
         /// <summary>
         /// 危险因素统计分析
         /// </summary>
@@ -1898,11 +1995,11 @@ namespace BLL
         /// <summary>
         /// HSSE月例会
         /// </summary>
-        public const string ProjectMonthMeetingMenuId = "D5DD5EBD-A5F2-4A43-BA4C-E9A242B43684"; 
+        public const string ProjectMonthMeetingMenuId = "D5DD5EBD-A5F2-4A43-BA4C-E9A242B43684";
         /// <summary>
         /// HSSE专题会议
         /// </summary>
-        public const string ProjectSpecialMeetingMenuId = "BB6CEC48-283B-46AD-BEDD-F964D261698F"; 
+        public const string ProjectSpecialMeetingMenuId = "BB6CEC48-283B-46AD-BEDD-F964D261698F";
         /// <summary>
         /// 其他会议记录
         /// </summary>
@@ -1994,11 +2091,11 @@ namespace BLL
         /// <summary>
         /// 合同HSE费用及支付台账
         /// </summary>
-        public const string ProjectCostLedgerMenuId = "19C1370F-92C0-4E31-87B4-8BADA74113E4"; 
+        public const string ProjectCostLedgerMenuId = "19C1370F-92C0-4E31-87B4-8BADA74113E4";
         /// <summary>
         /// HSSE费用统计表
         /// </summary>
-        public const string TC_CostMenuId = "89B42B7B-8AEE-4199-923E-81A602FC77E0";  
+        public const string TC_CostMenuId = "89B42B7B-8AEE-4199-923E-81A602FC77E0";
         /// <summary>
         /// HSSE物资管理
         /// </summary>
@@ -2006,11 +2103,11 @@ namespace BLL
         /// <summary>
         /// 物资入库管理
         /// </summary>
-        public const string GoodsIn2MenuId = "FDA02FCA-4E23-469E-AB26-2D625D0E579A";  
+        public const string GoodsIn2MenuId = "FDA02FCA-4E23-469E-AB26-2D625D0E579A";
         /// <summary>
         /// 物资出库管理
         /// </summary>
-        public const string GoodsOut2MenuId = "881D6FE5-C281-4DA8-80CD-D7C6624796FC"; 
+        public const string GoodsOut2MenuId = "881D6FE5-C281-4DA8-80CD-D7C6624796FC";
         /// <summary>
         /// 物资库存管理
         /// </summary>
@@ -2037,19 +2134,19 @@ namespace BLL
         /// <summary>
         /// HSSE检查类别设置
         /// </summary>
-        public const string CheckTypeSetMenuId = "7353F3C1-0EAF-4DB7-86B4-93E3B96805F8"; 
+        public const string CheckTypeSetMenuId = "7353F3C1-0EAF-4DB7-86B4-93E3B96805F8";
         /// <summary>
         /// HSSE行政管理检查记录
         /// </summary>
-        public const string ManageCheckMenuId = "A25EB19A-F06E-4AAF-A589-E2B8F7FA7857"; 
+        public const string ManageCheckMenuId = "A25EB19A-F06E-4AAF-A589-E2B8F7FA7857";
         /// <summary>
         /// 现场车辆管理
         /// </summary>
-        public const string CarManagerMenuId = "CF82805A-84BE-400A-B939-83F7612D76F5"; 
+        public const string CarManagerMenuId = "CF82805A-84BE-400A-B939-83F7612D76F5";
         /// <summary>
         /// 现场驾驶员管理
         /// </summary>
-        public const string DriverManagerMenuId = "754C23CA-F1BC-4F44-9D34-B185099EDCA0"; 
+        public const string DriverManagerMenuId = "754C23CA-F1BC-4F44-9D34-B185099EDCA0";
         /// <summary>
         /// 职业健康管理
         /// </summary>
@@ -2064,7 +2161,7 @@ namespace BLL
         /// <summary>
         /// 月度安全评比
         /// </summary>
-        public const string ProjectMonthlyRatingMenuId = "293FD782-7B39-4F0F-A826-CA790A70CCC7";  
+        public const string ProjectMonthlyRatingMenuId = "293FD782-7B39-4F0F-A826-CA790A70CCC7";
         /// <summary>
         /// 全国安全月
         /// </summary>
@@ -2078,7 +2175,7 @@ namespace BLL
         /// </summary>
         public const string ProjectOtherActivitiesMenuId = "446D702B-F0C1-4D12-A862-0B8317D95928";
         #endregion
-        
+
         #region 职业健康
         /// <summary>
         /// 危害检测
@@ -2124,7 +2221,7 @@ namespace BLL
         /// HSSE管理周报
         /// </summary>
         public const string ProjectManagerWeekMenuId = "AE118E9C-C309-43B7-A198-8CA90A8D98EB";
-        
+
         /// <summary>
         /// 月报(赛鼎)
         /// </summary>
@@ -2172,7 +2269,7 @@ namespace BLL
         /// <summary>
         /// 企业安全管理资料
         /// </summary>
-        public const string ProjectSafetyDataMenuId = "54A3E23A-DAC7-484B-8C97-40AD785688FC";       
+        public const string ProjectSafetyDataMenuId = "54A3E23A-DAC7-484B-8C97-40AD785688FC";
         /// <summary>
         /// HSSE日志暨管理数据收集
         /// </summary>
@@ -2206,7 +2303,7 @@ namespace BLL
         /// </summary>
         public const string ProjectHSEDiaryMenuId = "8E5B4A8E-B06E-4C8A-A2C8-1091A9BCAF72";
         #endregion
-        
+
         #region HSSE绩效评价管理
         /// <summary>
         /// HSSE分包方绩效评价
@@ -2287,27 +2384,27 @@ namespace BLL
         /// <summary>
         /// HSSE宣传活动
         /// </summary>
-        public const string ProjectPromotionalActivitiesMenuId = "16092FE7-938B-4713-8084-4FBFA030F386";  
+        public const string ProjectPromotionalActivitiesMenuId = "16092FE7-938B-4713-8084-4FBFA030F386";
         /// <summary>
         /// 项目图片
         /// </summary>
-        public const string ProjectPictureMenuId = "B58179BE-FE6E-4E91-84FC-D211E4692354";   
+        public const string ProjectPictureMenuId = "B58179BE-FE6E-4E91-84FC-D211E4692354";
         /// <summary>
         /// 一般来文管理
         /// </summary>
-        public const string ReceiveFileManagerMenuId = "4F5C00F3-DA7D-4B2D-B1EF-310DFFCA77DD";  
+        public const string ReceiveFileManagerMenuId = "4F5C00F3-DA7D-4B2D-B1EF-310DFFCA77DD";
         /// <summary>
         /// 项目文件夹
         /// </summary>
-        public const string ProjectFolderMenuId = "05C6C2AF-3B0B-4BF0-A8CE-1FC15DAC3C54";  
+        public const string ProjectFolderMenuId = "05C6C2AF-3B0B-4BF0-A8CE-1FC15DAC3C54";
         /// <summary>
         /// 文件柜1
         /// </summary>
-        public const string ProjectFileCabinetAMenuId = "C69B7409-BE1E-4754-AC90-57B56EEE198B"; 
+        public const string ProjectFileCabinetAMenuId = "C69B7409-BE1E-4754-AC90-57B56EEE198B";
         /// <summary>
         /// 文件柜2
         /// </summary>
-        public const string ProjectFileCabinetBMenuId = "200019A4-E24F-4C87-8C52-9970F78DBF73"; 
+        public const string ProjectFileCabinetBMenuId = "200019A4-E24F-4C87-8C52-9970F78DBF73";
         /// <summary>
         /// 信息统计
         /// </summary>
@@ -2824,6 +2921,34 @@ namespace BLL
         /// 人员初步规划导入模板
         /// </summary>
         public const string PersonPlanTemplateUrl = "File\\Excel\\DataIn\\人员初步规划导入模板.xls";
+        /// <summary>
+        /// 项目进度完成情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string QuantityCompletionTemplateUrl = "File\\Excel\\DataIn\\项目进度完成情况导入模板.xls";
+        /// <summary>
+        /// 钢结构完成情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string SteelStructureCompletionTemplateUrl = "File\\Excel\\DataIn\\钢结构完成情况导入模板.xls";
+        /// <summary>
+        /// 设备完成情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string EquipmentCompletionTemplateUrl = "File\\Excel\\DataIn\\设备完成情况导入模板.xls";
+        /// <summary>
+        /// 管道完成情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string PipelineCompletionTemplateUrl = "File\\Excel\\DataIn\\管道完成情况导入模板.xls";
+        /// <summary>
+        /// 电气完成情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string ElectricalCompletionTemplateUrl = "File\\Excel\\DataIn\\电气完成情况导入模板.xls";
+        /// <summary>
+        /// 仪表完成情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string MeterCompletionTemplateUrl = "File\\Excel\\DataIn\\仪表完成情况导入模板.xls";
+        /// <summary>
+        /// 全厂地下管网完成情况导入模版文件原始的虚拟路径
+        /// </summary>
+        public const string UndergroundPipeCompletionTemplateUrl = "File\\Excel\\DataIn\\全厂地下管网完成情况导入模板.xls";
         #endregion
 
         #region 绩效考核模板文件路径
@@ -2881,19 +3006,19 @@ namespace BLL
         /// <summary>
         /// 职工伤亡事故原因分析报表
         /// </summary>
-        public const string Information_AccidentCauseReportId = "2"; 
+        public const string Information_AccidentCauseReportId = "2";
         /// <summary>
         /// 安全生产数据季报
         /// </summary>
-        public const string Information_SafetyQuarterlyReportId = "3";  
+        public const string Information_SafetyQuarterlyReportId = "3";
         /// <summary>
         /// 应急演练开展情况季报表
         /// </summary>
-        public const string Information_DrillConductedQuarterlyReportId = "4";  
+        public const string Information_DrillConductedQuarterlyReportId = "4";
         /// <summary>
         /// 应急演练工作计划半年报表
         /// </summary>
-        public const string Information_DrillPlanHalfYearReportId = "5";  
+        public const string Information_DrillPlanHalfYearReportId = "5";
         /// <summary>
         /// 培训记录
         /// </summary>
@@ -2901,7 +3026,7 @@ namespace BLL
         /// <summary>
         /// 环境危险源辨识与评价打印报表
         /// </summary>
-        public const string EnvironmentalRiskReportId = "12";  
+        public const string EnvironmentalRiskReportId = "12";
         /// <summary>
         /// 环境危险源辨识与评价（重要环境因素）打印报表
         /// </summary>
@@ -2909,7 +3034,7 @@ namespace BLL
         /// <summary>
         /// 职业健康安全危险源辨识与评价打印报表
         /// </summary>
-        public const string HazardListReportId = "14"; 
+        public const string HazardListReportId = "14";
         /// <summary>
         /// 职业健康安全危险源辨识与评价（重大危险源）打印报表
         /// </summary>
@@ -4016,7 +4141,7 @@ namespace BLL
         /// <summary>
         /// 审批完成
         /// </summary>
-        public const string ConstructionPlan_Complete= "5";
+        public const string ConstructionPlan_Complete = "5";
         #endregion
 
         #region 总承包商施工报告
@@ -4512,6 +4637,11 @@ namespace BLL
         /// </summary>
         public const string RectificationMeasureMenuId = "0629BAB1-DB1C-42CE-A333-49F3813617D7";
 
+        /// <summary>
+        /// 进度完成情况
+        /// </summary>
+        public const string ProgressCompletionMenuId = "F3AA42B3-5776-4992-A625-1216C579FEDE";
+
         /// <summary>
         /// 工程量清单设置
         /// </summary>
@@ -4521,6 +4651,36 @@ namespace BLL
         /// 工程量完成情况
         /// </summary>
         public const string QuantityCompletionMenuId = "2AE9D982-A499-497F-8F54-ADDA5856887E";
+
+        /// <summary>
+        /// 钢结构完成情况
+        /// </summary>
+        public const string SteelStructureCompletionMenuId = "4ACA0647-4D44-462E-8277-1EF9F100566A";
+
+        /// <summary>
+        /// 设备完成情况
+        /// </summary>
+        public const string EquipmentCompletionMenuId = "92FD1845-F56C-4111-8BA0-91838A18B750";
+
+        /// <summary>
+        /// 管道完成情况
+        /// </summary>
+        public const string PipelineCompletionMenuId = "9AE07A76-3A54-4414-BC8C-C86A18C737BA";
+
+        /// <summary>
+        /// 电气完成情况
+        /// </summary>
+        public const string ElectricalCompletionMenuId = "8A8A1050-F227-42ED-9456-8CB5ECA36512";
+
+        /// <summary>
+        /// 仪表完成情况
+        /// </summary>
+        public const string MeterCompletionMenuId = "7EC1FBAF-BEC9-46CD-9E3B-0D0093B4E1C2";
+
+        /// <summary>
+        /// 全厂地下管网完成情况
+        /// </summary>
+        public const string UndergroundPipeCompletionMenuId = "C7037A5D-D8A6-4C1C-A5B8-2083C31C0A7B";
         #endregion
 
         /// <summary>

SGGL/BLL/Common/Funs.cs

@@ -120,6 +120,24 @@ namespace BLL
             set;
         } = 15;
 
+        ///// <summary>
+        ///// Êý¾Ý¿âÉÏÏÂÎÄ¡£
+        ///// </summary>
+        //public static SGGLDB DB
+        //{
+        //    get
+        //    {
+        //        if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
+        //        {
+        //            DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new SGGLDB(connString));
+        //        }
+
+        //        // DBList[System.Threading.Thread.CurrentThread.ManagedThreadId].CommandTimeout = 1200;
+        //        return DBList[System.Threading.Thread.CurrentThread.ManagedThreadId];
+        //    }
+        //}
+
+        private static object locker = new object();
         /// <summary>
         /// 数据库上下文。
         /// </summary>
@@ -127,13 +145,32 @@ namespace BLL
         {
             get
             {
-                if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
+                lock (locker)
                 {
-                    DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new SGGLDB(connString));
+                    try
-                }
+                    {
+                        if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
+                        {
+                            DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new SGGLDB(connString));
+                        }
 
-                // DBList[System.Threading.Thread.CurrentThread.ManagedThreadId].CommandTimeout = 1200;
+                        // DBList[System.Threading.Thread.CurrentThread.ManagedThreadId].CommandTimeout = 1200;
-                return DBList[System.Threading.Thread.CurrentThread.ManagedThreadId];
+                        return DBList[System.Threading.Thread.CurrentThread.ManagedThreadId];
+                    }
+                    catch
+                    {
+                        var db = new SGGLDB(connString);
+                        if (DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
+                        {
+                            DBList[System.Threading.Thread.CurrentThread.ManagedThreadId] = db;
+                        }
+                        else
+                        {
+                            DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, db);
+                        }
+                        return db;
+                    }
+                }
             }
         }
 

SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs

@@ -57,6 +57,7 @@ namespace BLL
             newHazardRegister.ResponsibleMan = hazardRegister.ResponsibleMan;
             newHazardRegister.CheckManId = hazardRegister.CheckManId;
             newHazardRegister.CheckTime = hazardRegister.CheckTime;
+            newHazardRegister.Requirements = hazardRegister.Requirements;
             newHazardRegister.RectificationPeriod = hazardRegister.RectificationPeriod;
             newHazardRegister.ImageUrl = hazardRegister.ImageUrl;
             newHazardRegister.RectificationImageUrl = hazardRegister.RectificationImageUrl;
@@ -91,6 +92,7 @@ namespace BLL
                 newHazardRegister.AttachUrl = hazardRegister.AttachUrl;
                 newHazardRegister.ProjectId = hazardRegister.ProjectId;
                 newHazardRegister.States = hazardRegister.States;
+                newHazardRegister.Requirements = hazardRegister.Requirements;
                 newHazardRegister.IsEffective = hazardRegister.IsEffective;
                 newHazardRegister.ResponsibleMan = hazardRegister.ResponsibleMan;
                 newHazardRegister.CheckManId = hazardRegister.CheckManId;

SGGL/BLL/JDGL/Check/ElectricalCompletionService.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 电气完成情况
+    /// </summary>
+    public class ElectricalCompletionService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取电气完成情况
+        /// </summary>
+        /// <param name="electricalCompletionId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_ElectricalCompletion GetElectricalCompletionById(string electricalCompletionId)
+        {
+            return Funs.DB.JDGL_ElectricalCompletion.FirstOrDefault(e => e.ElectricalCompletionId == electricalCompletionId);
+        }
+
+        /// <summary>
+        /// 添加电气完成情况
+        /// </summary>
+        /// <param name="electricalCompletion"></param>
+        public static void AddElectricalCompletion(Model.JDGL_ElectricalCompletion electricalCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_ElectricalCompletion newElectricalCompletion = new Model.JDGL_ElectricalCompletion
+            {
+                ElectricalCompletionId = electricalCompletion.ElectricalCompletionId,
+                ProjectId = electricalCompletion.ProjectId,
+                UnitId = electricalCompletion.UnitId,
+                Name = electricalCompletion.Name,
+                Unit = electricalCompletion.Unit,
+                TotalNum = electricalCompletion.TotalNum,
+                ThisNum = electricalCompletion.ThisNum,
+                CompileMan = electricalCompletion.CompileMan,
+                CompileDate = electricalCompletion.CompileDate,
+                StartDate = electricalCompletion.StartDate,
+                EndDate = electricalCompletion.EndDate
+            };
+            db.JDGL_ElectricalCompletion.InsertOnSubmit(newElectricalCompletion);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改电气完成情况
+        /// </summary>
+        /// <param name="electricalCompletion"></param>
+        public static void UpdateElectricalCompletion(Model.JDGL_ElectricalCompletion electricalCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_ElectricalCompletion newElectricalCompletion = db.JDGL_ElectricalCompletion.FirstOrDefault(e => e.ElectricalCompletionId == electricalCompletion.ElectricalCompletionId);
+            if (newElectricalCompletion != null)
+            {
+                newElectricalCompletion.TotalNum = electricalCompletion.TotalNum;
+                newElectricalCompletion.ThisNum = electricalCompletion.ThisNum;
+                newElectricalCompletion.CompileMan = electricalCompletion.CompileMan;
+                newElectricalCompletion.CompileDate = electricalCompletion.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除电气完成情况
+        /// </summary>
+        /// <param name="electricalCompletionId"></param>
+        public static void DeleteElectricalCompletionById(string electricalCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var electricalCompletion = (from x in db.JDGL_ElectricalCompletion where x.ElectricalCompletionId == electricalCompletionId select x).FirstOrDefault();
+            if (electricalCompletion != null)
+            {
+                db.JDGL_ElectricalCompletion.DeleteOnSubmit(electricalCompletion);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/JDGL/Check/EquipmentCompletionService.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 设备完成情况
+    /// </summary>
+    public class EquipmentCompletionService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取设备完成情况
+        /// </summary>
+        /// <param name="equipmentCompletionId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_EquipmentCompletion GetEquipmentCompletionById(string equipmentCompletionId)
+        {
+            return Funs.DB.JDGL_EquipmentCompletion.FirstOrDefault(e => e.EquipmentCompletionId == equipmentCompletionId);
+        }
+
+        /// <summary>
+        /// 添加设备完成情况
+        /// </summary>
+        /// <param name="equipmentCompletion"></param>
+        public static void AddEquipmentCompletion(Model.JDGL_EquipmentCompletion equipmentCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_EquipmentCompletion newEquipmentCompletion = new Model.JDGL_EquipmentCompletion
+            {
+                EquipmentCompletionId = equipmentCompletion.EquipmentCompletionId,
+                ProjectId = equipmentCompletion.ProjectId,
+                UnitId = equipmentCompletion.UnitId,
+                TotalNum = equipmentCompletion.TotalNum,
+                ArrivalNum = equipmentCompletion.ArrivalNum,
+                ThisNum = equipmentCompletion.ThisNum,
+                CompileMan = equipmentCompletion.CompileMan,
+                CompileDate = equipmentCompletion.CompileDate,
+                StartDate = equipmentCompletion.StartDate,
+                EndDate = equipmentCompletion.EndDate
+            };
+            db.JDGL_EquipmentCompletion.InsertOnSubmit(newEquipmentCompletion);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改设备完成情况
+        /// </summary>
+        /// <param name="equipmentCompletion"></param>
+        public static void UpdateEquipmentCompletion(Model.JDGL_EquipmentCompletion equipmentCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_EquipmentCompletion newEquipmentCompletion = db.JDGL_EquipmentCompletion.FirstOrDefault(e => e.EquipmentCompletionId == equipmentCompletion.EquipmentCompletionId);
+            if (newEquipmentCompletion != null)
+            {
+                newEquipmentCompletion.TotalNum = equipmentCompletion.TotalNum;
+                newEquipmentCompletion.ArrivalNum = equipmentCompletion.ArrivalNum;
+                newEquipmentCompletion.ThisNum = equipmentCompletion.ThisNum;
+                newEquipmentCompletion.CompileMan = equipmentCompletion.CompileMan;
+                newEquipmentCompletion.CompileDate = equipmentCompletion.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除设备完成情况
+        /// </summary>
+        /// <param name="equipmentCompletionId"></param>
+        public static void DeleteEquipmentCompletionById(string equipmentCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var equipmentCompletion = (from x in db.JDGL_EquipmentCompletion where x.EquipmentCompletionId == equipmentCompletionId select x).FirstOrDefault();
+            if (equipmentCompletion != null)
+            {
+                db.JDGL_EquipmentCompletion.DeleteOnSubmit(equipmentCompletion);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/JDGL/Check/MeterCompletionService.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 仪表完成情况
+    /// </summary>
+    public class MeterCompletionService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取仪表完成情况
+        /// </summary>
+        /// <param name="meterCompletionId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_MeterCompletion GetMeterCompletionById(string meterCompletionId)
+        {
+            return Funs.DB.JDGL_MeterCompletion.FirstOrDefault(e => e.MeterCompletionId == meterCompletionId);
+        }
+
+        /// <summary>
+        /// 添加仪表完成情况
+        /// </summary>
+        /// <param name="meterCompletion"></param>
+        public static void AddMeterCompletion(Model.JDGL_MeterCompletion meterCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_MeterCompletion newMeterCompletion = new Model.JDGL_MeterCompletion
+            {
+                MeterCompletionId = meterCompletion.MeterCompletionId,
+                ProjectId = meterCompletion.ProjectId,
+                UnitId = meterCompletion.UnitId,
+                Name = meterCompletion.Name,
+                Unit = meterCompletion.Unit,
+                TotalNum = meterCompletion.TotalNum,
+                ThisNum = meterCompletion.ThisNum,
+                CompileMan = meterCompletion.CompileMan,
+                CompileDate = meterCompletion.CompileDate,
+                StartDate = meterCompletion.StartDate,
+                EndDate = meterCompletion.EndDate
+            };
+            db.JDGL_MeterCompletion.InsertOnSubmit(newMeterCompletion);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改仪表完成情况
+        /// </summary>
+        /// <param name="meterCompletion"></param>
+        public static void UpdateMeterCompletion(Model.JDGL_MeterCompletion meterCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_MeterCompletion newMeterCompletion = db.JDGL_MeterCompletion.FirstOrDefault(e => e.MeterCompletionId == meterCompletion.MeterCompletionId);
+            if (newMeterCompletion != null)
+            {
+                newMeterCompletion.TotalNum = meterCompletion.TotalNum;
+                newMeterCompletion.ThisNum = meterCompletion.ThisNum;
+                newMeterCompletion.CompileMan = meterCompletion.CompileMan;
+                newMeterCompletion.CompileDate = meterCompletion.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除仪表完成情况
+        /// </summary>
+        /// <param name="meterCompletionId"></param>
+        public static void DeleteMeterCompletionById(string meterCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var meterCompletion = (from x in db.JDGL_MeterCompletion where x.MeterCompletionId == meterCompletionId select x).FirstOrDefault();
+            if (meterCompletion != null)
+            {
+                db.JDGL_MeterCompletion.DeleteOnSubmit(meterCompletion);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/JDGL/Check/PipelineCompletionService.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 管道完成情况
+    /// </summary>
+    public class PipelineCompletionService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取管道完成情况
+        /// </summary>
+        /// <param name="pipelineCompletionId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_PipelineCompletion GetPipelineCompletionById(string pipelineCompletionId)
+        {
+            return Funs.DB.JDGL_PipelineCompletion.FirstOrDefault(e => e.PipelineCompletionId == pipelineCompletionId);
+        }
+
+        /// <summary>
+        /// 添加管道完成情况
+        /// </summary>
+        /// <param name="pipelineCompletion"></param>
+        public static void AddPipelineCompletion(Model.JDGL_PipelineCompletion pipelineCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_PipelineCompletion newPipelineCompletion = new Model.JDGL_PipelineCompletion
+            {
+                PipelineCompletionId = pipelineCompletion.PipelineCompletionId,
+                ProjectId = pipelineCompletion.ProjectId,
+                UnitId = pipelineCompletion.UnitId,
+                TotalNum = pipelineCompletion.TotalNum,
+                ThisNum = pipelineCompletion.ThisNum,
+                CompileMan = pipelineCompletion.CompileMan,
+                CompileDate = pipelineCompletion.CompileDate,
+                StartDate = pipelineCompletion.StartDate,
+                EndDate = pipelineCompletion.EndDate
+            };
+            db.JDGL_PipelineCompletion.InsertOnSubmit(newPipelineCompletion);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改管道完成情况
+        /// </summary>
+        /// <param name="pipelineCompletion"></param>
+        public static void UpdatePipelineCompletion(Model.JDGL_PipelineCompletion pipelineCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_PipelineCompletion newPipelineCompletion = db.JDGL_PipelineCompletion.FirstOrDefault(e => e.PipelineCompletionId == pipelineCompletion.PipelineCompletionId);
+            if (newPipelineCompletion != null)
+            {
+                newPipelineCompletion.TotalNum = pipelineCompletion.TotalNum;
+                newPipelineCompletion.ThisNum = pipelineCompletion.ThisNum;
+                newPipelineCompletion.CompileMan = pipelineCompletion.CompileMan;
+                newPipelineCompletion.CompileDate = pipelineCompletion.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除管道完成情况
+        /// </summary>
+        /// <param name="pipelineCompletionId"></param>
+        public static void DeletePipelineCompletionById(string pipelineCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var pipelineCompletion = (from x in db.JDGL_PipelineCompletion where x.PipelineCompletionId == pipelineCompletionId select x).FirstOrDefault();
+            if (pipelineCompletion != null)
+            {
+                db.JDGL_PipelineCompletion.DeleteOnSubmit(pipelineCompletion);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/JDGL/Check/ProgressCompletionService.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 进度完成情况
+    /// </summary>
+    public class ProgressCompletionService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取进度完成情况
+        /// </summary>
+        /// <param name="progressCompletionId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_ProgressCompletion GetProgressCompletionById(string progressCompletionId)
+        {
+            return Funs.DB.JDGL_ProgressCompletion.FirstOrDefault(e => e.ProgressCompletionId == progressCompletionId);
+        }
+
+        /// <summary>
+        /// 根据项目id和月份获取进度完成情况
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="months"></param>
+        /// <returns></returns>
+        public static Model.JDGL_ProgressCompletion GetProgressCompletionByProjectIdAndMonths(string projectId, string months)
+        {
+            return Funs.DB.JDGL_ProgressCompletion.FirstOrDefault(e => e.ProjectId == projectId && e.Months == Convert.ToDateTime(months));
+        }
+
+        /// <summary>
+        /// 添加进度完成情况
+        /// </summary>
+        /// <param name="progressCompletion"></param>
+        public static void AddProgressCompletion(Model.JDGL_ProgressCompletion progressCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_ProgressCompletion newProgressCompletion = new Model.JDGL_ProgressCompletion
+            {
+                ProgressCompletionId = progressCompletion.ProgressCompletionId,
+                ProjectId = progressCompletion.ProjectId,
+                Months = progressCompletion.Months,
+                PlanNum = progressCompletion.PlanNum,
+                RealNum = progressCompletion.RealNum,
+                CompileMan = progressCompletion.CompileMan,
+                CompileDate = progressCompletion.CompileDate,
+            };
+            db.JDGL_ProgressCompletion.InsertOnSubmit(newProgressCompletion);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改进度完成情况
+        /// </summary>
+        /// <param name="progressCompletion"></param>
+        public static void UpdateProgressCompletion(Model.JDGL_ProgressCompletion progressCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_ProgressCompletion newProgressCompletion = db.JDGL_ProgressCompletion.FirstOrDefault(e => e.ProgressCompletionId == progressCompletion.ProgressCompletionId);
+            if (newProgressCompletion != null)
+            {
+                newProgressCompletion.PlanNum = progressCompletion.PlanNum;
+                newProgressCompletion.RealNum = progressCompletion.RealNum;
+                newProgressCompletion.CompileMan = progressCompletion.CompileMan;
+                newProgressCompletion.CompileDate = progressCompletion.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除进度完成情况
+        /// </summary>
+        /// <param name="progressCompletionId"></param>
+        public static void DeleteProgressCompletionById(string progressCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var progressCompletion = (from x in db.JDGL_ProgressCompletion where x.ProgressCompletionId == progressCompletionId select x).FirstOrDefault();
+            if (progressCompletion != null)
+            {
+                db.JDGL_ProgressCompletion.DeleteOnSubmit(progressCompletion);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/JDGL/Check/QuantityCompletionService.cs

@@ -38,7 +38,9 @@ namespace BLL
                 PlanNum = quantityCompletion.PlanNum,
                 RealNum = quantityCompletion.RealNum,
                 CompileMan = quantityCompletion.CompileMan,
-                CompileDate = quantityCompletion.CompileDate
+                CompileDate = quantityCompletion.CompileDate,
+                StartDate=quantityCompletion.StartDate,
+                EndDate=quantityCompletion.EndDate
             };
             db.JDGL_QuantityCompletion.InsertOnSubmit(newQuantityCompletion);
             db.SubmitChanges();

SGGL/BLL/JDGL/Check/SteelStructureCompletionService.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 钢结构完成情况
+    /// </summary>
+    public class SteelStructureCompletionService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取钢结构完成情况
+        /// </summary>
+        /// <param name="steelStructureCompletionId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_SteelStructureCompletion GetSteelStructureCompletionById(string steelStructureCompletionId)
+        {
+            return Funs.DB.JDGL_SteelStructureCompletion.FirstOrDefault(e => e.SteelStructureCompletionId == steelStructureCompletionId);
+        }
+
+        /// <summary>
+        /// 添加钢结构完成情况
+        /// </summary>
+        /// <param name="steelStructureCompletion"></param>
+        public static void AddSteelStructureCompletion(Model.JDGL_SteelStructureCompletion steelStructureCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_SteelStructureCompletion newSteelStructureCompletion = new Model.JDGL_SteelStructureCompletion
+            {
+                SteelStructureCompletionId = steelStructureCompletion.SteelStructureCompletionId,
+                ProjectId = steelStructureCompletion.ProjectId,
+                UnitId = steelStructureCompletion.UnitId,
+                TotalNum = steelStructureCompletion.TotalNum,
+                ArrivalNum = steelStructureCompletion.ArrivalNum,
+                ThisNum = steelStructureCompletion.ThisNum,
+                CompileMan = steelStructureCompletion.CompileMan,
+                CompileDate = steelStructureCompletion.CompileDate,
+                StartDate = steelStructureCompletion.StartDate,
+                EndDate = steelStructureCompletion.EndDate
+            };
+            db.JDGL_SteelStructureCompletion.InsertOnSubmit(newSteelStructureCompletion);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改钢结构完成情况
+        /// </summary>
+        /// <param name="steelStructureCompletion"></param>
+        public static void UpdateSteelStructureCompletion(Model.JDGL_SteelStructureCompletion steelStructureCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_SteelStructureCompletion newSteelStructureCompletion = db.JDGL_SteelStructureCompletion.FirstOrDefault(e => e.SteelStructureCompletionId == steelStructureCompletion.SteelStructureCompletionId);
+            if (newSteelStructureCompletion != null)
+            {
+                newSteelStructureCompletion.TotalNum = steelStructureCompletion.TotalNum;
+                newSteelStructureCompletion.ArrivalNum = steelStructureCompletion.ArrivalNum;
+                newSteelStructureCompletion.ThisNum = steelStructureCompletion.ThisNum;
+                newSteelStructureCompletion.CompileMan = steelStructureCompletion.CompileMan;
+                newSteelStructureCompletion.CompileDate = steelStructureCompletion.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除钢结构完成情况
+        /// </summary>
+        /// <param name="steelStructureCompletionId"></param>
+        public static void DeleteSteelStructureCompletionById(string steelStructureCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var steelStructureCompletion = (from x in db.JDGL_SteelStructureCompletion where x.SteelStructureCompletionId == steelStructureCompletionId select x).FirstOrDefault();
+            if (steelStructureCompletion != null)
+            {
+                db.JDGL_SteelStructureCompletion.DeleteOnSubmit(steelStructureCompletion);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/JDGL/Check/UndergroundPipeCompletionService.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 全厂地下管网完成情况
+    /// </summary>
+    public class UndergroundPipeCompletionService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取全厂地下管网完成情况
+        /// </summary>
+        /// <param name="pipelineCompletionId"></param>
+        /// <returns></returns>
+        public static Model.JDGL_UndergroundPipeCompletion GetUndergroundPipeCompletionById(string pipelineCompletionId)
+        {
+            return Funs.DB.JDGL_UndergroundPipeCompletion.FirstOrDefault(e => e.UndergroundPipeCompletionId == pipelineCompletionId);
+        }
+
+        /// <summary>
+        /// 添加全厂地下管网完成情况
+        /// </summary>
+        /// <param name="pipelineCompletion"></param>
+        public static void AddUndergroundPipeCompletion(Model.JDGL_UndergroundPipeCompletion pipelineCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_UndergroundPipeCompletion newUndergroundPipeCompletion = new Model.JDGL_UndergroundPipeCompletion
+            {
+                UndergroundPipeCompletionId = pipelineCompletion.UndergroundPipeCompletionId,
+                ProjectId = pipelineCompletion.ProjectId,
+                UnitId = pipelineCompletion.UnitId,
+                TotalNum = pipelineCompletion.TotalNum,
+                ThisNum = pipelineCompletion.ThisNum,
+                CompileMan = pipelineCompletion.CompileMan,
+                CompileDate = pipelineCompletion.CompileDate,
+                StartDate = pipelineCompletion.StartDate,
+                EndDate = pipelineCompletion.EndDate
+            };
+            db.JDGL_UndergroundPipeCompletion.InsertOnSubmit(newUndergroundPipeCompletion);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改全厂地下管网完成情况
+        /// </summary>
+        /// <param name="pipelineCompletion"></param>
+        public static void UpdateUndergroundPipeCompletion(Model.JDGL_UndergroundPipeCompletion pipelineCompletion)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.JDGL_UndergroundPipeCompletion newUndergroundPipeCompletion = db.JDGL_UndergroundPipeCompletion.FirstOrDefault(e => e.UndergroundPipeCompletionId == pipelineCompletion.UndergroundPipeCompletionId);
+            if (newUndergroundPipeCompletion != null)
+            {
+                newUndergroundPipeCompletion.TotalNum = pipelineCompletion.TotalNum;
+                newUndergroundPipeCompletion.ThisNum = pipelineCompletion.ThisNum;
+                newUndergroundPipeCompletion.CompileMan = pipelineCompletion.CompileMan;
+                newUndergroundPipeCompletion.CompileDate = pipelineCompletion.CompileDate;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除全厂地下管网完成情况
+        /// </summary>
+        /// <param name="pipelineCompletionId"></param>
+        public static void DeleteUndergroundPipeCompletionById(string pipelineCompletionId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var pipelineCompletion = (from x in db.JDGL_UndergroundPipeCompletion where x.UndergroundPipeCompletionId == pipelineCompletionId select x).FirstOrDefault();
+            if (pipelineCompletion != null)
+            {
+                db.JDGL_UndergroundPipeCompletion.DeleteOnSubmit(pipelineCompletion);
+                db.SubmitChanges();
+            }
+        }
+    }
+}

SGGL/BLL/ProjectData/ProjectService.cs

@@ -265,7 +265,7 @@
                 {
                     return (from x in Funs.DB.Base_Project
                             join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
-                            where y.UserId == userId
+                            where y.UserId == userId && y.IsPost == true
                             orderby x.ProjectCode descending
                             select x).Distinct().ToList();
                 }

SGGL/BLL/ZHGL/Supervise/SuperviseCheckRectifyItemService.cs

@@ -47,11 +47,8 @@ namespace BLL
                 OrderEndDate = superviseCheckRectifyItem.OrderEndDate,
                 OrderEndPerson = superviseCheckRectifyItem.OrderEndPerson,
                 RealEndDate = superviseCheckRectifyItem.RealEndDate,
-                AttachUrl = superviseCheckRectifyItem.AttachUrl,
+                AttachUrl = superviseCheckRectifyItem.AttachUrl
-                VerifierDate = superviseCheckRectifyItem.VerifierDate,
-                VerifierName = superviseCheckRectifyItem.VerifierName,
             };
-
             Funs.DB.Supervise_SuperviseCheckRectifyItem.InsertOnSubmit(newSuperviseCheckRectifyItem);
             Funs.DB.SubmitChanges();
         }

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

@@ -33,6 +33,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -43,7 +46,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" HeaderText="发送日期" TextAlign="Center"
+                        <f:RenderField ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" HeaderText="发送日期" RendererArgument="yyyy-MM-dd" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="FileCode" DataField="FileCode" FieldType="String" HeaderText="文件编号" TextAlign="Center"
@@ -60,7 +63,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="收件单位" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceivingUnit")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceivingUnit")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="ReceivingMan" DataField="ReceivingMan" FieldType="String" HeaderText="收件人" TextAlign="Center"
@@ -78,7 +81,7 @@
                         <f:RenderField ColumnID="ReplyCode" DataField="ReplyCode" FieldType="String" HeaderText="回复单号" TextAlign="Center"
                             HeaderTextAlign="Center" Width="100px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="Date" Renderer="Date" HeaderText="回复日期" TextAlign="Center"
+                        <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="Date" Renderer="Date" HeaderText="回复日期" RendererArgument="yyyy-MM-dd" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistribution.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -249,5 +250,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("资料发放登记" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -102,6 +102,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -112,13 +121,13 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label3 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label3;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -34,6 +34,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -44,7 +47,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="DataReceivingDate" DataField="DataReceivingDate" FieldType="Date" Renderer="Date" HeaderText="接收日期" TextAlign="Center"
+                        <f:RenderField ColumnID="DataReceivingDate" DataField="DataReceivingDate" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="接收日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="FileCode" DataField="FileCode" FieldType="String" HeaderText="文件号" TextAlign="Center"
@@ -55,7 +58,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitNames" Width="280px" HeaderText="发件单位" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("SendUnit")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitNames" runat="server" Text='<%# ConvertCarryUnit(Eval("SendUnit")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="SendMan" DataField="SendMan" FieldType="String" HeaderText="发件人" TextAlign="Center"
@@ -79,7 +82,7 @@
                         <f:RenderField ColumnID="ReplyCode" DataField="ReplyCode" FieldType="String" HeaderText="回复单号" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="String" HeaderText="回复日期" TextAlign="Center"
+                        <f:RenderField ColumnID="ReplyDate" DataField="ReplyDate" FieldType="String" HeaderText="回复日期" RendererArgument="yyyy-MM-dd" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceiving.aspx.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
-
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -253,5 +253,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("资料接收登记" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -102,6 +102,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -112,13 +121,13 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label3 控件。
+        /// lbUnitNames 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label3;
+        protected global::System.Web.UI.WebControls.Label lbUnitNames;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -39,6 +39,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -53,7 +56,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="210px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="ChangeOrderCode" DataField="ChangeOrderCode" FieldType="String" HeaderText="变更单号" TextAlign="Center"
@@ -65,21 +68,21 @@
                         <f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Center"
                             HeaderTextAlign="Center" Width="220px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="IssuedDate" DataField="IssuedDate" FieldType="Date" Renderer="Date" HeaderText="下发日期" TextAlign="Center"
+                        <f:RenderField ColumnID="IssuedDate" DataField="IssuedDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="下发日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" HeaderText="业主批准日期" TextAlign="Center"
+                        <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="业主批准日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitName" Width="220px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("UnitId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitName" runat="server" Text='<%# ConvertCarryUnit(Eval("UnitId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="ImplementationFrontState" DataField="ImplementationFrontState" FieldType="String" HeaderText="实施前状态" TextAlign="Center"
                             HeaderTextAlign="Center" Width="150px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" Renderer="Date" HeaderText="施工完成日期" TextAlign="Center"
+                        <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="施工完成日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
+
 namespace FineUIPro.Web.Comprehensive
 {
     public partial class DesignChangeOrder : PageBase
@@ -315,5 +317,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("设计变更单管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -129,6 +129,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -139,22 +148,22 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
-        /// Label3 控件。
+        /// lbUnitName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label3;
+        protected global::System.Web.UI.WebControls.Label lbUnitName;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -27,6 +27,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -45,17 +48,17 @@
                         <f:RenderField ColumnID="DetailsMan" DataField="DetailsMan" FieldType="String" HeaderText="交底人" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="DetailsDate" DataField="DetailsDate" FieldType="Date" Renderer="Date" HeaderText="交底日期" TextAlign="Center"
+                        <f:RenderField ColumnID="DetailsDate" DataField="DetailsDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="交底日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="180px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:TemplateField ColumnID="UnitName" Width="180px" HeaderText="参加单位" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
                             <ItemTemplate>
-                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertCarryUnit(Eval("UnitName")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitName" runat="server" Text='<%# ConvertCarryUnit(Eval("UnitName")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
+
 namespace FineUIPro.Web.Comprehensive
 {
     public partial class DesignDetails : PageBase
@@ -267,5 +269,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("设计交底管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -84,6 +84,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -94,22 +103,22 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
-        /// Label1 控件。
+        /// lbUnitName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label1;
+        protected global::System.Web.UI.WebControls.Label lbUnitName;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -35,6 +35,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Hidden="true" Icon="PackageIn" runat="server" OnClick="btnImport_Click">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -50,7 +53,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="DesignDrawingsCode" DataField="DesignDrawingsCode" FieldType="String" HeaderText="设计图纸编号" TextAlign="Center"
@@ -65,16 +68,16 @@
                         <f:RenderField ColumnID="PageNumber" DataField="PageNumber" FieldType="String" HeaderText="页数" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="Date" Renderer="Date" HeaderText="接收日期" TextAlign="Center"
+                        <f:RenderField ColumnID="ReceiveDate" DataField="ReceiveDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="接收日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" HeaderText="发送日期" TextAlign="Center"
+                        <f:RenderField ColumnID="SendDate" DataField="SendDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="发送日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:TemplateField ColumnID="ReceiveUnits" Width="310px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center"
+                        <f:TemplateField ColumnID="UnitName" Width="310px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnits")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitName" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnits")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="ReceiveMan" DataField="ReceiveMan" FieldType="String" HeaderText="接收人" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -311,6 +312,25 @@ namespace FineUIPro.Web.Comprehensive
                 }
             }
         }
-        #endregion        
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("图纸收发记录" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -111,6 +111,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -121,22 +130,22 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
-        /// Label3 控件。
+        /// lbUnitName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label3;
+        protected global::System.Web.UI.WebControls.Label lbUnitName;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -32,6 +32,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -49,7 +52,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="210px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="PlanCode" DataField="PlanCode" FieldType="String" HeaderText="编号" TextAlign="Center"
@@ -58,7 +61,7 @@
                         <f:RenderField ColumnID="PlanName" DataField="PlanName" FieldType="String" HeaderText="方案名称" TextAlign="Center"
                             HeaderTextAlign="Center" Width="180px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" HeaderText="审批日期" TextAlign="Center"
+                        <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" HeaderText="审批日期" RendererArgument="yyyy-MM-dd" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="AuditMan" DataField="AuditMan" FieldType="String" HeaderText="审核人" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApproval.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -255,5 +256,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("施工组织设计及施工方案" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -102,6 +102,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -112,13 +121,13 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
         /// LinkButton1 控件。

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

@@ -16,7 +16,7 @@
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionEquipmentId" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="InspectionEquipmentId" AllowSorting="true" SortField="InspectionCode"
-                    SortDirection="DESC" OnSort="Grid1_Sort"
+                    SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
                     <Toolbars>
@@ -39,6 +39,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -79,7 +82,7 @@
                         <f:RenderField ColumnID="SamplingResult" DataField="SamplingResult" FieldType="String" HeaderText="本次抽检结果" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
+                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="报验日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="UsedPlace" DataField="UsedPlace" FieldType="String" HeaderText="拟使用部位" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
+
 namespace FineUIPro.Web.Comprehensive
 {
     public partial class InspectionEquipment : PageBase
@@ -240,5 +242,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("设备材料报验" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

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

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

@@ -16,7 +16,7 @@
                 <f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="机具报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="InspectionMachineId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="InspectionMachineId" AllowSorting="true" SortField="InspectionMachineCode"
                     SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
-                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" OnPageIndexChange="Grid1_PageIndexChange">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
@@ -37,6 +37,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -64,7 +67,7 @@
                         <f:RenderField ColumnID="SpecificationModel" DataField="SpecificationModel" FieldType="String" HeaderText="规格型号" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="NextTestDate" DataField="NextTestDate" FieldType="Date" Renderer="Date" HeaderText="下次检验日期" TextAlign="Center"
+                        <f:RenderField ColumnID="NextTestDate" DataField="NextTestDate" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="下次检验日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="TestCycle" DataField="TestCycle" FieldType="String" HeaderText="检验周期" TextAlign="Center"
@@ -73,13 +76,13 @@
                         <f:RenderField ColumnID="IsVerification" DataField="IsVerification" FieldType="String" HeaderText="是否在校验期内" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
+                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="报验日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="UnitsCount" DataField="UnitsCount" FieldType="String" HeaderText="台数" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="LeaveDate" DataField="LeaveDate" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
+                        <f:RenderField ColumnID="LeaveDate" DataField="LeaveDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="离场时间" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
+
 namespace FineUIPro.Web.Comprehensive
 {
     public partial class InspectionMachine : PageBase
@@ -239,5 +241,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("机具报验" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

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

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

@@ -34,6 +34,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -54,7 +57,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="110px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="PostName" DataField="PostName" FieldType="String" HeaderText="工种" TextAlign="Center"
@@ -69,13 +72,13 @@
                         <f:RenderField ColumnID="QualifiedProjectCode" DataField="QualifiedProjectCode" FieldType="String" HeaderText="合格项目代号（级别）" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ValidityDate" DataField="ValidityDate" FieldType="Date" Renderer="Date" HeaderText="有效期" TextAlign="Center"
+                        <f:RenderField ColumnID="ValidityDate" DataField="ValidityDate" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="有效期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ApprovalTime" DataField="ApprovalTime" FieldType="Date" Renderer="Date" HeaderText="批准时间" TextAlign="Center"
+                        <f:RenderField ColumnID="ApprovalTime" DataField="ApprovalTime" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="批准时间" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="DepartureTime" DataField="DepartureTime" FieldType="Date" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
+                        <f:RenderField ColumnID="DepartureTime" DataField="DepartureTime" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="离场时间" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
+
 namespace FineUIPro.Web.Comprehensive
 {
     public partial class InspectionPerson : PageBase
@@ -308,5 +310,24 @@ namespace FineUIPro.Web.Comprehensive
                 PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("PersonItem.aspx?InspectionPersonId={0}", Grid1.SelectedRowID, "编辑 - ")));
             }
         }
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("人员报验" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -111,6 +111,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -121,13 +130,13 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -32,6 +32,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -50,7 +53,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="PlanCode" DataField="PlanCode" FieldType="String" HeaderText="编号" TextAlign="Center"
@@ -62,7 +65,7 @@
                         <f:RenderField ColumnID="ReviewMan" DataField="ReviewMan" FieldType="String" HeaderText="评审人员" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" HeaderText="审批日期" TextAlign="Center"
+                        <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="审批日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="AuditMan" DataField="AuditMan" FieldType="String" HeaderText="审核人" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -255,5 +256,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("超过一定规模的危大施工方案" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -102,6 +102,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -112,13 +121,13 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
         /// LinkButton1 控件。

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

@@ -34,6 +34,9 @@
                                 </f:Button>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -44,7 +47,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="发出单位" TextAlign="Center"
+                        <f:RenderField ColumnID="UnitName2" DataField="UnitName" FieldType="String" HeaderText="发出单位" TextAlign="Center"
                             HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
                         <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
@@ -52,7 +55,7 @@
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="260px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="NCRCode" DataField="NCRCode" FieldType="String" HeaderText="NCR单号" TextAlign="Center"
@@ -61,21 +64,21 @@
                         <f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Left"
                             HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="IssuedDate" DataField="IssuedDate" FieldType="Date" Renderer="Date" HeaderText="下发日期" TextAlign="Center"
+                        <f:RenderField ColumnID="IssuedDate" DataField="IssuedDate" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="下发日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="130px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitNames" Width="260px" HeaderText="接收单位" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
-                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnit")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitNames" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnit")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="ImplementationFrontState" DataField="ImplementationFrontState" FieldType="String" HeaderText="实施状态" TextAlign="Center"
                             HeaderTextAlign="Center" Width="130px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="ClosedDate" DataField="ClosedDate" FieldType="Date" Renderer="Date" HeaderText="要求封闭日期" TextAlign="Center"
+                        <f:RenderField ColumnID="ClosedDate" DataField="ClosedDate" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="要求封闭日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" Renderer="Date" HeaderText="完成日期" TextAlign="Center"
+                        <f:RenderField ColumnID="CompleteDate" DataField="CompleteDate" FieldType="Date" RendererArgument="yyyy-MM-dd" Renderer="Date" HeaderText="完成日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
                         <f:RenderField ColumnID="ResponsibleMan" DataField="ResponsibleMan" FieldType="String" HeaderText="责任人" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
-
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -298,5 +298,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("NCR管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -111,6 +111,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -121,22 +130,22 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
-        /// Label3 控件。
+        /// lbUnitNames 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label3;
+        protected global::System.Web.UI.WebControls.Label lbUnitNames;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -30,6 +30,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -40,7 +43,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
+                        <f:RenderField ColumnID="UnitName2" DataField="UnitName" FieldType="String" HeaderText="所属单位" TextAlign="Center"
                             HeaderTextAlign="Center" Width="320px">
                         </f:RenderField>
                         <f:RenderField ColumnID="EstimateNumber" DataField="EstimateNumber" FieldType="String" HeaderText="预计压力管道条数" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -227,5 +228,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("压力管道管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

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

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

@@ -25,6 +25,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" ToolTip="新增" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -35,15 +38,15 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="报验单位" TextAlign="Left"
+                        <f:RenderField ColumnID="UnitName2" DataField="UnitName" FieldType="String" HeaderText="报验单位" TextAlign="Left"
                             HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="Time" DataField="Time" FieldType="Date" Renderer="Date" HeaderText="时间" TextAlign="Center"
+                        <f:RenderField ColumnID="Time" DataField="Time" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="时间" TextAlign="Center"
                             HeaderTextAlign="Center" Width="100px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Left">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                                <asp:Label ID="lbUnitWorkName" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                         <f:RenderField ColumnID="Place" DataField="Place" FieldType="String" HeaderText="地点" TextAlign="Left"

SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -237,5 +238,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("质量事故处理记录" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

@@ -66,6 +66,15 @@ namespace FineUIPro.Web.Comprehensive {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -76,13 +85,13 @@ namespace FineUIPro.Web.Comprehensive {
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
         
         /// <summary>
-        /// Label2 控件。
+        /// lbUnitWorkName 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label2;
+        protected global::System.Web.UI.WebControls.Label lbUnitWorkName;
         
         /// <summary>
         /// lbtnFileUrl 控件。

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

@@ -40,6 +40,9 @@
                                 </f:Button>
                                  <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -67,7 +70,7 @@
                          <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                         <f:RenderField ColumnID="VisaDate" DataField="VisaDate" FieldType="Date" Renderer="Date" HeaderText="签证时间" TextAlign="Center"
+                         <f:RenderField ColumnID="VisaDate" DataField="VisaDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="签证时间" TextAlign="Center"
                             HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
                          <f:RenderField ColumnID="SignMan" DataField="SignMan" FieldType="String" HeaderText="签证人" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
+
 namespace FineUIPro.Web.Comprehensive
 {
     public partial class SiteVisaManagement : PageBase
@@ -229,5 +231,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("现场签证管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

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

SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs

@@ -374,68 +374,52 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                 var cns = from x in Funs.DB.Base_CNProfessional select x;
                 var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x;
-                var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder
+                var oldViewInfos = from x in Funs.DB.Comprehensive_SiteVisaManagement
                                    where x.ProjectId == this.CurrUser.LoginProjectId
                                    select x;
                 for (int i = 0; i < ir; i++)
                 {
-                    var oldViewInfo = oldViewInfos.Where(x => x.ChangeOrderCode == pds.Rows[i][2].ToString().Trim()).FirstOrDefault();
+                    var oldViewInfo = oldViewInfos.Where(x => x.VisaCode == pds.Rows[i][1].ToString().Trim()).FirstOrDefault();
                     if (oldViewInfo == null)
                     {
-                        Model.Comprehensive_DesignChangeOrder Ins = new Model.Comprehensive_DesignChangeOrder();
+                        Model.Comprehensive_SiteVisaManagement Ins = new Model.Comprehensive_SiteVisaManagement();
                         Ins.ProjectId = this.CurrUser.LoginProjectId;
+
                         if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
                         {
-                            Ins.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][0].ToString().Trim()).CNProfessionalId;
+                            Ins.UnitId = Funs.DB.Base_Unit.First(e => e.UnitName == pds.Rows[i][0].ToString().Trim()).UnitId;
                         }
 
-                        if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim()))
+                        Ins.VisaCode = pds.Rows[i][1].ToString().Trim();
+                        Ins.VisaContent = pds.Rows[i][2].ToString().Trim();
+                        string row3 = pds.Rows[i][3].ToString().Trim();
+                        if (!string.IsNullOrEmpty(row3))
                         {
-                            Ins.UnitWorkId = Funs.DB.WBS_UnitWork.First(e => e.UnitWorkName == pds.Rows[i][1].ToString().Trim()).UnitWorkId;
+                            Ins.ProcessingState = row3;
+                        }
+                        else
+                        {
+                            Ins.ProcessingState = "未实施";
+                        }
+                        if (!string.IsNullOrEmpty(pds.Rows[i][4].ToString().Trim()))
+                        {
+                            Ins.UnitWorkId = installations.First(e => e.UnitWorkName == pds.Rows[i][4].ToString().Trim()).UnitWorkId;
                         }
-
-                        Ins.ChangeOrderCode = pds.Rows[i][2].ToString().Trim();
-                        Ins.ChangeReason = pds.Rows[i][3].ToString().Trim();
-                        Ins.Contents = pds.Rows[i][4].ToString().Trim();
-
                         if (!string.IsNullOrEmpty(pds.Rows[i][5].ToString().Trim()))
                         {
-                            Ins.IssuedDate = Convert.ToDateTime(pds.Rows[i][5].ToString().Trim());
+                            Ins.CNProfessionalId = Funs.DB.Base_CNProfessional.First(e => e.ProfessionalName == pds.Rows[i][5].ToString().Trim()).CNProfessionalId;
                         }
-
                         if (!string.IsNullOrEmpty(pds.Rows[i][6].ToString().Trim()))
                         {
-                            Ins.ApprovalDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());
+                            Ins.VisaDate = Convert.ToDateTime(pds.Rows[i][6].ToString().Trim());
                         }
-
+                        Ins.SignMan = pds.Rows[i][7].ToString().Trim();
-                        if (!string.IsNullOrEmpty(pds.Rows[i][7].ToString().Trim()))
+                        Ins.AuditMan = pds.Rows[i][8].ToString().Trim();
-                        {
+                        Ins.Remark = pds.Rows[i][9].ToString().Trim();
-                            Ins.UnitId = BLL.UnitService.GetUnitByUnitId(pds.Rows[i][7].ToString().Trim()).UnitId;
+                        Ins.VisaId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagement));
-                        }
-
-                        Ins.ImplementationFrontState = pds.Rows[i][8].ToString().Trim();
-
-                        string row9 = pds.Rows[i][9].ToString().Trim();
-                        if (!string.IsNullOrEmpty(row9))
-                        {
-                            if (row9 == "未实施")
-                            {
-                                Ins.HandleState = "1";
-                            }
-                            if (row9 == "进行中")
-                            {
-                                Ins.HandleState = "2";
-                            }
-                            if (row9 == "已完成")
-                            {
-                                Ins.HandleState = "3";
-                            }
-                        }
-
-                        Ins.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder));
                         Ins.CompileMan = this.CurrUser.UserId;
-                        Ins.CompileDate = DateTime.Now.Date;
+
-                        BLL.DesignChangeOrderService.AddDesignChangeOrder(Ins);
+                        BLL.SiteVisaManagementService.AddSiteVisaManagement(Ins);
                     }
                 }
 

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

@@ -32,6 +32,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>

SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.Comprehensive
 {
@@ -217,5 +218,24 @@ namespace FineUIPro.Web.Comprehensive
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("特种设备管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

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

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

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReport.aspx

@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="true" DataIDField="ReportId" SortDirection="DESC" BoxFlex="1" AllowCellEditing="true"
+                <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="true" SortField="StartDate" DataIDField="ReportId" SortDirection="DESC" BoxFlex="1" AllowCellEditing="true"
                     DataKeyNames="ReportId" EnableColumnLines="true" ClicksToEdit="2" AllowSorting="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
                     AllowFilters="true" EnableTextSelection="True">
                     <Toolbars>

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs

@@ -85,8 +85,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                         }
                     }
                     this.txtPeriod.ReadOnly = true;
-                    this.txtStartDate.Enabled = false;
+                    //this.txtStartDate.Enabled = false;
-                    this.txtEndDate.Enabled = false;
+                    //this.txtEndDate.Enabled = false;
                     GetThisWeekOrMonthContentList(this.ReportId);//本月主要工作内容
                     GetRowMaterialProblemList(this.ReportId);//原材料问题
                     GetConstructionProblemsList(this.ReportId);//施工过程问题

SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportPrint.aspx

@@ -48,7 +48,7 @@
 
             var WebBrowser = '<OBJECT ID="WebBrowser1" WIDTH=0 HEIGHT=0 CLASSID="CLSID:8856F961-340A-11D0-A96B-00C04FD705A2"></OBJECT>';
             document.body.insertAdjacentHTML('beforeEnd', WebBrowser); //在body标签内加入html（WebBrowser activeX控件）
-            WebBrowser1.ExecWB(6, 6); //打印
+            WebBrowser1.ExecWB(6, 1); //打印
             WebBrowser1.outerHTML = ""; //从代码中清除插入的html代码
             pagesetup_default(); //打印结束后页眉页脚恢复默认值
             document.getElementById("div1").style.display = "block";
@@ -71,13 +71,13 @@
                             </td>
                             <td align="right" valign="middle" style="width: 70%; height: 30px; border-width: 0px;">
                                 <asp:ImageButton ID="btnExport" runat="server" ImageUrl="~/Images/Export.gif" OnClick="btnExport_Click" />
-                                <img src="../Images/PageSetup.gif" runat="server" id="Img2" onclick="document.all.WebBrowser.ExecWB(8,1)"
+                                <img src="~/Images/PageSetup.gif" runat="server" id="Img2" onclick="document.all.WebBrowser.ExecWB(8,1)"
                                     alt="页面设置" style="cursor: pointer" />
-                                <img src="../Images/PrintSetup.gif" runat="server" id="btnPrint" onclick="document.all.WebBrowser.ExecWB(6,1)"
+                                <img src="~/Images/PrintSetup.gif" runat="server" id="btnPrint" onclick="document.all.WebBrowser.ExecWB(6,1)"
                                     alt="打印设置" style="cursor: pointer" />
-                                <img src="../Images/PrintPreview.gif" runat="server" id="Img1" onclick="printpr()"
+                                <img src="~/Images/PrintPreview.gif" runat="server" id="Img1" onclick="printpr()"
                                     alt="打印预览" style="cursor: pointer" />
-                                <img src="../Images/Print.gif" runat="server" id="Img3" onclick="print()" alt="打印"
+                                <img src="~/Images/Print.gif" runat="server" id="Img3" onclick="print()" alt="打印"
                                     style="cursor: pointer" />
                             </td>
                         </tr>

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReport.aspx

@@ -13,7 +13,7 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="true" DataIDField="ReportId" SortDirection="DESC" BoxFlex="1" AllowCellEditing="true"
+                <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="true" SortField="StartDate" DataIDField="ReportId" SortDirection="DESC" BoxFlex="1" AllowCellEditing="true"
                     DataKeyNames="ReportId" EnableColumnLines="true" ClicksToEdit="2" AllowSorting="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" ForceFit="true"
                     AllowFilters="true" EnableTextSelection="True">
                     <Toolbars>

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs

@@ -85,8 +85,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                         }
                     }
                     this.txtPeriod.ReadOnly = true;
-                    this.txtStartDate.Enabled = false;
+                    //this.txtStartDate.Enabled = false;
-                    this.txtEndDate.Enabled = false;
+                    //this.txtEndDate.Enabled = false;
                     GetThisWeekOrMonthContentList(this.ReportId);//本周主要工作内容
                     GetRowMaterialProblemList(this.ReportId);//原材料问题
                     GetConstructionProblemsList(this.ReportId);//施工过程问题

SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportPrint.aspx

@@ -48,7 +48,7 @@
 
             var WebBrowser = '<OBJECT ID="WebBrowser1" WIDTH=0 HEIGHT=0 CLASSID="CLSID:8856F961-340A-11D0-A96B-00C04FD705A2"></OBJECT>';
             document.body.insertAdjacentHTML('beforeEnd', WebBrowser); //在body标签内加入html（WebBrowser activeX控件）
-            WebBrowser1.ExecWB(6, 6); //打印
+            WebBrowser1.ExecWB(6, 1); //打印
             WebBrowser1.outerHTML = ""; //从代码中清除插入的html代码
             pagesetup_default(); //打印结束后页眉页脚恢复默认值
             document.getElementById("div1").style.display = "block";
@@ -71,13 +71,13 @@
                             </td>
                             <td align="right" valign="middle" style="width: 70%; height: 30px; border-width: 0px;">
                                 <asp:ImageButton ID="btnExport" runat="server" ImageUrl="~/Images/Export.gif" OnClick="btnExport_Click" />
-                                <img src="../Images/PageSetup.gif" runat="server" id="Img2" onclick="document.all.WebBrowser.ExecWB(8,1)"
+                                <img src="~/Images/PageSetup.gif" runat="server" id="Img2" onclick="document.all.WebBrowser.ExecWB(8,1)"
                                     alt="页面设置" style="cursor: pointer" />
-                                <img src="../Images/PrintSetup.gif" runat="server" id="btnPrint" onclick="document.all.WebBrowser.ExecWB(6,1)"
+                                <img src="~/Images/PrintSetup.gif" runat="server" id="btnPrint" onclick="document.all.WebBrowser.ExecWB(6,1)"
                                     alt="打印设置" style="cursor: pointer" />
-                                <img src="../Images/PrintPreview.gif" runat="server" id="Img1" onclick="printpr()"
+                                <img src="~/Images/PrintPreview.gif" runat="server" id="Img1" onclick="printpr()"
                                     alt="打印预览" style="cursor: pointer" />
-                                <img src="../Images/Print.gif" runat="server" id="Img3" onclick="print()" alt="打印"
+                                <img src="~/Images/Print.gif" runat="server" id="Img3" onclick="print()" alt="打印"
                                     style="cursor: pointer" />
                             </td>
                         </tr>

SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Web.UI.WebControls;
+using BLL;
 namespace FineUIPro.Web.CQMS.ProcessControl
 {
     public partial class CheckManStatistics : PageBase
@@ -83,23 +85,14 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// <param name="e"></param>
         protected void btnOut_Click(object sender, EventArgs e)
         {
-            DateTime dt = DateTime.Now;
+            Response.ClearContent();
-            string filename = dt.Year.ToString() + dt.Month.ToString() + dt.Day.ToString() + dt.Hour.ToString() + dt.Minute.ToString() + dt.Second.ToString();
+            string filename = Funs.GetNewFileName();
-
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("检查人检查次数统计" + filename, System.Text.Encoding.UTF8) + ".xls");
-            Response.Clear();
+            Response.ContentType = "application/excel";
-            Response.Buffer = true;
+            Response.ContentEncoding = Encoding.UTF8;
-            Response.Charset = "GB2312";
+            this.gvCheckManStatistics.PageSize = gvCheckManStatistics.RecordCount;
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            BindGvInspectionManagement();
-            Response.Write("<meta http-equiv=Content-Type content=text/html;charset=UTF-8>");
+            Response.Write(GetGridTableHtml2(gvCheckManStatistics));
-
-            Response.AppendHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("检查人检查次数统计" + filename, System.Text.Encoding.UTF8) + ".xls");
-            Response.ContentType = "application/ms-excel";
-            this.EnableViewState = false;
-            System.IO.StringWriter oStringWriter = new System.IO.StringWriter();
-            System.Web.UI.HtmlTextWriter oHtmlTextWriter = new System.Web.UI.HtmlTextWriter(oStringWriter);
-            this.gvCheckManStatistics.RenderControl(oHtmlTextWriter);
-            Response.Write(oStringWriter.ToString());
-            Response.Flush();
             Response.End();
         }
     }

SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx

@@ -32,6 +32,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="增加" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>

SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.CQMS.ProcessControl
 {
@@ -232,5 +233,24 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("热处理检测" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/CQMS/ProcessControl/HotProessManage.aspx.designer.cs

@@ -111,6 +111,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx

@@ -38,6 +38,9 @@
                                     EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                                 <%--<f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click">
                                 </f:Button>--%>
                             </Items>
@@ -50,7 +53,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="施工分包商" TextAlign="Center"
+                        <f:RenderField ColumnID="UnitName3" DataField="UnitName" FieldType="String" HeaderText="施工分包商" TextAlign="Center"
                             HeaderTextAlign="Center" Width="260px">
                         </f:RenderField>
                         <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
@@ -71,7 +74,7 @@
                         <f:RenderField ColumnID="InspectionCode" DataField="InspectionCode" FieldType="String" HeaderText="报检编号" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" HeaderText="验收日期" TextAlign="Center"
+                        <f:RenderField ColumnID="InspectionDate" DataField="InspectionDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="验收日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.CQMS.ProcessControl
 {
@@ -231,5 +232,24 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("控制点检查检测" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.designer.cs

@@ -111,6 +111,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx

@@ -15,7 +15,7 @@
             <Items>
                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="控制点检查检测合格率统计" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="CheckDate" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="CheckDate" AllowSorting="true" SortField="CheckDate"
+                    ClicksToEdit="2" DataIDField="CheckDate" AllowSorting="true" SortField="CheckDate" ForceFit="true"
                     SortDirection="ASC" EnableTextSelection="true">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
@@ -38,14 +38,18 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:BoundField DataField="CheckDate" HeaderText="日期" TextAlign="Center" HeaderTextAlign="Center" ExpandUnusedSpace="true">
+                        <f:RenderField ColumnID="CheckDate" DataField="CheckDate" FieldType="String" HeaderText="日期" TextAlign="Center"
-                        </f:BoundField>
+                            HeaderTextAlign="Center" Width="220px">
-                        <f:BoundField DataField="OneStatisticsSunNumber" HeaderText="一次合格数" TextAlign="Center" HeaderTextAlign="Center" ExpandUnusedSpace="true">
+                        </f:RenderField>
-                        </f:BoundField>
+                        <f:RenderField ColumnID="OneStatisticsSunNumber" DataField="OneStatisticsSunNumber" FieldType="String" HeaderText="一次合格数" TextAlign="Center"
-                        <f:BoundField DataField="SunNumber" HeaderText="总数" TextAlign="Center" HeaderTextAlign="Center" ExpandUnusedSpace="true">
+                            HeaderTextAlign="Center" Width="220px">
-                        </f:BoundField>
+                        </f:RenderField>
-                        <f:BoundField DataField="OneStatistics" HeaderText="一次合格率" TextAlign="Center" HeaderTextAlign="Center" ExpandUnusedSpace="true">
+                        <f:RenderField ColumnID="SunNumber" DataField="SunNumber" FieldType="String" HeaderText="总数" TextAlign="Center"
-                        </f:BoundField>
+                            HeaderTextAlign="Center" Width="220px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="OneStatistics" DataField="OneStatistics" FieldType="String" HeaderText="一次合格率" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="220px">
+                        </f:RenderField>
                     </Columns>
                 </f:Grid>
             </Items>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
@@ -229,23 +230,21 @@ namespace FineUIPro.Web.CQMS.ProcessControl
 
         protected void btnOut_Click(object sender, EventArgs e)
         {
-            DateTime dt = DateTime.Now;
+            Response.ClearContent();
-            string filename = dt.Year.ToString() + dt.Month.ToString() + dt.Day.ToString() + dt.Hour.ToString() + dt.Minute.ToString() + dt.Second.ToString();
+            string filename = Funs.GetNewFileName();
-
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("控制点检查检测合格率统计" + filename, System.Text.Encoding.UTF8) + ".xls");
-            Response.Clear();
+            Response.ContentType = "application/excel";
-            Response.Buffer = true;
+            Response.ContentEncoding = Encoding.UTF8;
-            Response.Charset = "GB2312";
+            this.Grid1.PageSize = Grid1.RecordCount;
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            if (this.drpCNProfessional.SelectedValue != BLL.Const._Null)
-            Response.Write("<meta http-equiv=Content-Type content=text/html;charset=UTF-8>");
+            {
-
+                BindGvInspectionManagement(this.drpCNProfessional.SelectedValue);
-            Response.AppendHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode("控制点检查检测合格率统计" + filename, System.Text.Encoding.UTF8) + ".xls");
+            }
-            Response.ContentType = "application/ms-excel";
+            else
-            this.EnableViewState = false;
+            {
-            System.IO.StringWriter oStringWriter = new System.IO.StringWriter();
+                BindGvInspectionManagement(null);
-            System.Web.UI.HtmlTextWriter oHtmlTextWriter = new System.Web.UI.HtmlTextWriter(oStringWriter);
+            }
-            this.Grid1.RenderControl(oHtmlTextWriter);
+            Response.Write(GetGridTableHtml2(Grid1));
-            Response.Write(oStringWriter.ToString());
-            Response.Flush();
             Response.End();
         }
     }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx

@@ -40,6 +40,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="增加" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -49,7 +52,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="施工分包商" TextAlign="Center"
+                        <f:RenderField ColumnID="UnitName3" DataField="UnitName" FieldType="String" HeaderText="施工分包商" TextAlign="Center"
                             HeaderTextAlign="Center" Width="260px">
                         </f:RenderField>
                         <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.CQMS.ProcessControl
 {
@@ -244,5 +245,24 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("共检通知单" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.designer.cs

@@ -120,6 +120,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest.aspx

@@ -41,6 +41,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="增加" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -72,7 +75,7 @@
                         <f:RenderField ColumnID="OnceQualifiedCount" DataField="OnceQualifiedCount" FieldType="String" HeaderText="一次合格数" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="NondestructiveTestDate" DataField="NondestructiveTestDate" FieldType="Date" Renderer="Date" HeaderText="日期" TextAlign="Center"
+                        <f:RenderField ColumnID="NondestructiveTestDate" DataField="NondestructiveTestDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >

SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest.aspx.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
+
 namespace FineUIPro.Web.CQMS.ProcessControl
 {
     public partial class NondestructiveTest : PageBase
@@ -248,5 +250,24 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("无损检测管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest.aspx.designer.cs

@@ -129,6 +129,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx

@@ -35,6 +35,9 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="增加" Hidden="true">
                                 </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -54,10 +57,10 @@
                         <f:RenderField ColumnID="TestPressure" DataField="TestPressure" FieldType="String" HeaderText="试验压力" TextAlign="Center"
                             HeaderTextAlign="Center" Width="180px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="PlanTestDate" DataField="PlanTestDate" FieldType="Date" Renderer="Date" HeaderText="计划实验日期" TextAlign="Center"
+                        <f:RenderField ColumnID="PlanTestDate" DataField="PlanTestDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划实验日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="150px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="CompletedDate" DataField="CompletedDate" FieldType="Date" Renderer="Date" HeaderText="实验完成日期" TextAlign="Center"
+                        <f:RenderField ColumnID="CompletedDate" DataField="CompletedDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实验完成日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="150px">
                         </f:RenderField>
                         <f:RenderField ColumnID="CompletedState" DataField="CompletedState" FieldType="String" HeaderText="完成状态" TextAlign="Center"

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.CQMS.ProcessControl
 {
@@ -212,5 +213,24 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
         }
         #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("管道试压包管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/CQMS/ProcessControl/TestPackageManagement.aspx.designer.cs

@@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
         
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>

SGGL/FineUIPro.Web/Door/InOutList.aspx

@@ -65,7 +65,7 @@
                         SortField="DepartName" FieldType="String" HeaderText="组织" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>
-                      <f:RenderField Width="80px" ColumnID="AreaName" DataField="AreaName"
+                      <f:RenderField Width="100px" ColumnID="AreaName" DataField="AreaName"
                         SortField="AreaName" FieldType="String" HeaderText="区域" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>

SGGL/FineUIPro.Web/Door/InOutList.aspx.cs

@@ -76,7 +76,7 @@ namespace FineUIPro.Web.Door
                     }
                 }
                 else
-                {
+                {                    
                     strSql = @"SELECT NewID,ID,V.ProjectId,EmployName,DepartmentID,DepartName,AreaID,AreaName,EmployNO,CardID,RoleID
                             ,DateTimeRecord,RecordDes, InOrOut  ,P.UnitId,P.TeamGroupId
                             FROM dbo.t_d_facerecord  V

SGGL/FineUIPro.Web/ErrLog.txt

@@ -1,10 +1,9 @@
 
 错误信息开始=====>
 错误类型:SqlException
-错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
+错误信息:对象名 'dbo.View_JDGL_ProgressCompletion' 无效。
 错误堆栈:
    在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
    在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
    在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
    在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
@@ -14,542 +13,56 @@
    在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
    在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
    在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 System.Data.Common.DbCommand.ExecuteReader()
-   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
-   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
-   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
-   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
-   在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\GetDataService.cs:行号 139
-   在 BLL.MonitorService.DoSynchData() 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 2180
-   在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 112
-----错误类型:Win32Exception
-----错误信息:
-----等待的操作过时。
-----错误堆栈:
-    出错时间:04/16/2021 11:26:57
-出错时间:04/16/2021 11:26:58
-
-
-错误信息开始=====>
-错误类型:ChangeConflictException
-错误信息:找不到行或行已更改。
-错误堆栈:
-   在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
-   在 System.Data.Linq.DataContext.SubmitChanges()
-   在 BLL.ComprehensiveService.DeleteComprehensiveByReportId(String reportId) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\CQMS\ManageReport\ComprehensiveService.cs:行号 63
-   在 FineUIPro.Web.CQMS.ManageReport.WeekReport.btnMenuDel_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\CQMS\ManageReport\WeekReport.aspx.cs:行号 74
-   在 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)
-出错时间:04/18/2021 10:55:35
-出错文件:http://localhost:8118/CQMS/ManageReport/WeekReport.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/18/2021 10:55:35
-
-
-错误信息开始=====>
-错误类型:InvalidCastException
-错误信息:无法将类型为“System.Web.UI.WebControls.TextBox”的对象强制转换为类型“FineUIPro.TextBox”。
-错误堆栈:
-   在 FineUIPro.Web.CQMS.ManageReport.WeekReportEdit.saveThisWeekAndMonthContent() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\CQMS\ManageReport\WeekReportEdit.aspx.cs:行号 275
-   在 FineUIPro.Web.CQMS.ManageReport.WeekReportEdit.btnAddThisWeekAndMonthContent_Click(Object sender, ImageClickEventArgs e) 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\CQMS\ManageReport\WeekReportEdit.aspx.cs:行号 257
-   在 System.Web.UI.WebControls.ImageButton.OnClick(ImageClickEventArgs e)
-   在 System.Web.UI.WebControls.ImageButton.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.WebControls.ImageButton.System.Web.UI.IPostBackEventHandler.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)
-出错时间:04/18/2021 10:56:04
-出错文件:http://localhost:8118/CQMS/ManageReport/WeekReportEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/18/2021 10:56:04
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 (PageManager )
-   在 FineUIPro.ControlBase.OnFirstPreRender()
-   在 (ControlBase )
-   在 FineUIPro.Component.OnFirstPreRender()
-   在 (Component )
-   在 FineUIPro.BoxComponent.OnFirstPreRender()
-   在 (BoxComponent )
-   在 FineUIPro.Container.OnFirstPreRender()
-   在 (Container )
-   在 FineUIPro.PanelBase.OnFirstPreRender()
-   在 (PanelBase )
-   在 FineUIPro.CollapsablePanel.OnFirstPreRender()
-   在 (CollapsablePanel )
-   在 FineUIPro.ContentPanel.OnFirstPreRender()
-   在 (ControlBase )
-   在 FineUIPro.ControlBase.jcLvABeDsHQyyAbZhsfaLCMRNprM()
-   在 (ControlBase )
-   在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
-   在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/18/2021 11:13:01
-出错文件:http://localhost:8118/CQMS/ManageReport/MonthReportEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/18/2021 11:13:01
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 (PageManager )
-   在 FineUIPro.ControlBase.OnFirstPreRender()
-   在 (ControlBase )
-   在 FineUIPro.Component.OnFirstPreRender()
-   在 (Component )
-   在 FineUIPro.BoxComponent.OnFirstPreRender()
-   在 (BoxComponent )
-   在 FineUIPro.Container.OnFirstPreRender()
-   在 (Container )
-   在 FineUIPro.PanelBase.OnFirstPreRender()
-   在 (PanelBase )
-   在 FineUIPro.CollapsablePanel.OnFirstPreRender()
-   在 (CollapsablePanel )
-   在 FineUIPro.ContentPanel.OnFirstPreRender()
-   在 (ControlBase )
-   在 FineUIPro.ControlBase.jcLvABeDsHQyyAbZhsfaLCMRNprM()
-   在 (ControlBase )
-   在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
-   在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/18/2021 11:14:45
-出错文件:http://localhost:8118/CQMS/ManageReport/MonthReportEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/18/2021 11:14:45
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 (PageManager )
-   在 FineUIPro.ControlBase.OnFirstPreRender()
-   在 (ControlBase )
-   在 FineUIPro.Component.OnFirstPreRender()
-   在 (Component )
-   在 FineUIPro.BoxComponent.OnFirstPreRender()
-   在 (BoxComponent )
-   在 FineUIPro.Container.OnFirstPreRender()
-   在 (Container )
-   在 FineUIPro.PanelBase.OnFirstPreRender()
-   在 (PanelBase )
-   在 FineUIPro.CollapsablePanel.OnFirstPreRender()
-   在 (CollapsablePanel )
-   在 FineUIPro.ContentPanel.OnFirstPreRender()
-   在 (ControlBase )
-   在 FineUIPro.ControlBase.jcLvABeDsHQyyAbZhsfaLCMRNprM()
-   在 (ControlBase )
-   在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs )
-   在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/18/2021 11:16:11
-出错文件:http://localhost:8118/CQMS/ManageReport/MonthReportEdit.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/18/2021 11:16:11
-
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
-错误堆栈:
-   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 System.Data.Common.DbCommand.ExecuteReader()
-   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
-   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
-   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
-   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
-   在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\GetDataService.cs:行号 139
-   在 BLL.MonitorService.DoSynchData() 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 2180
-   在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 112
-----错误类型:Win32Exception
-----错误信息:
-----等待的操作过时。
-----错误堆栈:
-    出错时间:04/18/2021 11:24:11
-出错时间:04/18/2021 11:24:12
-
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
-错误堆栈:
-   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 System.Data.Common.DbCommand.ExecuteReader()
-   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
-   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
-   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
-   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
-   在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\GetDataService.cs:行号 139
-   在 BLL.MonitorService.DoSynchData() 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 2180
-   在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 112
-----错误类型:Win32Exception
-----错误信息:
-----等待的操作过时。
-----错误堆栈:
-    出错时间:04/18/2021 11:27:39
-出错时间:04/18/2021 11:27:40
-
-
-错误信息开始=====>
-错误类型:ThreadAbortException
-错误信息:正在中止线程。
-错误堆栈:
-   在 SNIReadSyncOverAsync(SNI_ConnWrapper* , SNI_Packet** , Int32 )
-   在 SNINativeMethodWrapper.SNIReadSyncOverAsync(SafeHandle pConn, IntPtr& packet, Int32 timeout)
-   在 System.Data.SqlClient.TdsParserStateObject.ReadSniSyncOverAsync()
-   在 System.Data.SqlClient.TdsParserStateObject.TryReadNetworkPacket()
-   在 System.Data.SqlClient.TdsParserStateObject.TryPrepareBuffer()
-   在 System.Data.SqlClient.TdsParserStateObject.TryReadByte(Byte& value)
-   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 System.Data.Common.DbCommand.ExecuteReader()
-   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
-   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
-   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
-   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
-   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
-   在 BLL.GetDataService.CorrectingPersonInOutNumber(String projectId) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\GetDataService.cs:行号 139
-   在 BLL.MonitorService.DoSynchData() 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 2180
-   在 BLL.MonitorService.ColligateFormConfirmProcessEve(Object sender, ElapsedEventArgs e) 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\OpenService\MonitorService.cs:行号 112
-出错时间:04/18/2021 11:29:24
-出错时间:04/18/2021 11:29:25
-
-
-错误信息开始=====>
-错误类型:KeyNotFoundException
-错误信息:给定关键字不在字典中。
-错误堆栈:
-   在 System.Collections.Generic.Dictionary`2.get_Item(TKey key)
-   在 BLL.Funs.get_DB() 位置 E:\工作\五环施工平台\SGGL\SGGL\BLL\Common\Funs.cs:行号 132
-   在 FineUIPro.Web.PageBase.get_CurrUser() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\PageBase.cs:行号 38
-   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 293
-   在 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)
-出错时间:04/19/2021 11:19:12
-出错文件:http://localhost:8118/indexProject.aspx?projectId=310e790e-5ede-4345-98a4-8bd0866e69ef
-IP地址:::1
-
-出错时间:04/19/2021 11:19:12
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 13:51:33
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 13:51:33
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 14:14:55
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 14:14:55
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 14:15:44
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 14:15:44
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 14:16:00
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 14:16:00
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 14:16:09
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 14:16:09
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 14:20:05
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 14:20:06
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 14:20:19
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 14:20:19
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 15:09:48
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 15:09:48
-
-
-错误信息开始=====>
-错误类型:ArgumentNullException
-错误信息:值不能为 null。
-参数名: source
-错误堆栈:
-   在 System.Linq.Enumerable.Where[TSource](IEnumerable`1 source, Func`2 predicate)
-   在 FineUIPro.Web.common.main.get_Project() 位置 E:\工作\五环施工平台\SGGL\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 60
-   在 ASP.common_main_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
-   在 System.Web.UI.Control.RenderChildren(HtmlTextWriter writer)
-   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
-   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer, ControlAdapter adapter)
-   在 System.Web.UI.Control.RenderControl(HtmlTextWriter writer)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/19/2021 15:10:05
-出错文件:http://localhost:8118/common/main.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:04/19/2021 15:10:06
-
-
-错误信息开始=====>
-错误类型:HttpException
-错误信息:文件“/HSSE/Hazard/ProjectSuperviseCheckRectify.aspx”不存在。
-错误堆栈:
-   在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:04/20/2021 17:39:11
-出错文件:http://localhost:8118/HSSE/Hazard/ProjectSuperviseCheckRectify.aspx
-IP地址:::1
-
-出错时间:04/20/2021 17:39:11
-
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:列名 'ProfessionalName' 无效。
-列名 'SortIndex' 无效。
-列名 'SortIndex' 无效。
-错误堆栈:
-   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 System.Data.Common.DbCommand.ExecuteReader()
    在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
    在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
    在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
    在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
-   在 FineUIPro.Web.common.mainProject.Page_Load(Object sender, EventArgs e) 位置 D:\WuHuan\SGGL\SGGL\FineUIPro.Web\common\mainProject.aspx.cs:行号 58
+   在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
-   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
-   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 FineUIPro.Web.common.mainProject.get_Two() 位置 D:\WuHuan\SGGL\SGGL\FineUIPro.Web\common\mainProject.aspx.cs:行号 86
-   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 ASP.common_mainproject_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
-   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
+   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
+   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
    在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:04/24/2021 16:26:18
+出错时间:05/20/2021 11:28:56
-出错文件:http://localhost:8118/common/mainProject.aspx
+出错文件:http://localhost/sggl_wh/common/mainProject.aspx
 IP地址:::1
-操作人员:JT
+操作人员:系统管理员
 
-出错时间:04/24/2021 16:26:18
+出错时间:05/20/2021 11:28:56
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:对象名 'dbo.View_JDGL_ProgressCompletion' 无效。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable<T>.GetEnumerator()
+   在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
+   在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
+   在 FineUIPro.Web.common.mainProject.get_Two() 位置 D:\WuHuan\SGGL\SGGL\FineUIPro.Web\common\mainProject.aspx.cs:行号 86
+   在 ASP.common_mainproject_aspx.__Render__control1(HtmlTextWriter __w, Control parameterContainer)
+   在 System.Web.UI.Control.RenderChildrenInternal(HtmlTextWriter writer, ICollection children)
+   在 System.Web.UI.Page.Render(HtmlTextWriter writer)
+   在 System.Web.UI.Control.RenderControlInternal(HtmlTextWriter writer, ControlAdapter adapter)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:05/20/2021 11:29:14
+出错文件:http://localhost/sggl_wh/common/mainProject.aspx
+IP地址:::1
+操作人员:系统管理员
+
+出错时间:05/20/2021 11:29:14