diff --git a/.gitignore b/.gitignore
index 8ba938c0..d097c705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,14 @@
 /SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-06
 /SGGL/FineUIPro.Web/FileUpload/ProjectAttachUrl/2024-06
 /SGGLPackFile_20240730.rar
+/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-10
+/SGGL/FineUIPro.Web/ErrLog.txt
+/SGGL/FineUIPro.Web/Web.config
+/CreateModel2017.bat
+/SGGL/FineUIPro.Web/ErrLog.txt
+/.gitignore
+/.gitignore
+/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml
+/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile1.pubxml
+
+/SGGL/FineUIPro.Web/FileUpload/Transfer/PunchlistFrom/2024-11
diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo
index a10de9ee..15c953af 100644
Binary files a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo and b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/.wsuo differ
diff --git a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json
index 377abef3..14751ea9 100644
--- a/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json
+++ b/.vs/CNCEC_SUBQHSE_WUHUAN/v17/DocumentLayout.json
@@ -51,10 +51,6 @@
               "$type": "Bookmark",
               "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
             },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
-            },
             {
               "$type": "Bookmark",
               "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
diff --git a/.vs/SGGL_CWCEC/v17/.wsuo b/.vs/SGGL_CWCEC/v17/.wsuo
deleted file mode 100644
index 9a0da635..00000000
Binary files a/.vs/SGGL_CWCEC/v17/.wsuo and /dev/null differ
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index 75b31f26..00000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\SGGL.sln",
-  "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/CreateModel2017.bat b/CreateModel2017.bat
deleted file mode 100644
index fca280ba..00000000
--- a/CreateModel2017.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-REM ---------------
-REM 发布包生成工具
-REM 执行此文件前请先用Release生成WebOA项目
-REM --------------
-
-
-
-REM --------------
-REM 环境变量设置 Project_Src为如WebOA这样的分支
-REM --------------
-set PROJECT_SRC=%CD%
-cd..
-
-REM 源代码Model项目文件夹
-set Model_ROOT=%PROJECT_SRC%\SGGL\Model
-
-
-REM --------------
-REM 发布程序包文件夹相关
-REM --------------
-
-
-
-
-@echo 设置.net控制台环境
-@echo.
-@call "%VS150%"
-
-SqlMetal /views  /server:.  /user:sa /password:1111 /database:SGGLDB_WH /code:%Model_ROOT%\Model.cs /namespace:Model
-
-@ECHO 完成
-pause
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB-WH-2024-09-27-001-gaofei.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB-WH-2024-09-27-001-gaofei.sql
new file mode 100644
index 00000000..3ac406b8
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB-WH-2024-09-27-001-gaofei.sql
@@ -0,0 +1,228 @@
+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES ('CB76394B-BDEB-4F45-9D19-F38612DC6591','安全生产治本攻坚三年行动工作台账','ZHGL/Information/ActionWorkLedger.aspx',150,'ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001','Menu_ZHGL',1,1,1)
+	GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('B269EF45-918E-42B0-9B28-65D1A1017CDF','CB76394B-BDEB-4F45-9D19-F38612DC6591','增加',1)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('71B203E2-42C1-44CD-A0A1-8A75A96B79C7','CB76394B-BDEB-4F45-9D19-F38612DC6591','修改',2)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('DB5C189E-0023-4174-AB83-B7D5028B3148','CB76394B-BDEB-4F45-9D19-F38612DC6591','删除',3)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('BFF69201-1E48-46F4-A8CB-863A0304E6C6','CB76394B-BDEB-4F45-9D19-F38612DC6591','保存',4)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('70376B94-3340-4343-92B5-8543C6750F6B','CB76394B-BDEB-4F45-9D19-F38612DC6591','保存并上报',5)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('4B0AE23C-A03D-4146-A5CE-3AB563AF683C','CB76394B-BDEB-4F45-9D19-F38612DC6591','提交',6)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('7F968B8C-C31F-4D62-8AFC-D37D017C46BB','CB76394B-BDEB-4F45-9D19-F38612DC6591','导入',7)	
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('B318C22A-DBFF-46FE-919A-24F50BF190DC','CB76394B-BDEB-4F45-9D19-F38612DC6591','打印',8)	
+	GO
+	
+
+CREATE TABLE [dbo].[Information_ActionWorkLedger](
+	[ActionWorkLedgerId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[ReportDate] [datetime] NULL,
+	[Quarter] [int] NULL,
+	[YearId] [int] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[UpState] [char](1) NULL,
+	[HandleState] [char](1) NULL,
+	[HandleMan] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Information_ActionWorkLedger] PRIMARY KEY CLUSTERED 
+(
+	[ActionWorkLedgerId] 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
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[Information_ActionWorkLedger]  WITH CHECK ADD  CONSTRAINT [FK_Information_ActionWorkLedger_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Information_ActionWorkLedger] CHECK CONSTRAINT [FK_Information_ActionWorkLedger_Base_Unit]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安全生产治本攻坚三年行动工作台账表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_ActionWorkLedger'
+GO
+
+
+
+
+
+
+CREATE TABLE [dbo].[Information_ActionWorkLedgerItem](
+	[ActionWorkLedgerItemId] [nvarchar](50) NOT NULL,
+	[ActionWorkLedgerId] [nvarchar](50) NULL,
+	[SortIndex] [int] NULL,
+	[Focus] [nvarchar](20) NULL,
+	[SpecialTask] [nvarchar](100) NULL,
+	[WorkPoints] [nvarchar](500) NULL,
+	[FillingRequirements] [nvarchar](max) NULL,
+	[CompletionDeadline] [nvarchar](50) NULL,
+	[ImplementationStatus] [nvarchar](max) NULL,
+ CONSTRAINT [PK_Information_ActionWorkLedgerItem] PRIMARY KEY CLUSTERED 
+(
+	[ActionWorkLedgerItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+ALTER TABLE [dbo].[Information_ActionWorkLedgerItem]  WITH CHECK ADD  CONSTRAINT [FK_Information_ActionWorkLedgerItem_Information_ActionWorkLedger] FOREIGN KEY([ActionWorkLedgerId])
+REFERENCES [dbo].[Information_ActionWorkLedger] ([ActionWorkLedgerId])
+GO
+
+ALTER TABLE [dbo].[Information_ActionWorkLedgerItem] CHECK CONSTRAINT [FK_Information_ActionWorkLedgerItem_Information_ActionWorkLedger]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安全生产治本攻坚三年行动工作台账明细表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_ActionWorkLedgerItem'
+GO
+
+
+
+CREATE VIEW [dbo].[View_Information_ActionWorkLedger]  AS 
+SELECT 
+	Report.ActionWorkLedgerId, 
+	Report.UnitId, 
+	Report.ReportDate,
+	Report.YearId,
+	Report.Quarter,
+	Report.UpState,
+	Report.HandleState,
+	(ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0011.ConstText,'-')) AS Quarters,
+	u.UnitName,
+	Report.HandleMan,
+	US.UserName
+FROM dbo.Information_ActionWorkLedger AS Report
+LEFT JOIN Sys_Const  AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.YearId
+LEFT JOIN Sys_Const  AS Group_0011 ON Group_0011.GroupId='0011' AND Group_0011.ConstValue =Report.Quarter
+Left join Base_Unit as u on u.UnitId=Report.UnitId
+LEFT JOIN Sys_User AS US ON US.UserId=Report.HandleMan
+
+
+
+
+
+
+GO
+
+
+
+	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+	VALUES ('C48087A8-4C9F-485D-B0A4-C85E112BA705','安全生产管理评价工作调度台账','ZHGL/Information/SafetyProductionEvaluation.aspx',160,'ERDXV53M-09B1-6UIO-3EFM-5DVZDF329001','Menu_ZHGL',1,1,1)
+	GO
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('39A75960-F70A-4B60-ABFF-C72C919807A6','C48087A8-4C9F-485D-B0A4-C85E112BA705','增加',1)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('9461B39D-D9FF-45CC-9D4C-38E49BCBCF6C','C48087A8-4C9F-485D-B0A4-C85E112BA705','修改',2)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('E417A6A8-0666-49EB-A620-2E73D19C08CB','C48087A8-4C9F-485D-B0A4-C85E112BA705','删除',3)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('07F975F0-D634-4554-A3B7-667E99278265','C48087A8-4C9F-485D-B0A4-C85E112BA705','保存',4)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('23B71591-E933-4C3A-BCBF-E398D94A6C88','C48087A8-4C9F-485D-B0A4-C85E112BA705','保存并上报',5)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('E97C8630-3DD7-4A4B-A3FD-7DE592B489BC','C48087A8-4C9F-485D-B0A4-C85E112BA705','提交',6)
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('5F910FC4-183E-4037-9EE1-1400B96C4584','C48087A8-4C9F-485D-B0A4-C85E112BA705','导入',7)	
+	INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	VALUES('D08BCEF7-843F-4BB6-BE87-182EC476E455','C48087A8-4C9F-485D-B0A4-C85E112BA705','打印',8)	
+	GO 
+
+
+
+
+CREATE TABLE [dbo].[Information_SafetyProductionEvaluation](
+	[SafetyProductionEvaluationId] [nvarchar](50) NOT NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[ReportDate] [datetime] NULL,
+	[Quarter] [int] NULL,
+	[YearId] [int] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[UpState] [char](1) NULL,
+	[HandleState] [char](1) NULL,
+	[HandleMan] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Information_SafetyProductionEvaluation] PRIMARY KEY CLUSTERED 
+(
+	[SafetyProductionEvaluationId] 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
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[Information_SafetyProductionEvaluation]  WITH CHECK ADD  CONSTRAINT [FK_Information_SafetyProductionEvaluation_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+GO
+
+ALTER TABLE [dbo].[Information_SafetyProductionEvaluation] CHECK CONSTRAINT [FK_Information_SafetyProductionEvaluation_Base_Unit]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安全生产管理评价工作调度台账表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_SafetyProductionEvaluation'
+GO
+
+
+
+
+CREATE TABLE [dbo].[Information_SafetyProductionEvaluationItem](
+	[SafetyProductionEvaluationItemId] [nvarchar](50) NOT NULL,
+	[SafetyProductionEvaluationId] [nvarchar](50) NULL,
+	[SortIndex] [int] NULL,
+	[Type] [nvarchar](50) NULL,
+	[EvaluateWork] [nvarchar](1000) NULL,
+	[EvaluationContent] [nvarchar](1000) NULL,
+	[FillingRequirements] [nvarchar](max) NULL,
+	[CompletionDeadline] [nvarchar](50) NULL,
+	[ImplementationStatus] [nvarchar](max) NULL,
+ CONSTRAINT [PK_Information_SafetyProductionEvaluationItem] PRIMARY KEY CLUSTERED 
+(
+	[SafetyProductionEvaluationItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+ALTER TABLE [dbo].[Information_SafetyProductionEvaluationItem]  WITH CHECK ADD  CONSTRAINT [FK_Information_SafetyProductionEvaluationItem_Information_SafetyProductionEvaluation] FOREIGN KEY([SafetyProductionEvaluationId])
+REFERENCES [dbo].[Information_SafetyProductionEvaluation] ([SafetyProductionEvaluationId])
+GO
+
+ALTER TABLE [dbo].[Information_SafetyProductionEvaluationItem] CHECK CONSTRAINT [FK_Information_SafetyProductionEvaluationItem_Information_SafetyProductionEvaluation]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安全生产管理评价工作调度台账明细表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Information_SafetyProductionEvaluationItem'
+GO
+
+
+CREATE VIEW [dbo].[View_Information_SafetyProductionEvaluation]  AS 
+SELECT 
+	Report.SafetyProductionEvaluationId, 
+	Report.UnitId, 
+	Report.ReportDate,
+	Report.YearId,
+	Report.Quarter,
+	Report.UpState,
+	Report.HandleState,
+	(ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0011.ConstText,'-')) AS Quarters,
+	u.UnitName,
+	Report.HandleMan,
+	US.UserName
+FROM dbo.Information_SafetyProductionEvaluation AS Report
+LEFT JOIN Sys_Const  AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.YearId
+LEFT JOIN Sys_Const  AS Group_0011 ON Group_0011.GroupId='0011' AND Group_0011.ConstValue =Report.Quarter
+Left join Base_Unit as u on u.UnitId=Report.UnitId
+LEFT JOIN Sys_User AS US ON US.UserId=Report.HandleMan
+
+
+
+
+
+
+GO
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-09-phf.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-09-phf.sql
new file mode 100644
index 00000000..dc9137f6
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-09-phf.sql
@@ -0,0 +1,2 @@
+alter table Sys_User
+add CompanyProjectId nvarchar(2000) null;
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-11-bwj.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-11-bwj.sql
new file mode 100644
index 00000000..15c0b4f2
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-11-bwj.sql
@@ -0,0 +1,111 @@
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('FB94A120-921B-4AAB-B54F-EC11B6F561FD','单位分部分项工程划分、裁剪','CQMS/WBS/Control/DivisionDivideAndCrop.aspx',15,'3B322232-38A1-4291-9832-CD4A01C2A975','Menu_CQMS',0,1,1)
+go
+	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	values('3829D89E-BFDE-4956-BC25-E00729DFCE62','FB94A120-921B-4AAB-B54F-EC11B6F561FD','保存',1)
+	go
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('BA250432-492B-49A3-8BB6-D04BF74D2EDD','单位分部分项工程划分表','CQMS/WBS/Control/DivisionDivideList.aspx',16,'3B322232-38A1-4291-9832-CD4A01C2A975','Menu_CQMS',0,1,1)
+go
+
+CREATE TABLE [dbo].[WBS_DivisionDivide](
+	[DivisionDivideId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitWorkId] [nvarchar](50) NULL,
+	[DivisionId] [varchar](50) NULL,
+ CONSTRAINT [PK_Division_DivisionDivide] PRIMARY KEY CLUSTERED 
+(
+	[DivisionDivideId] 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].[WBS_DivisionDivide]  WITH CHECK ADD  CONSTRAINT [FK_WBS_DivisionDivide_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide] CHECK CONSTRAINT [FK_WBS_DivisionDivide_Base_Project]
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide]  WITH CHECK ADD  CONSTRAINT [FK_WBS_DivisionDivide_Division_SubProjects] FOREIGN KEY([DivisionId])
+REFERENCES [dbo].[Division_SubProjects] ([DivisionId])
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide] CHECK CONSTRAINT [FK_WBS_DivisionDivide_Division_SubProjects]
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide]  WITH CHECK ADD  CONSTRAINT [FK_WBS_DivisionDivide_WBS_UnitWork] FOREIGN KEY([UnitWorkId])
+REFERENCES [dbo].[WBS_UnitWork] ([UnitWorkId])
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide] CHECK CONSTRAINT [FK_WBS_DivisionDivide_WBS_UnitWork]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_DivisionDivide', @level2type=N'COLUMN',@level2name=N'DivisionDivideId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_DivisionDivide', @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'WBS_DivisionDivide', @level2type=N'COLUMN',@level2name=N'UnitWorkId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'分部分项' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_DivisionDivide', @level2type=N'COLUMN',@level2name=N'DivisionId'
+GO
+
+
+CREATE VIEW View_WBS_DivisionDivide
+AS
+/*********单位分部分项工程划分表*********/
+SELECT 
+DD.DivisionDivideId,
+DD.ProjectId,
+DD.UnitWorkId,
+DD.DivisionId,
+SupUW.UnitWorkCode AS SupUnitWorkCode,
+SupUW.UnitWorkName AS SupUnitWorkName,
+NULL AS ChildUnitWorkCode,
+NULL AS ChildUnitWorkName,
+SupUW.SuperUnitWork,
+SP.BranchEngineeringCode,
+SP.BranchEngineeringName,
+SP.SubBranchEngineeringName,
+SP.ProEngineeringCode,
+SP.ProEngineeringName,
+SP.ProEngineeringNum,
+SP.DivisionLevel,
+SP.Sort,
+SP.ParentId
+FROM WBS_DivisionDivide DD 
+LEFT JOIN WBS_UnitWork AS SupUW ON SupUW.UnitWorkId=DD.UnitWorkId
+LEFT JOIN WBS_UnitWork AS ChildUW ON ChildUW.SuperUnitWork = SupUW.UnitWorkId
+LEFT JOIN Division_SubProjects AS SP ON SP.DivisionId = DD.DivisionId
+WHERE (SupUW.SuperUnitWork='0' or SupUW.SuperUnitWork is null)
+
+UNION 
+
+SELECT 
+DD.DivisionDivideId,
+DD.ProjectId,
+DD.UnitWorkId,
+DD.DivisionId,
+SupUW.UnitWorkCode AS SupUnitWorkCode,
+SupUW.UnitWorkName AS SupUnitWorkName,
+ChildUW.UnitWorkCode AS ChildUnitWorkCode,
+ChildUW.UnitWorkName AS ChildUnitWorkName,
+ChildUW.SuperUnitWork,
+SP.BranchEngineeringCode,
+SP.BranchEngineeringName,
+SP.SubBranchEngineeringName,
+SP.ProEngineeringCode,
+SP.ProEngineeringName,
+SP.ProEngineeringNum,
+SP.DivisionLevel,
+SP.Sort,
+SP.ParentId
+FROM WBS_DivisionDivide DD 
+LEFT JOIN WBS_UnitWork AS ChildUW ON ChildUW.UnitWorkId = DD.UnitWorkId
+LEFT JOIN WBS_UnitWork AS SupUW ON SupUW.UnitWorkId=ChildUW.SuperUnitWork
+LEFT JOIN Division_SubProjects AS SP ON SP.DivisionId = DD.DivisionId
+WHERE ChildUW.SuperUnitWork <> '0' AND  ChildUW.SuperUnitWork IS NOT NULL
+Go
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-11-phf.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-11-phf.sql
new file mode 100644
index 00000000..5ef0d067
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-11-phf.sql
@@ -0,0 +1,5 @@
+
+CREATE NONCLUSTERED INDEX [t_d_facerecord_Projectid_Index]
+ON [dbo].[t_d_facerecord] ([ProjectId])
+INCLUDE ([ID],[EmployName],[DepartmentID],[DepartName],[AreaID],[AreaName],[EmployNO],[CardID],[RoleID],[DateTimeRecord],[RecordDes],[FaceIP],[InOrOut],[Des1],[Des2],[Des3],[Des4])
+;
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-20-bwj.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-20-bwj.sql
new file mode 100644
index 00000000..f3f3742e
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-20-bwj.sql
@@ -0,0 +1,10 @@
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('0E1CCE60-6F9D-419D-B763-E9E0AF5621E6','单位分部分项工程划分、裁剪','',10,'3B322232-38A1-4291-9832-CD4A01C2A975','Menu_CQMS',0,0,1)
+go
+update Sys_Menu set SortIndex=10,MenuName='分部分项工程数据库',SuperMenu='0E1CCE60-6F9D-419D-B763-E9E0AF5621E6' where MenuId='17E206A1-E06B-40C0-8DCB-E3AAA2E3B339'
+go
+update Sys_Menu set SortIndex=20,SuperMenu='0E1CCE60-6F9D-419D-B763-E9E0AF5621E6' where MenuId='FB94A120-921B-4AAB-B54F-EC11B6F561FD'
+go
+update Sys_Menu set SortIndex=30,SuperMenu='0E1CCE60-6F9D-419D-B763-E9E0AF5621E6' where MenuId='BA250432-492B-49A3-8BB6-D04BF74D2EDD'
+go
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-23-phf.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-23-phf.sql
new file mode 100644
index 00000000..4e589fbc
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-23-phf.sql
@@ -0,0 +1,3 @@
+CREATE NONCLUSTERED INDEX [SitePerson_Person_pid_isused_intime_index]
+ON [dbo].[SitePerson_Person] ([ProjectId],[IsUsed],[InTime],[OutTime])
+INCLUDE ([PersonName]);
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-28-bwj.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-28-bwj.sql
new file mode 100644
index 00000000..c7db4282
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-09-28-bwj.sql
@@ -0,0 +1,13 @@
+
+update Sys_Menu set Url='CQMS/WBS/Control/DivisionSubProjectsNew.aspx' where MenuId='17E206A1-E06B-40C0-8DCB-E3AAA2E3B339'
+go
+
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('2037FD04-23E2-4286-9F85-AAF1D11384D5','17E206A1-E06B-40C0-8DCB-E3AAA2E3B339','增加',1)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('C9D8D3DE-90A9-43AD-8694-85A017DCA9DC','17E206A1-E06B-40C0-8DCB-E3AAA2E3B339','修改',2)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('0B422E48-08B6-4262-B541-CE149B452E84','17E206A1-E06B-40C0-8DCB-E3AAA2E3B339','删除',3)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('2469D37C-F6A0-49EB-AB85-62F88180C9B4','17E206A1-E06B-40C0-8DCB-E3AAA2E3B339','保存',4)
+go
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-10-phf.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-10-phf.sql
new file mode 100644
index 00000000..a1c266d5
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-10-phf.sql
@@ -0,0 +1,48 @@
+ALTER TABLE Solution_CQMSConstructSolution
+ADD CsUsers nvarchar(2000) null;
+
+ALTER TABLE GJSX
+ADD CsUsers nvarchar(2000) null;
+
+CREATE TABLE [dbo].[Solution_CQMSConstructSolutionApprove_Item](
+	[Id] [nvarchar](50) NOT NULL,
+	[TypeSortId] [int] NULL,
+	[SortId] [int] NULL,
+	[ConstructSolutionId] [nvarchar](50) NULL,
+	[Chapter] [nvarchar](200) NULL,
+	[Amendment] [nvarchar](200) NULL,
+	[Proposer] [nvarchar](50) NULL,
+	ProposerName [nvarchar](50) NULL,
+	[Modification] [nvarchar](200) NULL,
+	[ReviewerOpinion] [nvarchar](200) NULL,
+	[IsAccept] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Solution_CQMSConstructSolutionApprove_Item] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'类型序号（施工工程师1，HSE2,施工经理3）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'TypeSortId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'序号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'SortId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'章节' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'Chapter'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改意见' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'Amendment'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'提出人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'Proposer'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改情况' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'Modification'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审核人意见' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'ReviewerOpinion'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否接受' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Solution_CQMSConstructSolutionApprove_Item', @level2type=N'COLUMN',@level2name=N'IsAccept'
+GO
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-12-phf.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-12-phf.sql
new file mode 100644
index 00000000..7b0401a8
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-12-phf.sql
@@ -0,0 +1,61 @@
+ALTER PROCEDURE [dbo].[Sp_GJSX_getlist] 
+	-- Add the parameters for the stored procedure here
+	 @ProjectId nvarchar(max),
+	 @sql_where varchar(max)	
+AS
+BEGIN
+		--IF EXISTS(select * from tempdb..sysobjects where id=object_id('tempdb..#GJSX_List'))
+		--BEGIN
+		--	DROP TABLE #GJSX_List
+		--END
+		--DECLARE @Sql NVARCHAR(200)
+		--select * into  #GJSX_List  from(
+		--			select  
+		--a.GJSXID  
+		--,a.ProjectId 
+		--,a.detail
+		--,b.username
+		--,a.createDate 
+		--,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID  + ',') >0  FOR XML PATH('')), 1, 1,'')   
+		--, CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName  FROM dbo.Base_CNProfessional     where  PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		--,Base_Project.ProjectName
+		--,Base_Unit.unitname 
+		--,a.CloseDate
+		--,case a.state when  2 then '正在进行' when 0 then '关闭'  when  1 then '开放' end  as state 
+		--,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName  FROM dbo.Base_QuestionType     where  PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		--,a.IsManypeople
+		--,a.CompleteDate
+		--,a.AttachUrl 
+		--,user_Acceptance =STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance  + ',') >0  FOR XML PATH('')), 1, 1,'')    
+		--from GJSX  as   a  left join   Sys_User  as  b   on   a.UserId=b.UserId
+		--left join [dbo].[Base_Project]  on a.ProjectId =Base_Project.ProjectId
+		--left join [dbo].[Base_Unit] on  a.UnitId=Base_Unit.UnitId
+		--left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID  ) as a
+                         
+		--set @Sql ='select * from  #GJSX_List  where  ProjectId='''+@ProjectId+'''  ' +@sql_where  
+
+		--exec(@Sql) 
+
+		select  
+		a.GJSXID  
+		,a.ProjectId 
+		,a.detail
+		,b.username
+		,a.createDate 
+		,User_ReceiveID=STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.User_ReceiveID  + ',') >0  FOR XML PATH('')), 1, 1,'')   
+		, CNProfessionalId=STUFF(( SELECT ',' + Base_CNProfessional.ProfessionalName  FROM dbo.Base_CNProfessional     where  PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%',',' +a.CNProfessional_ID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		,Base_Project.ProjectName
+		,Base_Unit.unitname 
+		,a.CloseDate
+		,case a.state when  2 then '正在进行' when  3 then '待关闭' when 0 then '已关闭'  when  1 then '开放' end  as state 
+		,QuestionTypeName=STUFF(( SELECT ',' + Base_QuestionType.QuestionTypeName  FROM dbo.Base_QuestionType     where  PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%',',' +a.QuestionTypeID  + ',') >0  FOR XML PATH('')), 1, 1,'')
+		,a.IsManypeople
+		,a.CompleteDate
+		,a.AttachUrl 
+		,user_Acceptance =STUFF(( SELECT ',' + p2.UserName  FROM dbo.Sys_User  as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%',',' +a.user_Acceptance  + ',') >0  FOR XML PATH('')), 1, 1,'')    
+		from GJSX  as   a  left join   Sys_User  as  b   on   a.UserId=b.UserId
+		left join [dbo].[Base_Project]  on a.ProjectId =Base_Project.ProjectId
+		left join [dbo].[Base_Unit] on  a.UnitId=Base_Unit.UnitId
+		left join [dbo].[Base_QuestionType] on a.QuestionTypeID=Base_QuestionType.QuestionTypeID 
+		where a.ProjectId=@ProjectId
+END
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-14-phf.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-14-phf.sql
new file mode 100644
index 00000000..0b7b5f9c
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-14-phf.sql
@@ -0,0 +1,46 @@
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('168A94C7-E37D-4B9C-8684-51DF4F8C5134','关键事项（内部）','',10,'0','Menu_PGJSX',0,0,1)
+go
+
+update sys_menu  set IsUsed='0' where menuid='5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680';
+update sys_menu  set IsUsed='0' where menuid='CAA875A7-089B-4B79-87CE-742FDFD9DE43';
+
+--0 我创建的，1待我处理，2我已处理、3我参与的
+--关键事项改成 我创建的
+update sys_menu set SuperMenu='3517DBE2-9728-4BA0-9EA5-AE2147DB883B',MenuName='我创建的',url='PZHGL/GJSX/GJSXList.aspx?classify=0'
+where menuid='0BEA2126-7A48-40EB-8E21-99148E91A22B';
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('4A9E60ED-24FF-4410-B3B7-2A5079615A78','待我处理','PZHGL/GJSX/GJSXList.aspx?classify=1',20,'168A94C7-E37D-4B9C-8684-51DF4F8C5134','Menu_PGJSX',0,1,1)
+go
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('BEF7850D-1BA5-45F9-BD40-E52F6D813E7C','我已处理','PZHGL/GJSX/GJSXList.aspx?classify=2',30,'168A94C7-E37D-4B9C-8684-51DF4F8C5134','Menu_PGJSX',0,1,1)
+go
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('3C129205-F6A9-480D-B36C-E35DED5D7CEC','我参与的','PZHGL/GJSX/GJSXList.aspx?classify=3',40,'168A94C7-E37D-4B9C-8684-51DF4F8C5134','Menu_PGJSX',0,1,1)
+go
+
+--协调沟通
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('42791ACB-7C72-481F-B1ED-158C7141522C','协调沟通（外部）','',20,'0','Menu_PGJSX',0,0,1)
+go
+
+update sys_menu set SuperMenu='42791ACB-7C72-481F-B1ED-158C7141522C',MenuName='我创建的',url='DocManage/DocManage.aspx?classify=0',MenuType='Menu_PGJSX'
+where menuid='609F0D64-ABB8-4F5C-9646-FC1DFC8BAB85';
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('2FEF98BD-DBBD-4ADA-B600-18D3C113B22A','待我处理','DocManage/DocManage.aspx?classify=1',20,'42791ACB-7C72-481F-B1ED-158C7141522C','Menu_PGJSX',0,1,1)
+go
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('5BDEEA43-FFD7-4AEB-B760-24E70009EA0C','我已处理','DocManage/DocManage.aspx?classify=2',30,'42791ACB-7C72-481F-B1ED-158C7141522C','Menu_PGJSX',0,1,1)
+go
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('58B45CA6-AFFB-4624-80C6-F70C1A54FBE2','我参与的','DocManage/DocManage.aspx?classify=3',40,'42791ACB-7C72-481F-B1ED-158C7141522C','Menu_PGJSX',0,1,1)
+go
+
+
+
diff --git a/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-21-bwj.sql b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-21-bwj.sql
new file mode 100644
index 00000000..7e2d85e8
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SGGLDB_WH_V2024-10-21-bwj.sql
@@ -0,0 +1,13 @@
+
+alter table ProcessControl_InspectionManagement add ChildUnitWorkId nvarchar(50)
+alter table ProcessControl_InspectionManagement add ChildBranch nvarchar(50)
+go
+ALTER TABLE [dbo].[ProcessControl_InspectionManagement] DROP CONSTRAINT [FK_ProcessControl_InspectionManagement_Base_CNProfessional]
+GO
+
+update ProcessControl_InspectionManagement set CNProfessionalId='D03E079B-8B97-4C5A-BF1C-782887548B92' where CNProfessionalId='10487C07-DE54-4ED6-BBDF-2C7988A44665'--管道
+update ProcessControl_InspectionManagement set CNProfessionalId='445B1EE6-901E-4A07-A4AB-4EE1066E742F' where CNProfessionalId='DEB367FF-AD35-41A0-B68E-FA8E68737B93'--电气
+update ProcessControl_InspectionManagement set CNProfessionalId='E9AC9563-E338-48B7-867D-488222AD0557' where CNProfessionalId='F41C5022-F499-4BD7-84B6-E87E4CE53CAC'--土建
+--update ProcessControl_InspectionManagement set CNProfessionalId='' where CNProfessionalId='FBC066BE-082F-4185-AE5C-016A12132ADE'--设备
+
+
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-16-phf.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-16-phf.sql
new file mode 100644
index 00000000..58e8b765
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-16-phf.sql
@@ -0,0 +1,42 @@
+alter table Environmental_OperationReport drop column Code
+alter table Environmental_OperationReport drop column UnitLevel
+alter table Environmental_OperationReport drop column CreateDate
+alter table Environmental_OperationReport drop column Place
+alter table Environmental_OperationReport drop column PersonNum
+alter table Environmental_OperationReport drop column TotalAssets
+alter table Environmental_OperationReport drop column TotalValue
+alter table Environmental_OperationReport drop column NewInvestment
+GO
+
+CREATE TABLE [dbo].[Environmental_OperationReportItem](
+	[BusinessReportItemId] [nvarchar](50) NOT NULL,
+	[BusinessReportId] [nvarchar](50) NULL,
+	[SortIndex] [int] NULL,
+	[Code] [nvarchar](50) NULL,
+	[UnitLevel] [nvarchar](50) NULL,
+	[CreateDate] [datetime] NULL,
+	[Place] [nvarchar](200) NULL,
+	[PersonNum] [int] NULL,
+	[TotalAssets] [decimal](18, 4) NULL,
+	[TotalValue] [decimal](18, 4) NULL,
+	[NewInvestment] [decimal](18, 4) NULL,
+	[UnitName] [nvarchar](200) NULL,
+	[SortUnitName] [nvarchar](200) NULL,
+ CONSTRAINT [PK_Environmental_OperationReportItem] PRIMARY KEY CLUSTERED 
+(
+	[BusinessReportItemId] 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].[Environmental_OperationReportItem]  WITH CHECK ADD  CONSTRAINT [FK_Environmental_OperationReportItem_Environmental_OperationReport] FOREIGN KEY([BusinessReportId])
+REFERENCES [dbo].[Environmental_OperationReport] ([BusinessReportId])
+GO
+
+ALTER TABLE [dbo].[Environmental_OperationReportItem] CHECK CONSTRAINT [FK_Environmental_OperationReportItem_Environmental_OperationReport]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'中央企业节能环保产业企业基本情况和经营情况报表明细表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Environmental_OperationReportItem'
+GO
+
+update sys_menu set IsUsed=0 where menuid='EFA6E45F-1267-4804-BEE7-41E0C5461204';
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-23-phf.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-23-phf.sql
new file mode 100644
index 00000000..4fdbb4c1
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-23-phf.sql
@@ -0,0 +1,7 @@
+--增加为了单位排序
+alter table Environmental_EnergyReportItem
+add SortUnit int NULL
+GO
+
+update Environmental_EnergyReportItem set SortUnit=1 where EnergyReportId='template'; 
+
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-26-phf.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-26-phf.sql
new file mode 100644
index 00000000..8ab70c1c
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-26-phf.sql
@@ -0,0 +1,8 @@
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('1FBC729D-0A8E-423C-B133-B64583BF9611','进度软件（新）','',70,'0','Menu_JDGL',0,0,0)
+go
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('368DB90C-8A47-44F7-A69A-D2D60A6E338C','费用项裁剪','JDGL/Progress/WbsManager.aspx',10,'1FBC729D-0A8E-423C-B133-B64583BF9611','Menu_JDGL',0,1,0)
+go
+
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-28-bwj.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-28-bwj.sql
new file mode 100644
index 00000000..6d9727b4
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-28-bwj.sql
@@ -0,0 +1,5 @@
+
+update ProcessControl_InspectionManagement set CNProfessionalId='10487C07-DE54-4ED6-BBDF-2C7988A44665' where CNProfessionalId='D03E079B-8B97-4C5A-BF1C-782887548B92'--管道
+update ProcessControl_InspectionManagement set CNProfessionalId='DEB367FF-AD35-41A0-B68E-FA8E68737B93' where CNProfessionalId='445B1EE6-901E-4A07-A4AB-4EE1066E742F'--电气
+update ProcessControl_InspectionManagement set CNProfessionalId='F41C5022-F499-4BD7-84B6-E87E4CE53CAC' where CNProfessionalId='E9AC9563-E338-48B7-867D-488222AD0557'--土建
+go
\ No newline at end of file
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-31-xiaj.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-31-xiaj.sql
new file mode 100644
index 00000000..309d41e4
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-10-31-xiaj.sql
@@ -0,0 +1,48 @@
+
+
+--1、索引项目中，删除英文，保留中文
+update Sys_Menu set MenuName='尾项管理' where MenuId='016903B1-3B86-4CF5-AFF8-FF8BE389BEE5';
+update Sys_Menu set MenuName='非工艺系统清单' where MenuId='022428DC-FC99-4916-B8AF-6A9DC885DFAF';
+update Sys_Menu set MenuName='工艺系统清单' where MenuId='197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB';
+update Sys_Menu set MenuName='尾项完成统计表' where MenuId='2352E44F-BE12-4012-B43F-AAF649EDAC32';
+update Sys_Menu set MenuName='移交状态汇总表' where MenuId='25C13642-AE77-42E2-B0FB-32663B68F93F';
+update Sys_Menu set MenuName='电气' where MenuId='296E75D2-192A-4D1F-8471-DD34263F8691';
+update Sys_Menu set MenuName='尾项进度跟踪表' where MenuId='549DD0B6-05CB-4C75-B8F5-9AADDEDF399F';
+update Sys_Menu set MenuName='电信' where MenuId='58FFBD80-ACB9-4830-A18A-E025D9600D94';
+update Sys_Menu set MenuName='移交统计图表' where MenuId='60838E30-4A46-4878-B299-C234900B10B7';
+update Sys_Menu set MenuName='动设备' where MenuId='7E2FB5F9-FB99-4455-B68F-460F1F9A2676';
+update Sys_Menu set MenuName='仪表' where MenuId='88F51059-55B4-4CD5-A38C-36404E5029F6';
+update Sys_Menu set MenuName='土建/建筑/结构' where MenuId='95C39F86-C060-452E-BA37-D891C466A39B';
+update Sys_Menu set MenuName='静设备' where MenuId='982F746C-084C-445C-9AE8-8C37BDFE7994';
+update Sys_Menu set MenuName='尾项分类表' where MenuId='CB76462E-9444-4946-B787-ECB33C21E6D0';
+update Sys_Menu set MenuName='管道' where MenuId='D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B';
+update Sys_Menu set MenuName='移交统计表' where MenuId='E305689E-5D84-4C1A-BF67-85FA2D828115';
+go
+--2、删除项目中的地管和消防2个项目（隐藏菜单）
+update Sys_Menu set MenuName='消防',IsUsed=0 where MenuId='794E64E2-FDD2-4B7D-8408-F7FB06F9C92A';
+update Sys_Menu set MenuName='地管',IsUsed=0 where MenuId='95295BF7-FB51-480D-9902-6ADA4E8427FC';
+go
+--3、更新管道表的表格
+--判断字段不存在则添加
+IF NOT EXISTS(select * from sys.columns where name='TotalFactor' and [object_id]=object_id(N'Transfer_Piping')) 
+BEGIN
+	--总达因数
+	ALTER TABLE Transfer_Piping ADD TotalFactor nvarchar(50) NULL;
+	--完成达因数
+	ALTER TABLE Transfer_Piping ADD CompleteFactor nvarchar(50) NULL;
+	--完成比例
+	ALTER TABLE Transfer_Piping ADD CompleteProportion nvarchar(50) NULL;
+	--试压完成
+	ALTER TABLE Transfer_Piping ADD PressureTestCompleted nvarchar(50) NULL;
+	--冲洗吹扫
+	ALTER TABLE Transfer_Piping ADD RinseAndBlowClean nvarchar(50) NULL;
+	--复位
+	ALTER TABLE Transfer_Piping ADD Reduction nvarchar(50) NULL;
+	--电伴热
+	ALTER TABLE Transfer_Piping ADD ElectricHeatTracing nvarchar(50) NULL;
+	--保温/冷
+	ALTER TABLE Transfer_Piping ADD Insulation nvarchar(50) NULL;
+END
+go
+
+
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-15-xiaj.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-15-xiaj.sql
new file mode 100644
index 00000000..6390a1e8
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-15-xiaj.sql
@@ -0,0 +1,24 @@
+
+
+--1、修改管道表字段数据类型
+ALTER TABLE Transfer_Piping ALTER COLUMN TotalFactor decimal(10, 2);
+ALTER TABLE Transfer_Piping ALTER COLUMN CompleteFactor decimal(10, 2);
+update Transfer_Piping set CompleteProportion='0'where CompleteProportion='' or CompleteProportion is null;
+go
+ALTER TABLE Transfer_Piping ALTER COLUMN CompleteProportion decimal(10, 2);
+go
+
+
+
+--3、移交统计表补充电伴热和保温冷
+IF NOT EXISTS(select * from sys.columns where name='Insulation' and [object_id]=object_id(N'Transfer_SystemControl')) 
+BEGIN
+	--电伴热
+	ALTER TABLE Transfer_SystemControl ADD ElectricHeatTracing nvarchar(50) NULL;
+	--保温/冷
+	ALTER TABLE Transfer_SystemControl ADD Insulation nvarchar(50) NULL;
+END
+go
+
+
+
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-22-xiaj.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-22-xiaj.sql
new file mode 100644
index 00000000..547482e5
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-22-xiaj.sql
@@ -0,0 +1,13 @@
+
+--历史尾项数据修改
+update Transfer_PunchlistFrom set IsMatI='Y2' where IsMatI='Y';
+update Transfer_PunchlistFrom set Punch_Type='JWD' where Punch_Type='FWD';
+go
+
+
+update Transfer_PunchlistFrom set Sub_Sys_No='LHC1-CVL05-01-01' where Sub_Sys_No='CVL05-01';
+update Transfer_PunchlistFrom set Sub_Sys_No='LHC1-EL01-00-01' where Sub_Sys_No='EL01-01';
+
+go
+
+
diff --git a/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-26-phf.sql b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-26-phf.sql
new file mode 100644
index 00000000..44166663
--- /dev/null
+++ b/DataBase/鐗堟湰鏃ュ織/SUBQHSE_V2024-11-26-phf.sql
@@ -0,0 +1,12 @@
+
+alter table Report_ConstructionProblems
+alter column ProblemDesrioption nvarchar(2000) null;
+
+alter table Report_ConstructionProblems
+alter column TreatmentMeasures nvarchar(2000) null;
+
+alter table Report_RowMaterialProblem
+alter column ProblemDesrioption nvarchar(2000) null;
+
+alter table Report_RowMaterialProblem
+alter column TreatmentMeasures nvarchar(2000) null;
diff --git a/SGGL/BLL/.vs/BLL.csproj.dtbcache.json b/SGGL/BLL/.vs/BLL.csproj.dtbcache.json
index 9a74c8a3..11fd330d 100644
--- a/SGGL/BLL/.vs/BLL.csproj.dtbcache.json
+++ b/SGGL/BLL/.vs/BLL.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\BLL","ProjectFileName":"BLL.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"API\\APIBaseInfoService.cs"},{"SourceFile":"API\\APICommonService.cs"},{"SourceFile":"API\\APIDoorServerService.cs"},{"SourceFile":"API\\APIGetHttpService.cs"},{"SourceFile":"API\\APIIDCardInfoService.cs"},{"SourceFile":"API\\APIPersonService.cs"},{"SourceFile":"API\\APIProjectService.cs"},{"SourceFile":"API\\APIUnitService.cs"},{"SourceFile":"API\\APIUpLoadFileService.cs"},{"SourceFile":"API\\APIUserService.cs"},{"SourceFile":"API\\HJGL\\APIGetHJDataService.cs"},{"SourceFile":"API\\HJGL\\APIHotProcessHardService.cs"},{"SourceFile":"API\\HJGL\\APINDETrustService.cs"},{"SourceFile":"API\\HJGL\\APIPipeJointService.cs"},{"SourceFile":"API\\HJGL\\APIPreWeldingDailyService.cs"},{"SourceFile":"API\\HJGL\\APIReportQueryService.cs"},{"SourceFile":"API\\HJGL\\APITestPackageService.cs"},{"SourceFile":"API\\HSSE\\APIGeneralEquipmentQualityService.cs"},{"SourceFile":"API\\HSSE\\APIPageDataService.cs"},{"SourceFile":"API\\HSSE\\APIChartAnalysisService.cs"},{"SourceFile":"API\\HSSE\\APICheckSpecialService.cs"},{"SourceFile":"API\\HSSE\\APIConstructSolutionService.cs"},{"SourceFile":"API\\HSSE\\APIEmergencyService.cs"},{"SourceFile":"API\\HSSE\\APIEquipmentQualityService.cs"},{"SourceFile":"API\\HSSE\\APIHazardListService.cs"},{"SourceFile":"API\\HSSE\\APIHazardRegisterService.cs"},{"SourceFile":"API\\HSSE\\APIHSEDiaryService.cs"},{"SourceFile":"API\\HSSE\\APIIncentiveNoticeService.cs"},{"SourceFile":"API\\HSSE\\APILicenseDataService.cs"},{"SourceFile":"API\\HSSE\\APILicenseFlowOperateService.cs"},{"SourceFile":"API\\HSSE\\APILicenseItemService.cs"},{"SourceFile":"API\\HSSE\\APIMeetingService.cs"},{"SourceFile":"API\\HSSE\\APIPauseNoticeService.cs"},{"SourceFile":"API\\HSSE\\APIPersonQualityService.cs"},{"SourceFile":"API\\HSSE\\APIPunishNoticeService.cs"},{"SourceFile":"API\\HSSE\\APIReceiveFileManagerService.cs"},{"SourceFile":"API\\HSSE\\APIRectifyNoticesService.cs"},{"SourceFile":"API\\HSSE\\APIResourcesService.cs"},{"SourceFile":"API\\HSSE\\APISeDinMonthReportService.cs"},{"SourceFile":"API\\HSSE\\APIServerTestPlanService.cs"},{"SourceFile":"API\\HSSE\\APIServerTestRecordService.cs"},{"SourceFile":"API\\HSSE\\APITestPlanService.cs"},{"SourceFile":"API\\HSSE\\APITestRecordService.cs"},{"SourceFile":"API\\HSSE\\APITrainingPlanService.cs"},{"SourceFile":"API\\HSSE\\APITrainingTaskService.cs"},{"SourceFile":"API\\HSSE\\APITrainRecordService.cs"},{"SourceFile":"BaseInfo\\AccidentTypeService.cs"},{"SourceFile":"BaseInfo\\BaseFactoryService.cs"},{"SourceFile":"BaseInfo\\CertificateService.cs"},{"SourceFile":"BaseInfo\\CNProfessionalService.cs"},{"SourceFile":"BaseInfo\\CostTypeService.cs"},{"SourceFile":"BaseInfo\\DesignProfessionalService.cs"},{"SourceFile":"BaseInfo\\DocTypeService.cs"},{"SourceFile":"BaseInfo\\EmergencyTypeService.cs"},{"SourceFile":"BaseInfo\\GoodsCategoryService.cs"},{"SourceFile":"BaseInfo\\HSSEStandardListTypeService.cs"},{"SourceFile":"BaseInfo\\HSSE_Hazard_HazardRegisterTypesService.cs"},{"SourceFile":"BaseInfo\\InspectionAreaService.cs"},{"SourceFile":"BaseInfo\\LawsRegulationsTypeService.cs"},{"SourceFile":"BaseInfo\\LicenseTypeService.cs"},{"SourceFile":"BaseInfo\\ManageRuleTypeService.cs"},{"SourceFile":"BaseInfo\\PersonManageService.cs"},{"SourceFile":"BaseInfo\\PictureTypeService.cs"},{"SourceFile":"BaseInfo\\PositionService.cs"},{"SourceFile":"BaseInfo\\PostService.cs"},{"SourceFile":"BaseInfo\\PostTitleService.cs"},{"SourceFile":"BaseInfo\\PracticeCertificateService.cs"},{"SourceFile":"BaseInfo\\ProjectTypeService.cs"},{"SourceFile":"BaseInfo\\QualityQuestionTypeService.cs"},{"SourceFile":"BaseInfo\\QuestionTypeService.cs"},{"SourceFile":"BaseInfo\\RectificationMeasureService.cs"},{"SourceFile":"BaseInfo\\RiskLevelService.cs"},{"SourceFile":"BaseInfo\\RulesRegulationsTypeService.cs"},{"SourceFile":"BaseInfo\\SafetyMeasuresService.cs"},{"SourceFile":"BaseInfo\\SolutionTempleteTypeService.cs"},{"SourceFile":"BaseInfo\\SpecialEquipmentService.cs"},{"SourceFile":"BaseInfo\\SpecialSchemeTypeService.cs"},{"SourceFile":"BaseInfo\\SteelService.cs"},{"SourceFile":"BaseInfo\\TestRunLicenseTypeService.cs"},{"SourceFile":"BaseInfo\\TestRunPerformanceStandardService.cs"},{"SourceFile":"BaseInfo\\TrainLevelService.cs"},{"SourceFile":"BaseInfo\\TrainTypeService.cs"},{"SourceFile":"BaseInfo\\TransferMajorService.cs"},{"SourceFile":"BaseInfo\\UnitTypeService.cs"},{"SourceFile":"BaseInfo\\WorkPostService.cs"},{"SourceFile":"BaseInfo\\WorkStageService.cs"},{"SourceFile":"BoSheng\\BOSHENGService.cs"},{"SourceFile":"Common\\AttachFileService.cs"},{"SourceFile":"Common\\CodeRecordsService.cs"},{"SourceFile":"Common\\CommonService.cs"},{"SourceFile":"Common\\CreateQRCodeService.cs"},{"SourceFile":"Common\\IDCardValid.cs"},{"SourceFile":"Common\\NPOIExcel.cs"},{"SourceFile":"Common\\NPOIHelper.cs"},{"SourceFile":"Common\\PrinterDocService.cs"},{"SourceFile":"Common\\ProjectDataFlowSetService.cs"},{"SourceFile":"Common\\Sys_DataTempService.cs"},{"SourceFile":"Common\\UploadFileService.cs"},{"SourceFile":"Common\\UpLoadImageService.cs"},{"SourceFile":"Common\\UserShowColumnsService.cs"},{"SourceFile":"Common\\WeatherService.cs"},{"SourceFile":"Common\\WeekDayService.cs"},{"SourceFile":"CostGoods\\MeasuresPlanService.cs"},{"SourceFile":"CostGoods\\PayRegistrationService.cs"},{"SourceFile":"CostGoods\\SubPayRegistrationService.cs"},{"SourceFile":"CQMS\\Comprehensive\\ConTechnologyDisclosureService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataDistributionApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataDistributionService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingDocApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingDocService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignChangeOrderApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignChangeOrderService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDetailsApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDetailsService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDrawingsApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDrawingsService.cs"},{"SourceFile":"CQMS\\Comprehensive\\GeneralPlanApprovalItemService.cs"},{"SourceFile":"CQMS\\Comprehensive\\GeneralPlanApprovalService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionEquipmentApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionEquipmentService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionMachineApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionMachineService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionPersonApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionPersonService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionTestPlanService.cs"},{"SourceFile":"CQMS\\Comprehensive\\MajorPlanApprovalItemService.cs"},{"SourceFile":"CQMS\\Comprehensive\\MajorPlanApprovalService.cs"},{"SourceFile":"CQMS\\Comprehensive\\NCRManagementApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\NCRManagementService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PersonSteelService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PersonWeldMethodService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PressurePipeApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PressurePipeService.cs"},{"SourceFile":"CQMS\\Comprehensive\\QualityAccidentApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\QualityAccidentService.cs"},{"SourceFile":"CQMS\\Comprehensive\\ReviewDrawingsService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SiteVisaManagementApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SiteVisaManagementService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SpecialEquipmentApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SpecialEquipmentService.cs"},{"SourceFile":"CQMS\\Check\\CheckControlApproveService.cs"},{"SourceFile":"CQMS\\Check\\CheckControlService.cs"},{"SourceFile":"CQMS\\Check\\CheckEquipmentApproveService.cs"},{"SourceFile":"CQMS\\Check\\CheckEquipmentService.cs"},{"SourceFile":"CQMS\\Check\\CheckMonthService.cs"},{"SourceFile":"CQMS\\Check\\DesignApproveService.cs"},{"SourceFile":"CQMS\\Check\\DesignService.cs"},{"SourceFile":"CQMS\\Check\\DrawApproveService.cs"},{"SourceFile":"CQMS\\Check\\DrawService.cs"},{"SourceFile":"CQMS\\Check\\FileCabinetService.cs"},{"SourceFile":"CQMS\\Check\\JointCheckApproveService.cs"},{"SourceFile":"CQMS\\Check\\JointCheckDetailService.cs"},{"SourceFile":"CQMS\\Check\\JointCheckService.cs"},{"SourceFile":"CQMS\\Check\\MonthSpotCheckDetailService.cs"},{"SourceFile":"CQMS\\Check\\SpecialEquipmentDetailService.cs"},{"SourceFile":"CQMS\\Check\\SpotCheckApproveService.cs"},{"SourceFile":"CQMS\\Check\\SpotCheckDetailService.cs"},{"SourceFile":"CQMS\\Check\\SpotCheckService.cs"},{"SourceFile":"CQMS\\Check\\TechnicalContactListApproveService.cs"},{"SourceFile":"CQMS\\Check\\TechnicalContactListService.cs"},{"SourceFile":"CQMS\\Comprehensive\\TrainingRecordsService.cs"},{"SourceFile":"CQMS\\DataBase\\ConstructionStandardListProjectService.cs"},{"SourceFile":"CQMS\\DataBase\\ConstructionStandardListService.cs"},{"SourceFile":"CQMS\\DataBase\\DataTypeProjectService.cs"},{"SourceFile":"CQMS\\DataBase\\DataTypeService.cs"},{"SourceFile":"CQMS\\DataBase\\FileService.cs"},{"SourceFile":"CQMS\\DataBase\\InspectionLotService.cs"},{"SourceFile":"CQMS\\DataBase\\PhotoService.cs"},{"SourceFile":"CQMS\\DataBase\\StartWorkReportService.cs"},{"SourceFile":"CQMS\\Foreign\\ControlPointCheckService.cs"},{"SourceFile":"CQMS\\Foreign\\ITPListProjectService.cs"},{"SourceFile":"CQMS\\Foreign\\ITPListService.cs"},{"SourceFile":"CQMS\\ManageReport\\ComprehensiveService.cs"},{"SourceFile":"CQMS\\ManageReport\\ConstructionProblemsService.cs"},{"SourceFile":"CQMS\\ManageReport\\NextQualityControlService.cs"},{"SourceFile":"CQMS\\ManageReport\\ProjectQualityWorkSummaryReportService.cs"},{"SourceFile":"CQMS\\ManageReport\\ProjectQuarterlyProjectQualityService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\ConstructionPlanService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\CqmsTargetService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\Report_CQMS_MonthReportItemService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\TextBoxContentService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\WeekAndMonthReportNewService.cs"},{"SourceFile":"CQMS\\ManageReport\\RowMaterialProblemService.cs"},{"SourceFile":"CQMS\\ManageReport\\ThisWeekOrMonthContentService.cs"},{"SourceFile":"CQMS\\ManageReport\\WeekAndMonthReportService.cs"},{"SourceFile":"CQMS\\Performance\\PerformanceService.cs"},{"SourceFile":"CQMS\\ProcessControl\\HotProessManageService.cs"},{"SourceFile":"CQMS\\ProcessControl\\InspectionManagementDetailService.cs"},{"SourceFile":"CQMS\\ProcessControl\\InspectionManagementService.cs"},{"SourceFile":"CQMS\\ProcessControl\\NondestructiveTestNewService.cs"},{"SourceFile":"CQMS\\ProcessControl\\NondestructiveTestService.cs"},{"SourceFile":"CQMS\\ProcessControl\\TestPackageManagementService.cs"},{"SourceFile":"CQMS\\Solution\\CQMSConstructSolutionApproveService.cs"},{"SourceFile":"CQMS\\Solution\\CQMSConstructSolutionService.cs"},{"SourceFile":"CQMS\\Unqualified\\WorkContactApproveService.cs"},{"SourceFile":"CQMS\\Unqualified\\WorkContactService.cs"},{"SourceFile":"CQMS\\WBS\\BreakdownProjectService.cs"},{"SourceFile":"CQMS\\WBS\\BreakdownService.cs"},{"SourceFile":"CQMS\\WBS\\ControlItemAndCycleService.cs"},{"SourceFile":"CQMS\\WBS\\ControlItemInitService.cs"},{"SourceFile":"CQMS\\WBS\\ControlItemProjectService.cs"},{"SourceFile":"CQMS\\WBS\\DivisionProjectService.cs"},{"SourceFile":"CQMS\\WBS\\DivisionService.cs"},{"SourceFile":"CQMS\\WBS\\ForeignBreakdownProjectService.cs"},{"SourceFile":"CQMS\\WBS\\ForeignBreakdownService.cs"},{"SourceFile":"CQMS\\WBS\\ForeignCNProfessionalService.cs"},{"SourceFile":"CQMS\\WBS\\WBSsearchService.cs"},{"SourceFile":"CQMS\\WBS\\WorkPackageInitService.cs"},{"SourceFile":"CQMS\\WBS\\WorkPackageProjectService.cs"},{"SourceFile":"CQMS\\WBS\\WorkPackageService.cs"},{"SourceFile":"DigData\\HSEDataCollectService.cs"},{"SourceFile":"DocManage\\DocManageApproveService.cs"},{"SourceFile":"DocManage\\DocManageService.cs"},{"SourceFile":"DoorServer\\InOutService.cs"},{"SourceFile":"DoorServer\\DoorServerService.cs"},{"SourceFile":"DropListService.cs"},{"SourceFile":"GlobalSuppressions.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_ComponentsService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_ConsumablesService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DefectService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DetectionRateService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DetectionTypeService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DNCompareService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_GrooveTypeService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_MaterialService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_MediumService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PipingClassService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PressurePipingClassService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PressureService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PurgeMethodService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_TestMediumService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_WeldingLocationServie.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_WeldingMethodService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_WeldTypeService.cs"},{"SourceFile":"HJGL\\FL\\FLDataService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\Hard_ReportService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\Hard_TrustItemService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\Hard_TrustService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\HotProessReportService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\HotProessTrustItemService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\HotProess_TrustService.cs"},{"SourceFile":"HJGL\\LeakVacuum\\LeakVacuumAuditService.cs"},{"SourceFile":"HJGL\\LeakVacuum\\LeakVacuumEditService.cs"},{"SourceFile":"HJGL\\LeakVacuum\\LV_ItemEndCheckService.cs"},{"SourceFile":"HJGL\\NDT\\Batch_NDEItemService.cs"},{"SourceFile":"HJGL\\NDT\\Batch_NDEService.cs"},{"SourceFile":"HJGL\\PersonManage\\CheckerService.cs"},{"SourceFile":"HJGL\\PersonManage\\WelderQualifyService.cs"},{"SourceFile":"HJGL\\PersonManage\\WelderService.cs"},{"SourceFile":"HJGL\\PointTrust\\Batch_BatchTrustItemService.cs"},{"SourceFile":"HJGL\\PointTrust\\Batch_BatchTrustService.cs"},{"SourceFile":"HJGL\\PointTrust\\PointBatchDetailService.cs"},{"SourceFile":"HJGL\\PointTrust\\PointBatchService.cs"},{"SourceFile":"HJGL\\PurgingCleaning\\PC_ItemEndCheckService.cs"},{"SourceFile":"HJGL\\PurgingCleaning\\PurgingCleaningAuditService.cs"},{"SourceFile":"HJGL\\PurgingCleaning\\PurgingCleaningEditService.cs"},{"SourceFile":"HJGL\\RepairAndExpand\\RepairRecordService.cs"},{"SourceFile":"HJGL\\TestPackage\\AItemEndCheckService.cs"},{"SourceFile":"HJGL\\TestPackage\\BItemEndCheckService.cs"},{"SourceFile":"HJGL\\TestPackage\\TestPackageApproveService.cs"},{"SourceFile":"HJGL\\TestPackage\\TestPackageAuditService.cs"},{"SourceFile":"HJGL\\TestPackage\\TestPackageEditService.cs"},{"SourceFile":"HJGL\\WeldingManage\\PipelineService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldingDailyService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldJointService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldTaskService.cs"},{"SourceFile":"HJGL\\WPQ\\WPQListService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentHandleService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentPersonRecordService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentReportOtherItemService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentReportOtherService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentReportService.cs"},{"SourceFile":"HSSE\\Accident\\NoFourLetoffService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlanListService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlanSummaryService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_CompanyManagerRuleService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_ManagerRuleService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_SubManagerRuleService .cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_ProjectManagerRuleService.cs"},{"SourceFile":"HSSE\\Administrative\\CarManagerService.cs"},{"SourceFile":"HSSE\\Administrative\\DriverManagerService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckColligationDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckColligationService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckDayDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckDayService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckHolidayDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckHolidayService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckSpecialDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckSpecialService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckWorkDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckWorkService.cs"},{"SourceFile":"HSSE\\Check\\Check_PauseNoticeService.cs"},{"SourceFile":"HSSE\\Check\\Check_ProjectCheckItemDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_ProjectCheckItemSetService.cs"},{"SourceFile":"HSSE\\Check\\Check_ProjectLeaderCheckService.cs"},{"SourceFile":"HSSE\\Check\\ContactListService.cs"},{"SourceFile":"HSSE\\Check\\HSECertificateService.cs"},{"SourceFile":"HSSE\\Check\\IncentiveNoticeService.cs"},{"SourceFile":"HSSE\\Check\\PunishNoticeService.cs"},{"SourceFile":"HSSE\\Check\\RectifyNoticesService.cs"},{"SourceFile":"HSSE\\Check\\SupervisionNoticeService.cs"},{"SourceFile":"HSSE\\Check\\ViolationPersonService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostManageItemService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostManageService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostSmallDetailItemService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostSmallDetailService.cs"},{"SourceFile":"HSSE\\CostGoods\\GoodsManageService.cs"},{"SourceFile":"HSSE\\EduTrain\\AccidentCaseItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\AccidentCaseService.cs"},{"SourceFile":"HSSE\\EduTrain\\CompanyTrainingItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\CompanyTrainingService.cs"},{"SourceFile":"HSSE\\EduTrain\\EduTrain_TrainRecordDetailService.cs"},{"SourceFile":"HSSE\\EduTrain\\EduTrain_TrainRecordService.cs"},{"SourceFile":"HSSE\\EduTrain\\EduTrain_TrainTestService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestPlanService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestRecordItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestRecordService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestTrainingItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestTrainingService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingPlanItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingPlanService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingTaskService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainTestDBItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainTestDBService.cs"},{"SourceFile":"HSSE\\Emergency\\DrillRecordListService.cs"},{"SourceFile":"HSSE\\Emergency\\EmergencyListService.cs"},{"SourceFile":"HSSE\\Emergency\\EmergencySupplyService.cs"},{"SourceFile":"HSSE\\Emergency\\EmergencyTeamAndTrainService.cs"},{"SourceFile":"HSSE\\Environmental\\EIAReportService.cs"},{"SourceFile":"HSSE\\Environmental\\EnvironmentalEmergencyPlanService.cs"},{"SourceFile":"HSSE\\Environmental\\EnvironmentalMonitoringService.cs"},{"SourceFile":"HSSE\\Environmental\\UnexpectedEnvironmentalService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\FinalFileListService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\HSEFinalFileListService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\OtherDocumentListService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\OwnerFinalFileService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_EnvironmentalRiskItemService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_EnvironmentalRiskListService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_HazardListService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_HazardSelectedItemService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_OtherHazardService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_PatrolPlanService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_RoutingInspectionService.cs"},{"SourceFile":"HSSE\\Hazard\\RiskEvaluationRecordService.cs"},{"SourceFile":"HSSE\\HiddenInspection\\HSSE_Hazard_HazardRegisterService.cs"},{"SourceFile":"HSSE\\HSSESystem\\HSSEMainDutyService.cs"},{"SourceFile":"HSSE\\HSSESystem\\ServerSafetyInstitutionService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentInItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentInService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentOutItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentOutService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentQualityInItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentQualityInService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentInItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentInService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentOutItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentOutService.cs"},{"SourceFile":"HSSE\\InformationProject\\ConstructionStandardIdentifyService.cs"},{"SourceFile":"HSSE\\InformationProject\\ConstructionStandardSelectedItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\FileCabinetAItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\FileCabinetAService.cs"},{"SourceFile":"HSSE\\InformationProject\\LawRegulationIdentifyService.cs"},{"SourceFile":"HSSE\\InformationProject\\LawRegulationSelectedItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectAccidentCauseReportItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectAccidentCauseReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillConductedQuarterlyReportItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillConductedQuarterlyReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillPlanHalfYearReportItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillPlanHalfYearReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectEPSummaryReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectFolderItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectFolderService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectMillionsMonthlyReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectSafetyQuarterlyReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectWorkSummaryReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\PromotionalActivitiesService.cs"},{"SourceFile":"HSSE\\Law\\HSSEStandardsListService.cs"},{"SourceFile":"HSSE\\Law\\ManageRuleService.cs"},{"SourceFile":"HSSE\\Law\\RulesRegulationsService.cs"},{"SourceFile":"HSSE\\License\\EquipmentSafetyListService.cs"},{"SourceFile":"HSSE\\License\\HSETechnicalService.cs"},{"SourceFile":"HSSE\\License\\LicenseManagerService.cs"},{"SourceFile":"HSSE\\License\\LicensePublicService.cs"},{"SourceFile":"HSSE\\License\\SecurityLicenseService.cs"},{"SourceFile":"HSSE\\Manager\\AccidentDetailSortBService.cs"},{"SourceFile":"HSSE\\Manager\\CompletionReportService.cs"},{"SourceFile":"HSSE\\Manager\\HSSELogMonthService.cs"},{"SourceFile":"HSSE\\Manager\\HSSELogService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\AccidentDesciptionCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\AccidentDesciptionItemCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\AccidentSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ActivitiesCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ActivityDesCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CheckCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CheckDetailSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CheckSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ComplianceObligationsCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CostInvestmentPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\DrillSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\EmergencyExercisesCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\EmergencyPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\EmergencySortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\FileManageCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\FiveExpenseCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\HazardCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\HazardSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\HseCostCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\IncentiveSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\InjuryAccidentCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ManageDocPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\MeetingCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\MeetingSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\MonthReportCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\NoInjuryAccidentCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherActiveSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherManagementCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherWorkCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherWorkPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PerformanceIndicatorCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PersonSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PromotionalActiviteSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ReviewRecordCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\RewardAndPunishSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\SubExpenseCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\TrainActivitySortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\TrainCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\TrainSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonth_SeDinService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerWeekService.cs"},{"SourceFile":"HSSE\\Manager\\MonthReportBService.cs"},{"SourceFile":"HSSE\\Manager\\MonthReportDService.cs"},{"SourceFile":"HSSE\\Manager\\MonthReportService.cs"},{"SourceFile":"HSSE\\Manager\\ReportRemindService.cs"},{"SourceFile":"HSSE\\Manager\\SafetyDataDService.cs"},{"SourceFile":"HSSE\\Manager\\SubManagerMonthService.cs"},{"SourceFile":"HSSE\\Manager\\SubManagerWeekService.cs"},{"SourceFile":"HSSE\\Meeting\\AttendMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\ClassMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\MonthMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\SafetyLeaderGroupMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\SpecialMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\WeekMeetingService.cs"},{"SourceFile":"HSSE\\CostGoods\\ExpenseDetailService.cs"},{"SourceFile":"HSSE\\CostGoods\\ExpenseService.cs"},{"SourceFile":"HSSE\\OccupationHealth\\HazardDetectionService.cs"},{"SourceFile":"HSSE\\OccupationHealth\\OccupationalDiseaseAccidentService.cs"},{"SourceFile":"HSSE\\OccupationHealth\\PhysicalExaminationService.cs"},{"SourceFile":"HSSE\\Perfomance\\PerfomanceRecordService.cs"},{"SourceFile":"HSSE\\Perfomance\\PersonPerfomanceService.cs"},{"SourceFile":"HSSE\\QualityAudit\\EquipmentPersonQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\EquipmentQualityAuditDetailService.cs"},{"SourceFile":"HSSE\\QualityAudit\\EquipmentQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\GeneralEquipmentQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\InUnitService.cs"},{"SourceFile":"HSSE\\QualityAudit\\ProjectRecordService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SafePersonQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SafetyDataItemService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SubUnitQualityAuditDetailService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SubUnitQualityService.cs"},{"SourceFile":"HSSE\\Resources\\SignManageService.cs"},{"SourceFile":"HSSE\\SafetyData\\SafetyDataPlanService.cs"},{"SourceFile":"HSSE\\SafetyData\\SafetyDataService.cs"},{"SourceFile":"HSSE\\SecuritySystem\\SafetyOrganizationService.cs"},{"SourceFile":"HSSE\\Law\\LawRegulationListService.cs"},{"SourceFile":"HSSE\\SitePerson\\PersonInOutService.cs"},{"SourceFile":"HSSE\\QualityAudit\\PersonQualityService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_CheckingService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_DayReportDetailService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_DayReportService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_DayReportUnitDetailService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_MonthReportDetailService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_MonthReportService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_MonthReportUnitDetailService.cs"},{"SourceFile":"HSSE\\Solution\\ConstructSolutionService.cs"},{"SourceFile":"HSSE\\Solution\\ExpertArgumentService.cs"},{"SourceFile":"HSSE\\Solution\\LargerHazardService.cs"},{"SourceFile":"HSSE\\Solution\\SolutionTemplateService.cs"},{"SourceFile":"HSSE\\Technique\\EmergencyService.cs"},{"SourceFile":"HSSE\\Technique\\HazardListService.cs"},{"SourceFile":"HSSE\\Technique\\HazardListTypeService.cs"},{"SourceFile":"HSSE\\Technique\\EnvironmentalService.cs"},{"SourceFile":"HSSE\\Technique\\RectifyItemService.cs"},{"SourceFile":"HSSE\\Technique\\RectifyService.cs"},{"SourceFile":"HSSE\\Technique\\SpecialSchemeService.cs"},{"SourceFile":"HSSE\\Technique\\Technique_CheckItemDetailService.cs"},{"SourceFile":"HSSE\\Technique\\Technique_CheckItemSetService.cs"},{"SourceFile":"JDGL\\Check\\ElectricalCompletionService.cs"},{"SourceFile":"JDGL\\Check\\EquipmentCompletionService.cs"},{"SourceFile":"JDGL\\Check\\LowTankCompletionService.cs"},{"SourceFile":"JDGL\\Check\\MeterCompletionService.cs"},{"SourceFile":"JDGL\\Check\\MonthPlanService.cs"},{"SourceFile":"JDGL\\Check\\PipelineCompletionService.cs"},{"SourceFile":"JDGL\\Check\\ProgressCompletionService.cs"},{"SourceFile":"JDGL\\Check\\QuantityCompletionService.cs"},{"SourceFile":"JDGL\\Check\\QuantityListService.cs"},{"SourceFile":"JDGL\\Check\\SteelStructureCompletionService.cs"},{"SourceFile":"JDGL\\Check\\UndergroundPipeCompletionService.cs"},{"SourceFile":"JDGL\\WBSCompleteAndReal\\WBSReportService.cs"},{"SourceFile":"JDGL\\WBS\\CnProfessionInitService.cs"},{"SourceFile":"JDGL\\WBS\\CnProfessionService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlDetailHistoryService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlDetailService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlInitService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlParentDetailService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlService.cs"},{"SourceFile":"JDGL\\WBS\\EquipmentMaterialBigTypeService.cs"},{"SourceFile":"JDGL\\WBS\\EquipmentMaterialTypeService.cs"},{"SourceFile":"JDGL\\WBS\\MilePostService.cs"},{"SourceFile":"JDGL\\WBS\\UnitProjectInitService.cs"},{"SourceFile":"JDGL\\WBS\\UnitProjectService.cs"},{"SourceFile":"JDGL\\WBS\\WbsDetailHistoryService.cs"},{"SourceFile":"JDGL\\WBS\\WbsDetailService.cs"},{"SourceFile":"JDGL\\WBS\\WBSRectificationMeasureSetService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetInitService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetMatchCostControlInitService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetMatchCostControlService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetService.cs"},{"SourceFile":"JDGL\\WBS\\WorkloadStatisticsService.cs"},{"SourceFile":"Notice\\NoticeService.cs"},{"SourceFile":"obj\\Debug\\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs"},{"SourceFile":"obj\\Debug\\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs"},{"SourceFile":"obj\\Debug\\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs"},{"SourceFile":"obj\\Release\\TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs"},{"SourceFile":"obj\\Release\\TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs"},{"SourceFile":"obj\\Release\\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckNoticeService.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckReportService.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckTable1Service.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckTeamService.cs"},{"SourceFile":"OfficeCheck\\Check\\ProjectSupervision_Check1Service.cs"},{"SourceFile":"OfficeCheck\\Check\\ProjectSupervision_RectifyItemService.cs"},{"SourceFile":"OfficeCheck\\Check\\ProjectSupervision_RectifyService.cs"},{"SourceFile":"OfficeCheck\\ProjectEvaluation\\ProjectEvaluationService.cs"},{"SourceFile":"OpenService\\FileInsertService.cs"},{"SourceFile":"OpenService\\FileStructService.cs"},{"SourceFile":"OpenService\\MonitorService.cs"},{"SourceFile":"DynamicTHeaderHepler.cs"},{"SourceFile":"OpenService\\GetDataService.cs"},{"SourceFile":"Opinion\\OpinionCollectionApproveService.cs"},{"SourceFile":"Opinion\\OpinionCollectionService.cs"},{"SourceFile":"Party\\BasicInformationDetailService.cs"},{"SourceFile":"Party\\BasicInformationService.cs"},{"SourceFile":"Party\\CommentPartyerService.cs"},{"SourceFile":"Party\\DoingThingsForMassesService.cs"},{"SourceFile":"Party\\EmployeeConversationRecordService.cs"},{"SourceFile":"Party\\FocusLearnService.cs"},{"SourceFile":"Party\\LastWorkSummaryService.cs"},{"SourceFile":"Party\\NewsPropagandaWorkService.cs"},{"SourceFile":"Party\\OrganizingLifeService.cs"},{"SourceFile":"Party\\PartyCommitteeService.cs"},{"SourceFile":"Party\\PartyCongressService.cs"},{"SourceFile":"Party\\PartyerService.cs"},{"SourceFile":"Party\\PartyHistoryStudyService.cs"},{"SourceFile":"Party\\PartyLectureService.cs"},{"SourceFile":"Party\\PartyMeetingService.cs"},{"SourceFile":"Party\\PartyMoneyUseService.cs"},{"SourceFile":"Party\\PartyPioneerDemonstrationService.cs"},{"SourceFile":"Party\\ThemePartyDayService.cs"},{"SourceFile":"Party\\TwoOneGoodSelectionService.cs"},{"SourceFile":"Party\\WorkPlanService.cs"},{"SourceFile":"Person\\Person_BusinessTripService.cs"},{"SourceFile":"Person\\Person_MeetingService.cs"},{"SourceFile":"Person\\PersonTotalService.cs"},{"SourceFile":"Person\\Person_DutyService.cs"},{"SourceFile":"Person\\Person_DutyTemplateService.cs"},{"SourceFile":"Person\\Person_PersonPlanService.cs"},{"SourceFile":"Person\\Person_QuarterCheckApproveService.cs"},{"SourceFile":"Person\\Person_QuarterCheckItemService.cs"},{"SourceFile":"Person\\Person_QuarterCheckService.cs"},{"SourceFile":"Person\\Person_ShuntApproveService.cs"},{"SourceFile":"Person\\Person_ShuntDetailService.cs"},{"SourceFile":"Person\\Person_ShuntService.cs"},{"SourceFile":"Person\\Person_TestRunMonthSummaryService.cs"},{"SourceFile":"Person\\Person_TestRunPerformanceService.cs"},{"SourceFile":"Person\\Person_TrainingPlanService.cs"},{"SourceFile":"ProjectData\\MainItemService.cs"},{"SourceFile":"ProjectData\\ProjectData_CodeTemplateRuleService.cs"},{"SourceFile":"ProjectData\\ProjectSateService.cs"},{"SourceFile":"ProjectData\\ProjectService.cs"},{"SourceFile":"ProjectData\\ProjectSetMapService.cs"},{"SourceFile":"ProjectData\\ProjectUnitService.cs"},{"SourceFile":"ProjectData\\ProjectUserService.cs"},{"SourceFile":"Common\\ChartControlService.cs"},{"SourceFile":"Common\\ConstValue.cs"},{"SourceFile":"Common\\UploadAttachmentService.cs"},{"SourceFile":"Common\\CreateMenuXML.cs"},{"SourceFile":"ProjectData\\Project_InstallationService.cs"},{"SourceFile":"ProjectData\\Project_SysSetService.cs"},{"SourceFile":"ProjectData\\TeamGroupService.cs"},{"SourceFile":"ProjectData\\UnitWorkService.cs"},{"SourceFile":"HSSE\\SitePerson\\PersonService.cs"},{"SourceFile":"PZHGL\\GJSX\\GJSXItemService.cs"},{"SourceFile":"PZHGL\\GJSX\\GJSXProcessService.cs"},{"SourceFile":"PZHGL\\GJSX\\GJSXService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionLogService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionPlanApproveService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionPlanService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionReportApproveService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionReportService.cs"},{"SourceFile":"PZHGL\\InformationProject\\PictureService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ReceiveFileManagerService.cs"},{"SourceFile":"PZHGL\\InformationProject\\WorkHandoverApproveService.cs"},{"SourceFile":"PZHGL\\InformationProject\\WorkHandoverDetailService.cs"},{"SourceFile":"PZHGL\\InformationProject\\WorkHandoverService.cs"},{"SourceFile":"PZHGL\\ProjectData\\ProjectMapService.cs"},{"SourceFile":"PZHGL\\ProjectData\\ProjectPageDataService.cs"},{"SourceFile":"Service References\\CNCECHSSEService\\Reference.cs"},{"SourceFile":"Service References\\MCSService\\Reference.cs"},{"SourceFile":"SHIYE\\InformationProject_SafetyBriefingService.cs"},{"SourceFile":"SortConditionHelper.cs"},{"SourceFile":"SQLHelper.cs"},{"SourceFile":"Common\\Const.cs"},{"SourceFile":"ErrLogInfo.cs"},{"SourceFile":"FriendlyException.cs"},{"SourceFile":"Common\\Funs.cs"},{"SourceFile":"MethodRefelect.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SessionName.cs"},{"SourceFile":"SoftRegeditService.cs"},{"SourceFile":"LoginService.cs"},{"SourceFile":"SysManage\\ButtonPowerService.cs"},{"SourceFile":"SysManage\\ButtonToMenuService.cs"},{"SourceFile":"SysManage\\DepartService.cs"},{"SourceFile":"SysManage\\LogService.cs"},{"SourceFile":"SysManage\\MenuFlowOperateService.cs"},{"SourceFile":"SysManage\\RoleItemService.cs"},{"SourceFile":"SysManage\\RolePowerService.cs"},{"SourceFile":"SysManage\\RoleService.cs"},{"SourceFile":"SysManage\\SysConstSetService.cs"},{"SourceFile":"SysManage\\SysHttplogService.cs"},{"SourceFile":"SysManage\\SysMenuService.cs"},{"SourceFile":"SysManage\\UnitService.cs"},{"SourceFile":"SysManage\\UserService.cs"},{"SourceFile":"PersonManage\\Test\\ServerTestPlanService.cs"},{"SourceFile":"PersonManage\\Test\\ServerTestPlanTrainingService.cs"},{"SourceFile":"PersonManage\\Test\\ServerTestRecordService.cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\DataForJTApiService.cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\InterFaceLogService .cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\InterFaceSetService .cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\InterFaceTaskService .cs"},{"SourceFile":"TaskScheduling\\TimerTask\\CustomJobListener.cs"},{"SourceFile":"TaskScheduling\\TimerTask\\TaskJob.cs"},{"SourceFile":"TaskScheduling\\TimerTask\\TimerTaskBase.cs"},{"SourceFile":"TestRun\\BeforeTestRun\\BeforeTestRunService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsBuyItemService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsBuyService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsModelService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsPlanService.cs"},{"SourceFile":"TestRun\\DriverGoods\\MaterialTraceService.cs"},{"SourceFile":"TestRun\\DriverHse\\HseHazardService.cs"},{"SourceFile":"TestRun\\DriverHse\\HseLicenseService.cs"},{"SourceFile":"TestRun\\DriverHse\\HseMeasureService.cs"},{"SourceFile":"TestRun\\DriverHse\\RoadMapService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverConStudyService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverDataService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverDataTypeService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverPersonPlanService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverPlanService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDutyItemService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDutyService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareSchemePlanItemService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareSchemePlanService.cs"},{"SourceFile":"TestRun\\DriverProgressService.cs"},{"SourceFile":"TestRun\\DriverReport\\DriverReportService.cs"},{"SourceFile":"TestRun\\DriverReport\\TestRun_MonthReportItem2Service.cs"},{"SourceFile":"TestRun\\DriverReport\\TestRun_MonthReportItemService.cs"},{"SourceFile":"TestRun\\DriverReport\\TestRun_MonthReportService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunApproveService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunContactService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunPlanService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunService.cs"},{"SourceFile":"TestRun\\DriverSchemeService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubContactService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubContractorsService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubPlanService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubService.cs"},{"SourceFile":"TestRun\\DriverSummary\\DriverSummaryService.cs"},{"SourceFile":"TestRun\\FeedingTestRunService.cs"},{"SourceFile":"TestRun\\Meeting\\MeetingItemService.cs"},{"SourceFile":"TestRun\\Meeting\\MeetingMinutesService.cs"},{"SourceFile":"TestRun\\Meeting\\MeetingService.cs"},{"SourceFile":"TestRun\\PersonTrain\\DriverPrepareTrainPlanService.cs"},{"SourceFile":"TestRun\\PersonTrain\\PersonTrainPlanService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainContactService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainContentService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainContractService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainRecordsService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\AnalySampService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunOthersCheckService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunPumpCheckService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunRecordService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunReportService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunOthersCheckService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunPumpCheckService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunRecordService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunReportService.cs"},{"SourceFile":"TestRun\\TestRunConstructSolutionApproveService.cs"},{"SourceFile":"TestRun\\TestRunConstructSolutionService.cs"},{"SourceFile":"TestRun\\TestRunService.cs"},{"SourceFile":"BoSheng\\BOSHENGMonitorService.cs"},{"SourceFile":"Transfer\\PipingService.cs"},{"SourceFile":"Transfer\\ProjectSetupService.cs"},{"SourceFile":"Transfer\\RotatingEquipmentService.cs"},{"SourceFile":"Transfer\\StaticEquipmentService.cs"},{"SourceFile":"WebService\\MCSWebService.cs"},{"SourceFile":"WebService\\CNCECHSSEWebService.cs"},{"SourceFile":"WebService\\CNCECHSSEMonitorService.cs"},{"SourceFile":"ZHGL\\DataStatistics\\DataStatisticsService.cs"},{"SourceFile":"ZHGL\\DataSync\\CQMSDataService.cs"},{"SourceFile":"ZHGL\\DataSync\\Hazard_RealTimeDeviceService.cs"},{"SourceFile":"ZHGL\\DataSync\\HJGLData_DefectService.cs"},{"SourceFile":"ZHGL\\DataSync\\HJGLData_HJGLService.cs"},{"SourceFile":"ZHGL\\DataSync\\HSSEData_HiddenDangerDetailService.cs"},{"SourceFile":"ZHGL\\DataSync\\HSSEData_HSSEService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_CQMSDataService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HJGLData_DefectService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HJGLData_HJGLService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HSSEData_HiddenDangerDetailService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HSSEData_HSSEService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_SYHSEData_SYHSEService.cs"},{"SourceFile":"ZHGL\\DataSync\\ServerService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_DataService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_HiddenDangerCheckService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_RiskControlService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_SYHSEService.cs"},{"SourceFile":"ZHGL\\Emergency\\UnitDrillRecordListService.cs"},{"SourceFile":"ZHGL\\Emergency\\UnitEmergencyListService.cs"},{"SourceFile":"ZHGL\\Environmental\\ArchitectureReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ArchitectureReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ChemicalReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ChemicalReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\EnergyreportItemService .cs"},{"SourceFile":"ZHGL\\Environmental\\EnergyReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectArchitectureReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectArchitectureReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectChemicalReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectChemicalReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectEnergyreportItemService .cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectEnergyReportService.cs"},{"SourceFile":"ZHGL\\HSSESystem\\HSSEManageItemService.cs"},{"SourceFile":"ZHGL\\HSSESystem\\HSSEManageService.cs"},{"SourceFile":"ZHGL\\HSSESystem\\HSSEOrganizeService.cs"},{"SourceFile":"ZHGL\\Information\\AccidentCauseReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\AccidentCauseReportService.cs"},{"SourceFile":"ZHGL\\Information\\EPSummaryReportService.cs"},{"SourceFile":"ZHGL\\Information\\QualityWorkSummaryReportService.cs"},{"SourceFile":"ZHGL\\Information\\QuarterlyProjectQualityService.cs"},{"SourceFile":"ZHGL\\Information\\SafetyBriefingService.cs"},{"SourceFile":"ZHGL\\Information\\UrgeReportService.cs"},{"SourceFile":"ZHGL\\Information\\AnalyseResourceService.cs"},{"SourceFile":"ZHGL\\Information\\DrillConductedQuarterlyReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\DrillConductedQuarterlyReportService.cs"},{"SourceFile":"ZHGL\\Information\\DrillPlanHalfYearReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\DrillPlanHalfYearReportService.cs"},{"SourceFile":"ZHGL\\Information\\MillionsMonthlyReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\MillionsMonthlyReportService.cs"},{"SourceFile":"ZHGL\\Information\\SafetyQuarterlyReportService.cs"},{"SourceFile":"ZHGL\\Information\\WorkSummaryReportService.cs"},{"SourceFile":"ZHGL\\InspectionSummary\\InspectionSummaryService.cs"},{"SourceFile":"ZHGL\\Meeting\\CompanySafetyMeetingService.cs"},{"SourceFile":"ZHGL\\Meeting\\CompanySpecialMeetingService.cs"},{"SourceFile":"ZHGL\\Person\\CompanyBranchPersonService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\AccidentAnalysisItemService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\AccidentAnalysisService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\AccidentStatisticsService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\ProjectAccidentReportService.cs"},{"SourceFile":"ZHGL\\RealName\\BasicDataService.cs"},{"SourceFile":"ZHGL\\RealName\\RealName_ProjectService.cs"},{"SourceFile":"ZHGL\\RealName\\OnPostService.cs"},{"SourceFile":"ZHGL\\RealName\\LeavePostService.cs"},{"SourceFile":"ZHGL\\RealName\\CityService.cs"},{"SourceFile":"ZHGL\\RealName\\CountryService.cs"},{"SourceFile":"ZHGL\\RealName\\RealNameMonitorService.cs"},{"SourceFile":"ZHGL\\RealName\\SynchroSetService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\CheckRectifyItemService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\CheckRectifyService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\SubUnitReportItemService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\SubUnitReportService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\UpCheckReportService.cs"},{"SourceFile":"ZHGL\\Supervise\\SubUnitCheckRectifyItemService.cs"},{"SourceFile":"ZHGL\\Supervise\\SubUnitCheckRectifyService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckRectifyItemService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckRectifyService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckReportItemService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckReportService.cs"},{"SourceFile":"ZHGL\\TestRunPerformance\\TestRunMonthSummaryReportService.cs"},{"SourceFile":"ZHGL\\TestRunPerformance\\TestRunPerformanceMonthReportService.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\apache.nms.activemq\\1.8.0\\lib\\net40\\Apache.NMS.ActiveMQ.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\apache.nms\\1.8.0\\lib\\net40\\Apache.NMS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\FineUIPro\\Reference BLL\\Aspose.Words.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\portable.bouncycastle\\1.8.9\\lib\\net40\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\emitmapper\\1.0.0\\lib\\EmitMapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\FineUIPro\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\sharpziplib\\1.3.2\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\2.1.1\\lib\\netstandard2.0\\Microsoft.Extensions.Logging.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\BLL\\bin\\Debug\\Microsoft.QualityTools.Testing.Fakes.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\Microsoft.SQLServer.ManagedDTS\\v4.0_15.0.0.0__89845dcd8080cc91\\Microsoft.SQLServer.ManagedDTS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\newtonsoft.json\\12.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\npoi\\2.5.5\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\npoi\\2.5.5\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\npoi\\2.5.5\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\npoi\\2.5.5\\lib\\net45\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\quartz\\3.5.0\\lib\\net472\\Quartz.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\restsharp\\106.15.0\\lib\\net452\\RestSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.buffers\\4.5.1\\ref\\net45\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\lib\\net461\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.OracleClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\lib\\net46\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.DirectoryServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.memory\\4.5.4\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.numerics.vectors\\4.5.0\\ref\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.3\\ref\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Remoting.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.security.accesscontrol\\4.7.0\\ref\\net461\\System.Security.AccessControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.security.permissions\\4.7.0\\ref\\net461\\System.Security.Permissions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\姹潚\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\ref\\net461\\System.Security.Principal.Windows.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ServiceProcess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\FineUIPro\\Reference BLL\\ThoughtWorks.QRCode.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\BLL\\bin\\Debug\\BLL.dll","OutputItemRelativePath":"BLL.dll"},{"OutputItemFullPath":"C:\\璇烘瘮杈綷\浜旂幆椤圭洰\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\BLL\\bin\\Debug\\BLL.pdb","OutputItemRelativePath":"BLL.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\BLL","ProjectFileName":"BLL.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AnBang\\AnBangService.cs"},{"SourceFile":"API\\APIBaseInfoService.cs"},{"SourceFile":"API\\APICommonService.cs"},{"SourceFile":"API\\APIDoorServerService.cs"},{"SourceFile":"API\\APIGetHttpService.cs"},{"SourceFile":"API\\APIIDCardInfoService.cs"},{"SourceFile":"API\\APIPersonService.cs"},{"SourceFile":"API\\APIProjectService.cs"},{"SourceFile":"API\\APIUnitService.cs"},{"SourceFile":"API\\APIUpLoadFileService.cs"},{"SourceFile":"API\\APIUserService.cs"},{"SourceFile":"API\\CQMS\\ApiInspectionManagementService.cs"},{"SourceFile":"API\\CQMS\\BreakdownProjectService.cs"},{"SourceFile":"API\\CQMS\\QualityAssuranceService.cs"},{"SourceFile":"API\\HJGL\\APIGetHJDataService.cs"},{"SourceFile":"API\\HJGL\\APIHotProcessHardService.cs"},{"SourceFile":"API\\HJGL\\APINDETrustService.cs"},{"SourceFile":"API\\HJGL\\APIPipeJointService.cs"},{"SourceFile":"API\\HJGL\\APIPreWeldingDailyService.cs"},{"SourceFile":"API\\HJGL\\APIReportQueryService.cs"},{"SourceFile":"API\\HJGL\\APITestPackageService.cs"},{"SourceFile":"API\\HSSE\\APIGeneralEquipmentQualityService.cs"},{"SourceFile":"API\\HSSE\\APIPageDataService.cs"},{"SourceFile":"API\\HSSE\\APIChartAnalysisService.cs"},{"SourceFile":"API\\HSSE\\APICheckSpecialService.cs"},{"SourceFile":"API\\HSSE\\APIConstructSolutionService.cs"},{"SourceFile":"API\\HSSE\\APIEmergencyService.cs"},{"SourceFile":"API\\HSSE\\APIEquipmentQualityService.cs"},{"SourceFile":"API\\HSSE\\APIHazardListService.cs"},{"SourceFile":"API\\HSSE\\APIHazardRegisterService.cs"},{"SourceFile":"API\\HSSE\\APIHSEDiaryService.cs"},{"SourceFile":"API\\HSSE\\APIIncentiveNoticeService.cs"},{"SourceFile":"API\\HSSE\\APILicenseDataService.cs"},{"SourceFile":"API\\HSSE\\APILicenseFlowOperateService.cs"},{"SourceFile":"API\\HSSE\\APILicenseItemService.cs"},{"SourceFile":"API\\HSSE\\APIMeetingService.cs"},{"SourceFile":"API\\HSSE\\APIPauseNoticeService.cs"},{"SourceFile":"API\\HSSE\\APIPersonQualityService.cs"},{"SourceFile":"API\\HSSE\\APIPunishNoticeService.cs"},{"SourceFile":"API\\HSSE\\APIReceiveFileManagerService.cs"},{"SourceFile":"API\\HSSE\\APIRectifyNoticesService.cs"},{"SourceFile":"API\\HSSE\\APIResourcesService.cs"},{"SourceFile":"API\\HSSE\\APISeDinMonthReportService.cs"},{"SourceFile":"API\\HSSE\\APIServerTestPlanService.cs"},{"SourceFile":"API\\HSSE\\APIServerTestRecordService.cs"},{"SourceFile":"API\\HSSE\\APITestPlanService.cs"},{"SourceFile":"API\\HSSE\\APITestRecordService.cs"},{"SourceFile":"API\\HSSE\\APITrainingPlanService.cs"},{"SourceFile":"API\\HSSE\\APITrainingTaskService.cs"},{"SourceFile":"API\\HSSE\\APITrainRecordService.cs"},{"SourceFile":"BaseInfo\\AccidentTypeService.cs"},{"SourceFile":"BaseInfo\\BaseFactoryService.cs"},{"SourceFile":"BaseInfo\\CertificateService.cs"},{"SourceFile":"BaseInfo\\CNProfessionalService.cs"},{"SourceFile":"BaseInfo\\CostTypeService.cs"},{"SourceFile":"BaseInfo\\DesignProfessionalService.cs"},{"SourceFile":"BaseInfo\\DocTypeService.cs"},{"SourceFile":"BaseInfo\\EmergencyTypeService.cs"},{"SourceFile":"BaseInfo\\GoodsCategoryService.cs"},{"SourceFile":"BaseInfo\\HSSEStandardListTypeService.cs"},{"SourceFile":"BaseInfo\\HSSE_Hazard_HazardRegisterTypesService.cs"},{"SourceFile":"BaseInfo\\InspectionAreaService.cs"},{"SourceFile":"BaseInfo\\LawsRegulationsTypeService.cs"},{"SourceFile":"BaseInfo\\LicenseTypeService.cs"},{"SourceFile":"BaseInfo\\ManageRuleTypeService.cs"},{"SourceFile":"BaseInfo\\PersonManageService.cs"},{"SourceFile":"BaseInfo\\PictureTypeService.cs"},{"SourceFile":"BaseInfo\\PositionService.cs"},{"SourceFile":"BaseInfo\\PostService.cs"},{"SourceFile":"BaseInfo\\PostTitleService.cs"},{"SourceFile":"BaseInfo\\PracticeCertificateService.cs"},{"SourceFile":"BaseInfo\\ProjectTypeService.cs"},{"SourceFile":"BaseInfo\\QualityQuestionTypeService.cs"},{"SourceFile":"BaseInfo\\QuestionTypeService.cs"},{"SourceFile":"BaseInfo\\RectificationMeasureService.cs"},{"SourceFile":"BaseInfo\\RiskLevelService.cs"},{"SourceFile":"BaseInfo\\RulesRegulationsTypeService.cs"},{"SourceFile":"BaseInfo\\SafetyMeasuresService.cs"},{"SourceFile":"BaseInfo\\SolutionTempleteTypeService.cs"},{"SourceFile":"BaseInfo\\SpecialEquipmentService.cs"},{"SourceFile":"BaseInfo\\SpecialSchemeTypeService.cs"},{"SourceFile":"BaseInfo\\SteelService.cs"},{"SourceFile":"BaseInfo\\TestRunLicenseTypeService.cs"},{"SourceFile":"BaseInfo\\TestRunPerformanceStandardService.cs"},{"SourceFile":"BaseInfo\\TrainLevelService.cs"},{"SourceFile":"BaseInfo\\TrainTypeService.cs"},{"SourceFile":"BaseInfo\\TransferMajorService.cs"},{"SourceFile":"BaseInfo\\UnitTypeService.cs"},{"SourceFile":"BaseInfo\\WorkPostService.cs"},{"SourceFile":"BaseInfo\\WorkStageService.cs"},{"SourceFile":"BoSheng\\BOSHENGService.cs"},{"SourceFile":"Common\\AttachFileService.cs"},{"SourceFile":"Common\\CodeRecordsService.cs"},{"SourceFile":"Common\\CommonService.cs"},{"SourceFile":"Common\\CreateQRCodeService.cs"},{"SourceFile":"Common\\IDCardValid.cs"},{"SourceFile":"Common\\NPOIExcel.cs"},{"SourceFile":"Common\\NPOIHelper.cs"},{"SourceFile":"Common\\PrinterDocService.cs"},{"SourceFile":"Common\\ProjectDataFlowSetService.cs"},{"SourceFile":"Common\\Sys_DataTempService.cs"},{"SourceFile":"Common\\UploadFileService.cs"},{"SourceFile":"Common\\UpLoadImageService.cs"},{"SourceFile":"Common\\UserShowColumnsService.cs"},{"SourceFile":"Common\\WeatherService.cs"},{"SourceFile":"Common\\WeekDayService.cs"},{"SourceFile":"CostGoods\\MeasuresPlanService.cs"},{"SourceFile":"CostGoods\\PayRegistrationService.cs"},{"SourceFile":"CostGoods\\SubPayRegistrationService.cs"},{"SourceFile":"CQMS\\Comprehensive\\ConTechnologyDisclosureService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataDistributionApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataDistributionService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingDocApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingDocService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DataReceivingService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignChangeOrderApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignChangeOrderService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDetailsApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDetailsService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDrawingsApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\DesignDrawingsService.cs"},{"SourceFile":"CQMS\\Comprehensive\\GeneralPlanApprovalItemService.cs"},{"SourceFile":"CQMS\\Comprehensive\\GeneralPlanApprovalService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionEquipmentApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionEquipmentService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionMachineApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionMachineService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionPersonApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionPersonService.cs"},{"SourceFile":"CQMS\\Comprehensive\\InspectionTestPlanService.cs"},{"SourceFile":"CQMS\\Comprehensive\\MajorPlanApprovalItemService.cs"},{"SourceFile":"CQMS\\Comprehensive\\MajorPlanApprovalService.cs"},{"SourceFile":"CQMS\\Comprehensive\\NCRManagementApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\NCRManagementService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PersonSteelService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PersonWeldMethodService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PressurePipeApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\PressurePipeService.cs"},{"SourceFile":"CQMS\\Comprehensive\\QualityAccidentApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\QualityAccidentService.cs"},{"SourceFile":"CQMS\\Comprehensive\\ReviewDrawingsService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SiteVisaManagementApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SiteVisaManagementService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SpecialEquipmentApproveService.cs"},{"SourceFile":"CQMS\\Comprehensive\\SpecialEquipmentService.cs"},{"SourceFile":"CQMS\\Check\\CheckControlApproveService.cs"},{"SourceFile":"CQMS\\Check\\CheckControlService.cs"},{"SourceFile":"CQMS\\Check\\CheckEquipmentApproveService.cs"},{"SourceFile":"CQMS\\Check\\CheckEquipmentService.cs"},{"SourceFile":"CQMS\\Check\\CheckMonthService.cs"},{"SourceFile":"CQMS\\Check\\DesignApproveService.cs"},{"SourceFile":"CQMS\\Check\\DesignService.cs"},{"SourceFile":"CQMS\\Check\\DrawApproveService.cs"},{"SourceFile":"CQMS\\Check\\DrawService.cs"},{"SourceFile":"CQMS\\Check\\FileCabinetService.cs"},{"SourceFile":"CQMS\\Check\\JointCheckApproveService.cs"},{"SourceFile":"CQMS\\Check\\JointCheckDetailService.cs"},{"SourceFile":"CQMS\\Check\\JointCheckService.cs"},{"SourceFile":"CQMS\\Check\\MonthSpotCheckDetailService.cs"},{"SourceFile":"CQMS\\Check\\SpecialEquipmentDetailService.cs"},{"SourceFile":"CQMS\\Check\\SpotCheckApproveService.cs"},{"SourceFile":"CQMS\\Check\\SpotCheckDetailService.cs"},{"SourceFile":"CQMS\\Check\\SpotCheckService.cs"},{"SourceFile":"CQMS\\Check\\TechnicalContactListApproveService.cs"},{"SourceFile":"CQMS\\Check\\TechnicalContactListService.cs"},{"SourceFile":"CQMS\\Comprehensive\\TrainingRecordsService.cs"},{"SourceFile":"CQMS\\DataBase\\ConstructionStandardListProjectService.cs"},{"SourceFile":"CQMS\\DataBase\\ConstructionStandardListService.cs"},{"SourceFile":"CQMS\\DataBase\\DataTypeProjectService.cs"},{"SourceFile":"CQMS\\DataBase\\DataTypeService.cs"},{"SourceFile":"CQMS\\DataBase\\FileService.cs"},{"SourceFile":"CQMS\\DataBase\\InspectionLotService.cs"},{"SourceFile":"CQMS\\DataBase\\PhotoService.cs"},{"SourceFile":"CQMS\\DataBase\\StartWorkReportService.cs"},{"SourceFile":"CQMS\\Foreign\\ControlPointCheckService.cs"},{"SourceFile":"CQMS\\Foreign\\ITPListProjectService.cs"},{"SourceFile":"CQMS\\Foreign\\ITPListService.cs"},{"SourceFile":"CQMS\\ManageReport\\ComprehensiveService.cs"},{"SourceFile":"CQMS\\ManageReport\\ConstructionProblemsService.cs"},{"SourceFile":"CQMS\\ManageReport\\NextQualityControlService.cs"},{"SourceFile":"CQMS\\ManageReport\\ProjectQualityWorkSummaryReportService.cs"},{"SourceFile":"CQMS\\ManageReport\\ProjectQuarterlyProjectQualityService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\ConstructionPlanService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\CqmsTargetService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\Report_CQMS_MonthReportItemService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\TextBoxContentService.cs"},{"SourceFile":"CQMS\\ManageReport\\ReportNew\\WeekAndMonthReportNewService.cs"},{"SourceFile":"CQMS\\ManageReport\\RowMaterialProblemService.cs"},{"SourceFile":"CQMS\\ManageReport\\ThisWeekOrMonthContentService.cs"},{"SourceFile":"CQMS\\ManageReport\\WeekAndMonthReportService.cs"},{"SourceFile":"CQMS\\Performance\\PerformanceService.cs"},{"SourceFile":"CQMS\\ProcessControl\\HotProessManageService.cs"},{"SourceFile":"CQMS\\ProcessControl\\InspectionManagementDetailService.cs"},{"SourceFile":"CQMS\\ProcessControl\\InspectionManagementService.cs"},{"SourceFile":"CQMS\\ProcessControl\\NondestructiveTestNewService.cs"},{"SourceFile":"CQMS\\ProcessControl\\NondestructiveTestService.cs"},{"SourceFile":"CQMS\\ProcessControl\\TestPackageManagementService.cs"},{"SourceFile":"CQMS\\QualityPlanning\\ConExperienceSummaryService.cs"},{"SourceFile":"CQMS\\QualityPlanning\\ProjectQualityPlanService.cs"},{"SourceFile":"CQMS\\QualityPlanning\\QualityManagementSysService.cs"},{"SourceFile":"CQMS\\Solution\\CQMSConstructSolutionApproveService.cs"},{"SourceFile":"CQMS\\Solution\\CQMSConstructSolutionService.cs"},{"SourceFile":"CQMS\\Unqualified\\WorkContactApproveService.cs"},{"SourceFile":"CQMS\\Unqualified\\WorkContactService.cs"},{"SourceFile":"CQMS\\WBS\\BreakdownProjectService.cs"},{"SourceFile":"CQMS\\WBS\\BreakdownService.cs"},{"SourceFile":"CQMS\\WBS\\ControlItemAndCycleService.cs"},{"SourceFile":"CQMS\\WBS\\ControlItemInitService.cs"},{"SourceFile":"CQMS\\WBS\\ControlItemProjectService.cs"},{"SourceFile":"CQMS\\WBS\\DivisionDivideService.cs"},{"SourceFile":"CQMS\\WBS\\DivisionProjectService.cs"},{"SourceFile":"CQMS\\WBS\\DivisionService.cs"},{"SourceFile":"CQMS\\WBS\\ForeignBreakdownProjectService.cs"},{"SourceFile":"CQMS\\WBS\\ForeignBreakdownService.cs"},{"SourceFile":"CQMS\\WBS\\ForeignCNProfessionalService.cs"},{"SourceFile":"CQMS\\WBS\\SubProjectsService.cs"},{"SourceFile":"CQMS\\WBS\\WBSsearchService.cs"},{"SourceFile":"CQMS\\WBS\\WorkPackageInitService.cs"},{"SourceFile":"CQMS\\WBS\\WorkPackageProjectService.cs"},{"SourceFile":"CQMS\\WBS\\WorkPackageService.cs"},{"SourceFile":"DigData\\HSEDataCollectService.cs"},{"SourceFile":"DocManage\\DocManageApproveService.cs"},{"SourceFile":"DocManage\\DocManageService.cs"},{"SourceFile":"DoorServer\\InOutService.cs"},{"SourceFile":"DoorServer\\DoorServerService.cs"},{"SourceFile":"DropListService.cs"},{"SourceFile":"GlobalSuppressions.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_ComponentsService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_ConsumablesService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DefectService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DetectionRateService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DetectionTypeService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_DNCompareService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_GrooveTypeService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_MaterialService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_MediumService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PipingClassService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PressurePipingClassService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PressureService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_PurgeMethodService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_TestMediumService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_WeldingLocationServie.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_WeldingMethodService.cs"},{"SourceFile":"HJGL\\BaseInfo\\Base_WeldTypeService.cs"},{"SourceFile":"HJGL\\FL\\FLDataService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\Hard_ReportService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\Hard_TrustItemService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\Hard_TrustService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\HotProessReportService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\HotProessTrustItemService.cs"},{"SourceFile":"HJGL\\HotProcessHard\\HotProess_TrustService.cs"},{"SourceFile":"HJGL\\LeakVacuum\\LeakVacuumAuditService.cs"},{"SourceFile":"HJGL\\LeakVacuum\\LeakVacuumEditService.cs"},{"SourceFile":"HJGL\\LeakVacuum\\LV_ItemEndCheckService.cs"},{"SourceFile":"HJGL\\NDT\\Batch_NDEItemService.cs"},{"SourceFile":"HJGL\\NDT\\Batch_NDEService.cs"},{"SourceFile":"HJGL\\PersonManage\\CheckerService.cs"},{"SourceFile":"HJGL\\PersonManage\\WelderQualifyService.cs"},{"SourceFile":"HJGL\\PersonManage\\WelderService.cs"},{"SourceFile":"HJGL\\PointTrust\\Batch_BatchTrustItemService.cs"},{"SourceFile":"HJGL\\PointTrust\\Batch_BatchTrustService.cs"},{"SourceFile":"HJGL\\PointTrust\\PointBatchDetailService.cs"},{"SourceFile":"HJGL\\PointTrust\\PointBatchService.cs"},{"SourceFile":"HJGL\\PurgingCleaning\\PC_ItemEndCheckService.cs"},{"SourceFile":"HJGL\\PurgingCleaning\\PurgingCleaningAuditService.cs"},{"SourceFile":"HJGL\\PurgingCleaning\\PurgingCleaningEditService.cs"},{"SourceFile":"HJGL\\RepairAndExpand\\RepairRecordService.cs"},{"SourceFile":"HJGL\\TestPackage\\AItemEndCheckService.cs"},{"SourceFile":"HJGL\\TestPackage\\BItemEndCheckService.cs"},{"SourceFile":"HJGL\\TestPackage\\TestPackageApproveService.cs"},{"SourceFile":"HJGL\\TestPackage\\TestPackageAuditService.cs"},{"SourceFile":"HJGL\\TestPackage\\TestPackageEditService.cs"},{"SourceFile":"HJGL\\WeldingManage\\PipelineService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldingDailyService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldJointService.cs"},{"SourceFile":"HJGL\\WeldingManage\\WeldTaskService.cs"},{"SourceFile":"HJGL\\WPQ\\WPQListService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentHandleService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentPersonRecordService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentReportOtherItemService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentReportOtherService.cs"},{"SourceFile":"HSSE\\Accident\\AccidentReportService.cs"},{"SourceFile":"HSSE\\Accident\\NoFourLetoffService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlanListService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlanSummaryService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_CompanyManagerRuleService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_ManagerRuleService.cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_SubManagerRuleService .cs"},{"SourceFile":"HSSE\\ActionPlan\\ActionPlan_ProjectManagerRuleService.cs"},{"SourceFile":"HSSE\\Administrative\\CarManagerService.cs"},{"SourceFile":"HSSE\\Administrative\\DriverManagerService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckColligationDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckColligationService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckDayDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckDayService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckHolidayDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckHolidayService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckSpecialDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckSpecialService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckWorkDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_CheckWorkService.cs"},{"SourceFile":"HSSE\\Check\\Check_PauseNoticeService.cs"},{"SourceFile":"HSSE\\Check\\Check_ProjectCheckItemDetailService.cs"},{"SourceFile":"HSSE\\Check\\Check_ProjectCheckItemSetService.cs"},{"SourceFile":"HSSE\\Check\\Check_ProjectLeaderCheckService.cs"},{"SourceFile":"HSSE\\Check\\ContactListService.cs"},{"SourceFile":"HSSE\\Check\\HSECertificateService.cs"},{"SourceFile":"HSSE\\Check\\IncentiveNoticeService.cs"},{"SourceFile":"HSSE\\Check\\PunishNoticeService.cs"},{"SourceFile":"HSSE\\Check\\RectifyNoticesService.cs"},{"SourceFile":"HSSE\\Check\\SupervisionNoticeService.cs"},{"SourceFile":"HSSE\\Check\\ViolationPersonService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostManageItemService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostManageService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostSmallDetailItemService.cs"},{"SourceFile":"HSSE\\CostGoods\\CostSmallDetailService.cs"},{"SourceFile":"HSSE\\CostGoods\\FeeRegistration.cs"},{"SourceFile":"HSSE\\CostGoods\\GoodsManageService.cs"},{"SourceFile":"HSSE\\CostGoods\\HseExpenseService.cs"},{"SourceFile":"HSSE\\EduTrain\\AccidentCaseItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\AccidentCaseService.cs"},{"SourceFile":"HSSE\\EduTrain\\CompanyTrainingItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\CompanyTrainingService.cs"},{"SourceFile":"HSSE\\EduTrain\\EduTrain_TrainRecordDetailService.cs"},{"SourceFile":"HSSE\\EduTrain\\EduTrain_TrainRecordService.cs"},{"SourceFile":"HSSE\\EduTrain\\EduTrain_TrainTestService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestPlanService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestRecordItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestRecordService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestTrainingItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TestTrainingService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingPlanItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingPlanService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainingTaskService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainTestDBItemService.cs"},{"SourceFile":"HSSE\\EduTrain\\TrainTestDBService.cs"},{"SourceFile":"HSSE\\Emergency\\DrillRecordListService.cs"},{"SourceFile":"HSSE\\Emergency\\EmergencyListService.cs"},{"SourceFile":"HSSE\\Emergency\\EmergencySupplyService.cs"},{"SourceFile":"HSSE\\Emergency\\EmergencyTeamAndTrainService.cs"},{"SourceFile":"HSSE\\Environmental\\EIAReportService.cs"},{"SourceFile":"HSSE\\Environmental\\EnvironmentalEmergencyPlanService.cs"},{"SourceFile":"HSSE\\Environmental\\EnvironmentalMonitoringService.cs"},{"SourceFile":"HSSE\\Environmental\\UnexpectedEnvironmentalService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\FinalFileListService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\HSEFinalFileListService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\OtherDocumentListService.cs"},{"SourceFile":"HSSE\\FinalFileManage\\OwnerFinalFileService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_EnvironmentalRiskItemService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_EnvironmentalRiskListService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_HazardListService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_HazardSelectedItemService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_OtherHazardService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_PatrolPlanService.cs"},{"SourceFile":"HSSE\\Hazard\\Hazard_RoutingInspectionService.cs"},{"SourceFile":"HSSE\\Hazard\\RiskEvaluationRecordService.cs"},{"SourceFile":"HSSE\\HiddenInspection\\HSSE_Hazard_HazardRegisterService.cs"},{"SourceFile":"HSSE\\HSSESystem\\HSSEMainDutyService.cs"},{"SourceFile":"HSSE\\HSSESystem\\ServerSafetyInstitutionService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentInItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentInService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentOutItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentOutService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentQualityInItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\EquipmentQualityInService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentInItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentInService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentOutItemService.cs"},{"SourceFile":"HSSE\\InApproveManager\\GeneralEquipmentOutService.cs"},{"SourceFile":"HSSE\\InformationProject\\ConstructionStandardIdentifyService.cs"},{"SourceFile":"HSSE\\InformationProject\\ConstructionStandardSelectedItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\FileCabinetAItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\FileCabinetAService.cs"},{"SourceFile":"HSSE\\InformationProject\\LawRegulationIdentifyService.cs"},{"SourceFile":"HSSE\\InformationProject\\LawRegulationSelectedItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectAccidentCauseReportItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectAccidentCauseReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillConductedQuarterlyReportItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillConductedQuarterlyReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillPlanHalfYearReportItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectDrillPlanHalfYearReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectEPSummaryReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectFolderItemService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectFolderService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectMillionsMonthlyReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectSafetyQuarterlyReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\ProjectWorkSummaryReportService.cs"},{"SourceFile":"HSSE\\InformationProject\\PromotionalActivitiesService.cs"},{"SourceFile":"HSSE\\Law\\HSSEStandardsListService.cs"},{"SourceFile":"HSSE\\Law\\ManageRuleService.cs"},{"SourceFile":"HSSE\\Law\\RulesRegulationsService.cs"},{"SourceFile":"HSSE\\License\\EquipmentSafetyListService.cs"},{"SourceFile":"HSSE\\License\\HSETechnicalService.cs"},{"SourceFile":"HSSE\\License\\LicenseManagerService.cs"},{"SourceFile":"HSSE\\License\\LicensePublicService.cs"},{"SourceFile":"HSSE\\License\\SecurityLicenseService.cs"},{"SourceFile":"HSSE\\Manager\\AccidentDetailSortBService.cs"},{"SourceFile":"HSSE\\Manager\\CompletionReportService.cs"},{"SourceFile":"HSSE\\Manager\\HSSELogMonthService.cs"},{"SourceFile":"HSSE\\Manager\\HSSELogService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\AccidentDesciptionCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\AccidentDesciptionItemCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\AccidentSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ActivitiesCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ActivityDesCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CheckCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CheckDetailSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CheckSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ComplianceObligationsCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\CostInvestmentPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\DrillSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\EmergencyExercisesCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\EmergencyPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\EmergencySortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\FileManageCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\FiveExpenseCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\HazardCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\HazardSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\HseCostCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\IncentiveSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\InjuryAccidentCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ManageDocPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\MeetingCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\MeetingSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\MonthReportCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\NoInjuryAccidentCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherActiveSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherManagementCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherWorkCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\OtherWorkPlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PerformanceIndicatorCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PersonSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PlanCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\PromotionalActiviteSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\ReviewRecordCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\RewardAndPunishSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\SubExpenseCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\TrainActivitySortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\TrainCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonthC\\TrainSortCService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerMonth_SeDinService.cs"},{"SourceFile":"HSSE\\Manager\\ManagerWeekService.cs"},{"SourceFile":"HSSE\\Manager\\MonthReportBService.cs"},{"SourceFile":"HSSE\\Manager\\MonthReportDService.cs"},{"SourceFile":"HSSE\\Manager\\MonthReportService.cs"},{"SourceFile":"HSSE\\Manager\\ReportRemindService.cs"},{"SourceFile":"HSSE\\Manager\\SafetyDataDService.cs"},{"SourceFile":"HSSE\\Manager\\SubManagerMonthService.cs"},{"SourceFile":"HSSE\\Manager\\SubManagerWeekService.cs"},{"SourceFile":"HSSE\\Meeting\\AttendMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\ClassMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\MonthMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\SafetyLeaderGroupMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\SpecialMeetingService.cs"},{"SourceFile":"HSSE\\Meeting\\WeekMeetingService.cs"},{"SourceFile":"HSSE\\CostGoods\\ExpenseDetailService.cs"},{"SourceFile":"HSSE\\CostGoods\\ExpenseService.cs"},{"SourceFile":"HSSE\\OccupationHealth\\HazardDetectionService.cs"},{"SourceFile":"HSSE\\OccupationHealth\\OccupationalDiseaseAccidentService.cs"},{"SourceFile":"HSSE\\OccupationHealth\\PhysicalExaminationService.cs"},{"SourceFile":"HSSE\\Perfomance\\PerfomanceRecordService.cs"},{"SourceFile":"HSSE\\Perfomance\\PersonPerfomanceService.cs"},{"SourceFile":"HSSE\\QualityAudit\\EquipmentPersonQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\EquipmentQualityAuditDetailService.cs"},{"SourceFile":"HSSE\\QualityAudit\\EquipmentQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\GeneralEquipmentQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\InUnitService.cs"},{"SourceFile":"HSSE\\QualityAudit\\ProjectRecordService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SafePersonQualityService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SafetyDataItemService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SubUnitQualityAuditDetailService.cs"},{"SourceFile":"HSSE\\QualityAudit\\SubUnitQualityService.cs"},{"SourceFile":"HSSE\\Resources\\SignManageService.cs"},{"SourceFile":"HSSE\\SafetyData\\SafetyDataPlanService.cs"},{"SourceFile":"HSSE\\SafetyData\\SafetyDataService.cs"},{"SourceFile":"HSSE\\SecuritySystem\\SafetyOrganizationService.cs"},{"SourceFile":"HSSE\\Law\\LawRegulationListService.cs"},{"SourceFile":"HSSE\\SitePerson\\PersonInOutService.cs"},{"SourceFile":"HSSE\\QualityAudit\\PersonQualityService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_CheckingService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_DayReportDetailService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_DayReportService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_DayReportUnitDetailService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_MonthReportDetailService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_MonthReportService.cs"},{"SourceFile":"HSSE\\SitePerson\\SitePerson_MonthReportUnitDetailService.cs"},{"SourceFile":"HSSE\\Solution\\ConstructSolutionService.cs"},{"SourceFile":"HSSE\\Solution\\ExpertArgumentService.cs"},{"SourceFile":"HSSE\\Solution\\LargerHazardService.cs"},{"SourceFile":"HSSE\\Solution\\SolutionTemplateService.cs"},{"SourceFile":"HSSE\\Technique\\EmergencyService.cs"},{"SourceFile":"HSSE\\Technique\\HazardListService.cs"},{"SourceFile":"HSSE\\Technique\\HazardListTypeService.cs"},{"SourceFile":"HSSE\\Technique\\EnvironmentalService.cs"},{"SourceFile":"HSSE\\Technique\\RectifyItemService.cs"},{"SourceFile":"HSSE\\Technique\\RectifyService.cs"},{"SourceFile":"HSSE\\Technique\\SpecialSchemeService.cs"},{"SourceFile":"HSSE\\Technique\\Technique_CheckItemDetailService.cs"},{"SourceFile":"HSSE\\Technique\\Technique_CheckItemSetService.cs"},{"SourceFile":"JDGL\\Check\\ElectricalCompletionService.cs"},{"SourceFile":"JDGL\\Check\\EquipmentCompletionService.cs"},{"SourceFile":"JDGL\\Check\\LowTankCompletionService.cs"},{"SourceFile":"JDGL\\Check\\MeterCompletionService.cs"},{"SourceFile":"JDGL\\Check\\MonthPlanService.cs"},{"SourceFile":"JDGL\\Check\\PipelineCompletionService.cs"},{"SourceFile":"JDGL\\Check\\ProgressCompletionService.cs"},{"SourceFile":"JDGL\\Check\\QuantityCompletionService.cs"},{"SourceFile":"JDGL\\Check\\QuantityListService.cs"},{"SourceFile":"JDGL\\Check\\SteelStructureCompletionService.cs"},{"SourceFile":"JDGL\\Check\\UndergroundPipeCompletionService.cs"},{"SourceFile":"JDGL\\Check\\WeekPlanService.cs"},{"SourceFile":"JDGL\\WBSCompleteAndReal\\WBSReportService.cs"},{"SourceFile":"JDGL\\WBS\\CnProfessionInitService.cs"},{"SourceFile":"JDGL\\WBS\\CnProfessionService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlDetailHistoryService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlDetailService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlInitService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlParentDetailService.cs"},{"SourceFile":"JDGL\\WBS\\CostControlService.cs"},{"SourceFile":"JDGL\\WBS\\EquipmentMaterialBigTypeService.cs"},{"SourceFile":"JDGL\\WBS\\EquipmentMaterialTypeService.cs"},{"SourceFile":"JDGL\\WBS\\MilePostService.cs"},{"SourceFile":"JDGL\\WBS\\UnitProjectInitService.cs"},{"SourceFile":"JDGL\\WBS\\UnitProjectService.cs"},{"SourceFile":"JDGL\\WBS\\WbsDetailHistoryService.cs"},{"SourceFile":"JDGL\\WBS\\WbsDetailService.cs"},{"SourceFile":"JDGL\\WBS\\WBSRectificationMeasureSetService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetInitService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetMatchCostControlInitService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetMatchCostControlService.cs"},{"SourceFile":"JDGL\\WBS\\WbsSetService.cs"},{"SourceFile":"JDGL\\WBS\\WorkloadStatisticsService.cs"},{"SourceFile":"Notice\\NoticeService.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckNoticeService.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckReportService.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckTable1Service.cs"},{"SourceFile":"OfficeCheck\\Check\\CheckTeamService.cs"},{"SourceFile":"OfficeCheck\\Check\\ProjectSupervision_Check1Service.cs"},{"SourceFile":"OfficeCheck\\Check\\ProjectSupervision_RectifyItemService.cs"},{"SourceFile":"OfficeCheck\\Check\\ProjectSupervision_RectifyService.cs"},{"SourceFile":"OfficeCheck\\ProjectEvaluation\\ProjectEvaluationService.cs"},{"SourceFile":"OpenService\\FileInsertService.cs"},{"SourceFile":"OpenService\\FileStructService.cs"},{"SourceFile":"OpenService\\MonitorService.cs"},{"SourceFile":"DynamicTHeaderHepler.cs"},{"SourceFile":"OpenService\\GetDataService.cs"},{"SourceFile":"Opinion\\OpinionCollectionApproveService.cs"},{"SourceFile":"Opinion\\OpinionCollectionService.cs"},{"SourceFile":"Party\\BasicInformationDetailService.cs"},{"SourceFile":"Party\\BasicInformationService.cs"},{"SourceFile":"Party\\CommentPartyerService.cs"},{"SourceFile":"Party\\DoingThingsForMassesService.cs"},{"SourceFile":"Party\\EmployeeConversationRecordService.cs"},{"SourceFile":"Party\\FocusLearnService.cs"},{"SourceFile":"Party\\LastWorkSummaryService.cs"},{"SourceFile":"Party\\NewsPropagandaWorkService.cs"},{"SourceFile":"Party\\OrganizingLifeService.cs"},{"SourceFile":"Party\\PartyCommitteeService.cs"},{"SourceFile":"Party\\PartyCongressService.cs"},{"SourceFile":"Party\\PartyerService.cs"},{"SourceFile":"Party\\PartyHistoryStudyService.cs"},{"SourceFile":"Party\\PartyLectureService.cs"},{"SourceFile":"Party\\PartyMeetingService.cs"},{"SourceFile":"Party\\PartyMoneyUseService.cs"},{"SourceFile":"Party\\PartyPioneerDemonstrationService.cs"},{"SourceFile":"Party\\ThemePartyDayService.cs"},{"SourceFile":"Party\\TwoOneGoodSelectionService.cs"},{"SourceFile":"Party\\WorkPlanService.cs"},{"SourceFile":"Person\\Person_BusinessTripService.cs"},{"SourceFile":"Person\\Person_MeetingService.cs"},{"SourceFile":"Person\\PersonTotalService.cs"},{"SourceFile":"Person\\Person_DutyService.cs"},{"SourceFile":"Person\\Person_DutyTemplateService.cs"},{"SourceFile":"Person\\Person_PersonPlanService.cs"},{"SourceFile":"Person\\Person_QuarterCheckApproveService.cs"},{"SourceFile":"Person\\Person_QuarterCheckItemService.cs"},{"SourceFile":"Person\\Person_QuarterCheckService.cs"},{"SourceFile":"Person\\Person_ShuntApproveService.cs"},{"SourceFile":"Person\\Person_ShuntDetailService.cs"},{"SourceFile":"Person\\Person_ShuntService.cs"},{"SourceFile":"Person\\Person_TestRunMonthSummaryService.cs"},{"SourceFile":"Person\\Person_TestRunPerformanceService.cs"},{"SourceFile":"Person\\Person_TrainingPlanService.cs"},{"SourceFile":"ProjectData\\MainItemService.cs"},{"SourceFile":"ProjectData\\ProjectData_CodeTemplateRuleService.cs"},{"SourceFile":"ProjectData\\ProjectSateService.cs"},{"SourceFile":"ProjectData\\ProjectService.cs"},{"SourceFile":"ProjectData\\ProjectSetMapService.cs"},{"SourceFile":"ProjectData\\ProjectUnitService.cs"},{"SourceFile":"ProjectData\\ProjectUserService.cs"},{"SourceFile":"Common\\ChartControlService.cs"},{"SourceFile":"Common\\ConstValue.cs"},{"SourceFile":"Common\\UploadAttachmentService.cs"},{"SourceFile":"Common\\CreateMenuXML.cs"},{"SourceFile":"ProjectData\\Project_InstallationService.cs"},{"SourceFile":"ProjectData\\Project_SysSetService.cs"},{"SourceFile":"ProjectData\\TeamGroupService.cs"},{"SourceFile":"ProjectData\\UnitWorkService.cs"},{"SourceFile":"HSSE\\SitePerson\\PersonService.cs"},{"SourceFile":"PZHGL\\GJSX\\GJSXItemService.cs"},{"SourceFile":"PZHGL\\GJSX\\GJSXProcessService.cs"},{"SourceFile":"PZHGL\\GJSX\\GJSXService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionLogService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionPlanApproveService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionPlanService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionReportApproveService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ConstructionReportService.cs"},{"SourceFile":"PZHGL\\InformationProject\\PictureService.cs"},{"SourceFile":"PZHGL\\InformationProject\\ReceiveFileManagerService.cs"},{"SourceFile":"PZHGL\\InformationProject\\WorkHandoverApproveService.cs"},{"SourceFile":"PZHGL\\InformationProject\\WorkHandoverDetailService.cs"},{"SourceFile":"PZHGL\\InformationProject\\WorkHandoverService.cs"},{"SourceFile":"PZHGL\\ProjectData\\ProjectMapService.cs"},{"SourceFile":"PZHGL\\ProjectData\\ProjectPageDataService.cs"},{"SourceFile":"Service References\\CNCECHSSEService\\Reference.cs"},{"SourceFile":"Service References\\MCSService\\Reference.cs"},{"SourceFile":"SHIYE\\InformationProject_SafetyBriefingService.cs"},{"SourceFile":"SortConditionHelper.cs"},{"SourceFile":"SQLHelper.cs"},{"SourceFile":"Common\\Const.cs"},{"SourceFile":"ErrLogInfo.cs"},{"SourceFile":"FriendlyException.cs"},{"SourceFile":"Common\\Funs.cs"},{"SourceFile":"MethodRefelect.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SessionName.cs"},{"SourceFile":"SoftRegeditService.cs"},{"SourceFile":"LoginService.cs"},{"SourceFile":"SysManage\\ButtonPowerService.cs"},{"SourceFile":"SysManage\\ButtonToMenuService.cs"},{"SourceFile":"SysManage\\DepartService.cs"},{"SourceFile":"SysManage\\LogService.cs"},{"SourceFile":"SysManage\\MenuFlowOperateService.cs"},{"SourceFile":"SysManage\\RoleItemService.cs"},{"SourceFile":"SysManage\\RolePowerService.cs"},{"SourceFile":"SysManage\\RoleService.cs"},{"SourceFile":"SysManage\\SysConstSetService.cs"},{"SourceFile":"SysManage\\SysHttplogService.cs"},{"SourceFile":"SysManage\\SysMenuService.cs"},{"SourceFile":"SysManage\\UnitService.cs"},{"SourceFile":"SysManage\\UserService.cs"},{"SourceFile":"PersonManage\\Test\\ServerTestPlanService.cs"},{"SourceFile":"PersonManage\\Test\\ServerTestPlanTrainingService.cs"},{"SourceFile":"PersonManage\\Test\\ServerTestRecordService.cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\DataForJTApiService.cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\InterFaceLogService .cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\InterFaceSetService .cs"},{"SourceFile":"TaskScheduling\\InterFaceService\\InterFaceTaskService .cs"},{"SourceFile":"TaskScheduling\\TimerTask\\CustomJobListener.cs"},{"SourceFile":"TaskScheduling\\TimerTask\\TaskJob.cs"},{"SourceFile":"TaskScheduling\\TimerTask\\TimerTaskBase.cs"},{"SourceFile":"TestRun\\BeforeTestRun\\BeforeTestRunService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsBuyItemService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsBuyService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsModelService.cs"},{"SourceFile":"TestRun\\DriverGoods\\GoodsPlanService.cs"},{"SourceFile":"TestRun\\DriverGoods\\MaterialTraceService.cs"},{"SourceFile":"TestRun\\DriverHse\\HseHazardService.cs"},{"SourceFile":"TestRun\\DriverHse\\HseLicenseService.cs"},{"SourceFile":"TestRun\\DriverHse\\HseMeasureService.cs"},{"SourceFile":"TestRun\\DriverHse\\RoadMapService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverConStudyService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverDataService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverDataTypeService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverPersonPlanService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDriverPlanService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDutyItemService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareDutyService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareSchemePlanItemService.cs"},{"SourceFile":"TestRun\\DriverPrepare\\DriverPrepareSchemePlanService.cs"},{"SourceFile":"TestRun\\DriverProgressService.cs"},{"SourceFile":"TestRun\\DriverReport\\DriverReportService.cs"},{"SourceFile":"TestRun\\DriverReport\\TestRun_MonthReportItem2Service.cs"},{"SourceFile":"TestRun\\DriverReport\\TestRun_MonthReportItemService.cs"},{"SourceFile":"TestRun\\DriverReport\\TestRun_MonthReportService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunApproveService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunContactService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunPlanService.cs"},{"SourceFile":"TestRun\\DriverRun\\DriverRunService.cs"},{"SourceFile":"TestRun\\DriverSchemeService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubContactService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubContractorsService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubPlanService.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubService.cs"},{"SourceFile":"TestRun\\DriverSummary\\DriverSummaryService.cs"},{"SourceFile":"TestRun\\FeedingTestRunService.cs"},{"SourceFile":"TestRun\\Meeting\\MeetingItemService.cs"},{"SourceFile":"TestRun\\Meeting\\MeetingMinutesService.cs"},{"SourceFile":"TestRun\\Meeting\\MeetingService.cs"},{"SourceFile":"TestRun\\PersonTrain\\DriverPrepareTrainPlanService.cs"},{"SourceFile":"TestRun\\PersonTrain\\PersonTrainPlanService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainContactService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainContentService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainContractService.cs"},{"SourceFile":"TestRun\\PersonTrain\\TrainRecordsService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\AnalySampService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunOthersCheckService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunPumpCheckService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunRecordService.cs"},{"SourceFile":"TestRun\\ProduceProperty\\PropertyRunReportService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunOthersCheckService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunPumpCheckService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunRecordService.cs"},{"SourceFile":"TestRun\\ProduceTestRun\\TestRunReportService.cs"},{"SourceFile":"TestRun\\TestRunConstructSolutionApproveService.cs"},{"SourceFile":"TestRun\\TestRunConstructSolutionService.cs"},{"SourceFile":"TestRun\\TestRunService.cs"},{"SourceFile":"BoSheng\\BOSHENGMonitorService.cs"},{"SourceFile":"Transfer\\PipingService.cs"},{"SourceFile":"Transfer\\ProjectSetupService.cs"},{"SourceFile":"Transfer\\RotatingEquipmentService.cs"},{"SourceFile":"Transfer\\StaticEquipmentService.cs"},{"SourceFile":"WebService\\MCSWebService.cs"},{"SourceFile":"WebService\\CNCECHSSEWebService.cs"},{"SourceFile":"WebService\\CNCECHSSEMonitorService.cs"},{"SourceFile":"ZHGL\\DataStatistics\\DataStatisticsService.cs"},{"SourceFile":"ZHGL\\DataSync\\CQMSDataService.cs"},{"SourceFile":"ZHGL\\DataSync\\Hazard_RealTimeDeviceService.cs"},{"SourceFile":"ZHGL\\DataSync\\HJGLData_DefectService.cs"},{"SourceFile":"ZHGL\\DataSync\\HJGLData_HJGLService.cs"},{"SourceFile":"ZHGL\\DataSync\\HSSEData_HiddenDangerDetailService.cs"},{"SourceFile":"ZHGL\\DataSync\\HSSEData_HSSEService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_CQMSDataService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HJGLData_DefectService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HJGLData_HJGLService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HSSEData_HiddenDangerDetailService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_HSSEData_HSSEService.cs"},{"SourceFile":"ZHGL\\DataSync\\ProjectDataSync\\Project_SYHSEData_SYHSEService.cs"},{"SourceFile":"ZHGL\\DataSync\\ServerService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_DataService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_HiddenDangerCheckService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_RiskControlService.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEData_SYHSEService.cs"},{"SourceFile":"ZHGL\\Emergency\\UnitDrillRecordListService.cs"},{"SourceFile":"ZHGL\\Emergency\\UnitEmergencyListService.cs"},{"SourceFile":"ZHGL\\Environmental\\ArchitectureReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ArchitectureReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ChemicalReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ChemicalReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\EnergyreportItemService .cs"},{"SourceFile":"ZHGL\\Environmental\\EnergyReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectArchitectureReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectArchitectureReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectChemicalReportItemService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectChemicalReportService.cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectEnergyreportItemService .cs"},{"SourceFile":"ZHGL\\Environmental\\ProjectEnergyReportService.cs"},{"SourceFile":"ZHGL\\HSSESystem\\HSSEManageItemService.cs"},{"SourceFile":"ZHGL\\HSSESystem\\HSSEManageService.cs"},{"SourceFile":"ZHGL\\HSSESystem\\HSSEOrganizeService.cs"},{"SourceFile":"ZHGL\\Information\\AccidentCauseReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\AccidentCauseReportService.cs"},{"SourceFile":"ZHGL\\Information\\ActionWorkLedgerItemService.cs"},{"SourceFile":"ZHGL\\Information\\ActionWorkLedgerService.cs"},{"SourceFile":"ZHGL\\Information\\EPSummaryReportService.cs"},{"SourceFile":"ZHGL\\Information\\QualityWorkSummaryReportService.cs"},{"SourceFile":"ZHGL\\Information\\QuarterlyProjectQualityService.cs"},{"SourceFile":"ZHGL\\Information\\SafetyBriefingService.cs"},{"SourceFile":"ZHGL\\Information\\SafetyProductionEvaluationItemService.cs"},{"SourceFile":"ZHGL\\Information\\SafetyProductionEvaluationService.cs"},{"SourceFile":"ZHGL\\Information\\UrgeReportService.cs"},{"SourceFile":"ZHGL\\Information\\AnalyseResourceService.cs"},{"SourceFile":"ZHGL\\Information\\DrillConductedQuarterlyReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\DrillConductedQuarterlyReportService.cs"},{"SourceFile":"ZHGL\\Information\\DrillPlanHalfYearReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\DrillPlanHalfYearReportService.cs"},{"SourceFile":"ZHGL\\Information\\MillionsMonthlyReportItemService.cs"},{"SourceFile":"ZHGL\\Information\\MillionsMonthlyReportService.cs"},{"SourceFile":"ZHGL\\Information\\SafetyQuarterlyReportService.cs"},{"SourceFile":"ZHGL\\Information\\WorkSummaryReportService.cs"},{"SourceFile":"ZHGL\\InspectionSummary\\InspectionSummaryService.cs"},{"SourceFile":"ZHGL\\Meeting\\CompanySafetyMeetingService.cs"},{"SourceFile":"ZHGL\\Meeting\\CompanySpecialMeetingService.cs"},{"SourceFile":"ZHGL\\Person\\CompanyBranchPersonService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\AccidentAnalysisItemService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\AccidentAnalysisService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\AccidentStatisticsService.cs"},{"SourceFile":"ZHGL\\ProjectAccident\\ProjectAccidentReportService.cs"},{"SourceFile":"ZHGL\\RealName\\BasicDataService.cs"},{"SourceFile":"ZHGL\\RealName\\RealName_ProjectService.cs"},{"SourceFile":"ZHGL\\RealName\\OnPostService.cs"},{"SourceFile":"ZHGL\\RealName\\LeavePostService.cs"},{"SourceFile":"ZHGL\\RealName\\CityService.cs"},{"SourceFile":"ZHGL\\RealName\\CountryService.cs"},{"SourceFile":"ZHGL\\RealName\\RealNameMonitorService.cs"},{"SourceFile":"ZHGL\\RealName\\SynchroSetService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\CheckRectifyItemService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\CheckRectifyService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\SubUnitReportItemService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\SubUnitReportService.cs"},{"SourceFile":"ZHGL\\ServerCheck\\UpCheckReportService.cs"},{"SourceFile":"ZHGL\\Supervise\\SubUnitCheckRectifyItemService.cs"},{"SourceFile":"ZHGL\\Supervise\\SubUnitCheckRectifyService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckRectifyItemService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckRectifyService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckReportItemService.cs"},{"SourceFile":"ZHGL\\Supervise\\SuperviseCheckReportService.cs"},{"SourceFile":"ZHGL\\TestRunPerformance\\TestRunMonthSummaryReportService.cs"},{"SourceFile":"ZHGL\\TestRunPerformance\\TestRunPerformanceMonthReportService.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\FineUIPro\\Reference BLL\\Aspose.Words.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\FineUIPro\\FineUIPro.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\Microsoft.CSharp\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Microsoft SQL Server\\110\\SDK\\Assemblies\\Microsoft.SQLServer.ManagedDTS.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\Model\\bin\\Debug\\Model.dll"},{"Reference":"C:\\WINDOWS\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.dll"},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.DataSetExtensions\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_64\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_64\\System.Data.OracleClient\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.OracleClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.DirectoryServices\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.DirectoryServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Drawing\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Management\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Net\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Numerics\\v4.0_4.0.0.0__b77a5c561934e089\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Runtime.Serialization\\v4.0_4.0.0.0__b77a5c561934e089\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Security\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.ServiceModel\\v4.0_4.0.0.0__b77a5c561934e089\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.ServiceProcess\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.ServiceProcess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_64\\System.Transactions\\v4.0_4.0.0.0__b77a5c561934e089\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Web.DataVisualization\\v4.0_4.0.0.0__31bf3856ad364e35\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_64\\System.Web\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\FineUIPro\\Reference BLL\\ThoughtWorks.QRCode.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\WindowsBase\\v4.0_4.0.0.0__31bf3856ad364e35\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\BLL\\bin\\Debug\\BLL.dll","OutputItemRelativePath":"BLL.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/SGGL/BLL/API/APIBaseInfoService.cs b/SGGL/BLL/API/APIBaseInfoService.cs
index 1a647d0c..7e5b29ac 100644
--- a/SGGL/BLL/API/APIBaseInfoService.cs
+++ b/SGGL/BLL/API/APIBaseInfoService.cs
@@ -71,6 +71,30 @@ namespace BLL
         }
         #endregion
 
+        #region 鏍规嵁椤圭洰鍚嶇О鑾峰彇椤圭洰淇℃伅
+        /// <summary>
+        /// 鏍规嵁椤圭洰鍚嶇О鑾峰彇椤圭洰淇℃伅
+        /// </summary>
+        /// <param name="projectName"></param>
+        /// <returns></returns>
+        public static Model.BaseInfoItem getProjectByName(string projectName)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getDataLists = (from x in db.Base_Project
+                                    where x.ProjectName == projectName
+                                    select new Model.BaseInfoItem
+                                    {
+                                        BaseInfoId = x.ProjectId,
+                                        BaseInfoCode = x.ProjectCode,
+                                        BaseInfoName = x.ProjectName
+                                    }
+                                ).FirstOrDefault();
+                return getDataLists;
+            }
+        }
+        #endregion
+
         #region 鏍规嵁椤圭洰id鑾峰彇鍖哄煙琛�
         /// <summary>
         /// 鏍规嵁椤圭洰id鑾峰彇鍖哄煙琛�
diff --git a/SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs b/SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs
new file mode 100644
index 00000000..9864e81f
--- /dev/null
+++ b/SGGL/BLL/API/CQMS/ApiInspectionManagementService.cs
@@ -0,0 +1,393 @@
+锘縰sing Model.CQMS;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.API.CQMS
+{
+   public class ApiInspectionManagementService
+    {
+        public static bool AddInspectionManagement(InspectionManagement inspectionManagement)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                Model.ProcessControl_InspectionManagement newInspectionManagement = null;
+                if (!string.IsNullOrEmpty(inspectionManagement.InspectionId))
+                {
+                    newInspectionManagement = db.ProcessControl_InspectionManagement.FirstOrDefault(x => x.InspectionId == inspectionManagement.InspectionId);
+                }
+                if (newInspectionManagement == null)
+                {
+                    newInspectionManagement = new Model.ProcessControl_InspectionManagement();
+                    newInspectionManagement.InspectionId = Guid.NewGuid().ToString();
+                }
+                newInspectionManagement.InspectionId = inspectionManagement.InspectionId;
+                newInspectionManagement.ProjectId = inspectionManagement.ProjectId;
+                newInspectionManagement.UnitId = inspectionManagement.UnitId;
+                newInspectionManagement.CNProfessionalId = inspectionManagement.CNProfessionalId;
+                newInspectionManagement.InspectionCode = inspectionManagement.InspectionCode;
+                newInspectionManagement.UnitWorkId = inspectionManagement.UnitWorkId;
+                newInspectionManagement.Branch = inspectionManagement.Branch;
+                newInspectionManagement.ControlPointType = inspectionManagement.ControlPointType;
+                newInspectionManagement.AcceptanceSite = inspectionManagement.AcceptanceSite;
+                newInspectionManagement.IsOnceQualified = inspectionManagement.IsOnceQualified == "true" ? true : false;
+                if (!string.IsNullOrEmpty(inspectionManagement.InspectionDate))
+                    newInspectionManagement.InspectionDate = DateTime.Parse(inspectionManagement.InspectionDate);
+                newInspectionManagement.AttachUrl = inspectionManagement.AttachUrl;
+                newInspectionManagement.AttachUrl2 = inspectionManagement.AttachUrl2;
+                newInspectionManagement.NoticeCode = inspectionManagement.NoticeCode;
+                newInspectionManagement.ParentDivisionProjectId = inspectionManagement.ParentDivisionProjectId;
+                if (!string.IsNullOrEmpty(inspectionManagement.CheckDate))
+                    newInspectionManagement.CheckDate = DateTime.Parse(inspectionManagement.CheckDate);
+                newInspectionManagement.CheckMan = inspectionManagement.CheckMan;
+                newInspectionManagement.CompileMan = inspectionManagement.CompileMan;
+                //newInspectionManagement.CompileMan2 = inspectionManagement.CompileMan2;
+                if (!string.IsNullOrEmpty(inspectionManagement.CompileDate))
+                    newInspectionManagement.CompileDate = DateTime.Parse(inspectionManagement.CompileDate);
+                newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason;
+                newInspectionManagement.AcceptanceCheckMan = inspectionManagement.AcceptanceCheckMan;
+                newInspectionManagement.FileType = inspectionManagement.FileType;
+                //newInspectionManagement.CCUnitIds = inspectionManagement.CCUnitIds;
+                //newInspectionManagement.MainSendUnitId = inspectionManagement.MainSendUnitId;
+                //newInspectionManagement.AuditMan = inspectionManagement.AuditMan;
+                //newInspectionManagement.Status = inspectionManagement.Status;
+                //if (!string.IsNullOrEmpty(inspectionManagement.PlanComplateDate))
+                //    newInspectionManagement.PlanComplateDate = DateTime.Parse(inspectionManagement.PlanComplateDate);
+                db.ProcessControl_InspectionManagement.InsertOnSubmit(newInspectionManagement);
+                db.SubmitChanges();
+
+                foreach (var InspectionDetail in inspectionManagement.inspectionManagementDetails)
+
+                {
+                    Model.ProcessControl_InspectionManagementDetail newInspectionDetail = new Model.ProcessControl_InspectionManagementDetail();
+                    newInspectionDetail.InspectionDetailId = InspectionDetail.InspectionDetailId;
+                    newInspectionDetail.InspectionId = newInspectionManagement.InspectionId;
+                    newInspectionDetail.UnitWorkId = InspectionDetail.UnitWorkId;
+                    newInspectionDetail.Branch = InspectionDetail.Branch;
+                    newInspectionDetail.ControlPointType = InspectionDetail.ControlPointType;
+                    if (!string.IsNullOrEmpty(InspectionDetail.CreateDate))
+                        newInspectionDetail.CreateDate = DateTime.Parse(InspectionDetail.CreateDate);
+
+                    db.ProcessControl_InspectionManagementDetail.InsertOnSubmit(newInspectionDetail);
+                }
+                db.SubmitChanges();
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍒嗛儴
+        /// </summary>
+        /// <param name="Branch"></param>
+        /// <returns></returns>
+        protected static string ConvertBranch(object Branch)
+        {
+            string name = string.Empty;
+            if (Branch != null)
+            {
+                var branch = BLL.DivisionProjectService.GetDivisionProjectById(Branch.ToString());
+                if (branch != null)
+                {
+                    name = branch.DivisionName;
+                }
+            }
+            return name;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鎺у埗鐐瑰唴瀹�
+        /// </summary>
+        /// <param name="ControlPointType"></param>
+        /// <returns></returns>
+        protected static string ConvertControlPointType(object ControlPointType)
+        {
+            string name = string.Empty;
+            if (ControlPointType != null)
+            {
+                var controlPointType = BLL.BreakdownProjectService.GetBreakdownProjectById(ControlPointType.ToString());
+                if (controlPointType != null)
+                {
+                    name = controlPointType.BreakdownName;
+                }
+            }
+            return name;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鎺у埗鐐圭瓑绾�
+        /// </summary>
+        /// <param name="ControlPointType"></param>
+        /// <returns></returns>
+        protected static string ConvertClass(object ControlPointType)
+        {
+            string name = string.Empty;
+            if (ControlPointType != null)
+            {
+                var controlPointType = BLL.BreakdownProjectService.GetBreakdownProjectById(ControlPointType.ToString());
+                if (controlPointType != null)
+                {
+                    name = controlPointType.Class;
+                }
+            }
+            return name;
+        }
+
+        public static List<InspectionManagementDetail> getInspectionManagementDetail(string projectId, int index, int page, string state, string name)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var dataList = from x in db.ProcessControl_InspectionManagementDetail
+                               where x.ProcessControl_InspectionManagement.ProjectId == projectId
+                               select x;
+                var listRes = dataList.Skip(index * page).Take(page);
+
+                List<InspectionManagementDetail> list = new List<InspectionManagementDetail>();
+                foreach (var item in listRes)
+                {
+                    InspectionManagementDetail detail = new InspectionManagementDetail()
+                    {
+                        InspectionDetailId = item.InspectionDetailId,
+                        UnitWorkId = item.UnitWorkId,
+                        UnitWorkName = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == item.UnitWorkId).UnitWorkName,
+                        ControlPointType = item.ControlPointType,
+                        CreateDate = item.CreateDate.HasValue ? item.CreateDate.Value.ToString("yyyy-MM-dd") : "",
+                        Branch = item.Branch,
+
+                        BranchName= ConvertBranch(item.Branch),
+                        ControlPointTypeName= ConvertControlPointType(item.ControlPointType),
+                        ControlPointTypeLevel= ConvertClass(item.ControlPointType)
+                    };
+                    InspectionManagement inspectionManagement = new InspectionManagement();
+
+                    inspectionManagement.InspectionId = item.ProcessControl_InspectionManagement.InspectionId;
+                    inspectionManagement.ProjectId = item.ProcessControl_InspectionManagement.ProjectId;
+                    inspectionManagement.ProjectName = db.Base_Project.FirstOrDefault(x => x.ProjectId == item.ProcessControl_InspectionManagement.ProjectId).ProjectName;
+                    inspectionManagement.UnitId = item.ProcessControl_InspectionManagement.UnitId;
+                    inspectionManagement.UnitName = db.Base_Unit.FirstOrDefault(x => x.UnitId == item.ProcessControl_InspectionManagement.UnitId).UnitName;
+                    inspectionManagement.CNProfessionalId = item.ProcessControl_InspectionManagement.CNProfessionalId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CNProfessionalId))
+                    {
+                        inspectionManagement.CNProfessionalName = db.Base_CNProfessional.FirstOrDefault(x => x.CNProfessionalId == item.ProcessControl_InspectionManagement.CNProfessionalId).ProfessionalName;
+                    }
+                    inspectionManagement.InspectionCode = item.ProcessControl_InspectionManagement.InspectionCode;
+                    inspectionManagement.UnitWorkId = item.ProcessControl_InspectionManagement.UnitWorkId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.UnitWorkId))
+                    {
+                        inspectionManagement.UnitWorkName = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == item.ProcessControl_InspectionManagement.UnitWorkId).UnitWorkName;
+                    }
+                    inspectionManagement.Branch = item.ProcessControl_InspectionManagement.Branch;
+                    inspectionManagement.ControlPointType = item.ProcessControl_InspectionManagement.ControlPointType;
+                    inspectionManagement.AcceptanceSite = item.ProcessControl_InspectionManagement.AcceptanceSite;
+                    inspectionManagement.IsOnceQualified = item.ProcessControl_InspectionManagement.IsOnceQualified.HasValue ? item.ProcessControl_InspectionManagement.IsOnceQualified.Value.ToString() : "";
+                    inspectionManagement.InspectionDate = item.ProcessControl_InspectionManagement.InspectionDate.HasValue ? "" : "";
+                    inspectionManagement.AttachUrl = item.ProcessControl_InspectionManagement.AttachUrl;
+                    inspectionManagement.CheckDate = item.ProcessControl_InspectionManagement.CheckDate.HasValue ? item.ProcessControl_InspectionManagement.CheckDate.Value.ToString("yyyy-MM-dd") : "";
+                    inspectionManagement.CheckMan = item.ProcessControl_InspectionManagement.CheckMan;
+                    inspectionManagement.CheckMan = item.ProcessControl_InspectionManagement.CheckMan;
+                    inspectionManagement.UnqualifiedReason = item.ProcessControl_InspectionManagement.UnqualifiedReason;
+                    inspectionManagement.NoticeCode = item.ProcessControl_InspectionManagement.NoticeCode;
+                    inspectionManagement.AcceptanceCheckMan = item.ProcessControl_InspectionManagement.AcceptanceCheckMan;
+                    inspectionManagement.ParentDivisionProjectId = item.ProcessControl_InspectionManagement.ParentDivisionProjectId;
+                    inspectionManagement.CompileMan = item.ProcessControl_InspectionManagement.CompileMan;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CompileMan))
+                    {
+                        inspectionManagement.CompileManName = db.Sys_User.FirstOrDefault(x => x.UserId == item.ProcessControl_InspectionManagement.CompileMan).UserName;  //item.ProcessControl_InspectionManagement.CompileManName;
+                    }
+                    inspectionManagement.CompileDate = item.ProcessControl_InspectionManagement.CompileDate.HasValue ? item.ProcessControl_InspectionManagement.CompileDate.Value.ToString("yyyy-MM-dd") : "";
+                    inspectionManagement.FileType = item.ProcessControl_InspectionManagement.FileType;
+                    inspectionManagement.AttachUrl2 = item.ProcessControl_InspectionManagement.AttachUrl2;
+                    //inspectionManagement.MainSendUnitId = item.ProcessControl_InspectionManagement.MainSendUnitId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.MainSendUnitId))
+                        inspectionManagement.MainSendUnitName = UnitService.getUnitNamesUnitIds(inspectionManagement.MainSendUnitId);//item.ProcessControl_InspectionManagement.MainSendUnitName;
+                    //inspectionManagement.CCUnitIds = item.ProcessControl_InspectionManagement.CCUnitIds;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CCUnitIds))
+                    {
+                        inspectionManagement.CCUnitName = UnitService.getUnitNamesUnitIds(inspectionManagement.CCUnitIds);//  item.ProcessControl_InspectionManagement.CCUnitName;
+                    }
+                    //inspectionManagement.PlanComplateDate = item.ProcessControl_InspectionManagement.PlanComplateDate.HasValue ? item.ProcessControl_InspectionManagement.PlanComplateDate.Value.ToString("yyyy-MM-dd") : "";
+
+                    //inspectionManagement.Status = item.ProcessControl_InspectionManagement.Status;
+                    //inspectionManagement.CompileMan2 = item.ProcessControl_InspectionManagement.CompileMan2;
+
+                    //inspectionManagement.AuditMan = item.ProcessControl_InspectionManagement.AuditMan;
+                    //if (!string.IsNullOrEmpty(inspectionManagement.AuditMan))
+                    //{ inspectionManagement.AuditManName = db.Sys_User.FirstOrDefault(x => x.UserId == item.ProcessControl_InspectionManagement.AuditMan).UserName; }
+                    detail.inspectionManagement = inspectionManagement;
+                    list.Add(detail);
+                }
+                return list;
+            }
+        }
+        public static List<InspectionManagement> getInspectionManagement(string projectId, int index, int page, string state, string name)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var dataList = from x in db.ProcessControl_InspectionManagement
+                               where x.ProjectId == projectId
+                               select x;
+                var listRes = dataList.Skip(index * page).Take(page);
+
+                List<InspectionManagement> list = new List<InspectionManagement>();
+                foreach (var item in listRes)
+                {
+
+                    InspectionManagement inspectionManagement = new InspectionManagement();
+
+                    inspectionManagement.InspectionId = item.InspectionId;
+                    inspectionManagement.ProjectId = item.ProjectId;
+                    inspectionManagement.ProjectName = db.Base_Project.FirstOrDefault(x => x.ProjectId == item.ProjectId).ProjectName;
+                    inspectionManagement.UnitId = item.UnitId;
+                    inspectionManagement.UnitName = db.Base_Unit.FirstOrDefault(x => x.UnitId == item.UnitId).UnitName;
+                    inspectionManagement.CNProfessionalId = item.CNProfessionalId;
+                  
+
+
+
+                    if (!string.IsNullOrEmpty(inspectionManagement.CNProfessionalId))
+                    {
+                        inspectionManagement.CNProfessionalName = db.Base_CNProfessional.FirstOrDefault(x => x.CNProfessionalId == item.CNProfessionalId).ProfessionalName;
+                    }
+                    inspectionManagement.InspectionCode = item.InspectionCode;
+                    inspectionManagement.UnitWorkId = item.UnitWorkId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.UnitWorkId))
+                    {
+                        inspectionManagement.UnitWorkName = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == item.UnitWorkId).UnitWorkName;
+                    }
+                    inspectionManagement.Branch = item.Branch;
+                    inspectionManagement.ControlPointType = item.ControlPointType;
+                    inspectionManagement.AcceptanceSite = item.AcceptanceSite;
+                    inspectionManagement.IsOnceQualified = item.IsOnceQualified.HasValue ? item.IsOnceQualified.Value.ToString() : "";
+                    inspectionManagement.InspectionDate = item.InspectionDate.HasValue ? "" : "";
+                    inspectionManagement.AttachUrl = item.AttachUrl;
+                    inspectionManagement.CheckDate = item.CheckDate.HasValue ? item.CheckDate.Value.ToString("yyyy-MM-dd") : "";
+                    inspectionManagement.CheckMan = item.CheckMan;
+                    inspectionManagement.CheckMan = item.CheckMan;
+                    inspectionManagement.UnqualifiedReason = item.UnqualifiedReason;
+                    inspectionManagement.NoticeCode = item.NoticeCode;
+                    inspectionManagement.AcceptanceCheckMan = item.AcceptanceCheckMan;
+                    inspectionManagement.ParentDivisionProjectId = item.ParentDivisionProjectId;
+                    inspectionManagement.CompileMan = item.CompileMan;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CompileMan))
+                    {
+                        inspectionManagement.CompileManName = db.Sys_User.FirstOrDefault(x => x.UserId == item.CompileMan).UserName;  //item.CompileManName;
+                    }
+                    inspectionManagement.CompileDate = item.CompileDate.HasValue ? item.CompileDate.Value.ToString("yyyy-MM-dd") : "";
+                    inspectionManagement.FileType = item.FileType;
+                    inspectionManagement.AttachUrl2 = item.AttachUrl2;
+                    //inspectionManagement.MainSendUnitId = item.MainSendUnitId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.MainSendUnitId))
+                        inspectionManagement.MainSendUnitName = UnitService.getUnitNamesUnitIds(inspectionManagement.MainSendUnitId);//item.MainSendUnitName;
+                    //inspectionManagement.CCUnitIds = item.CCUnitIds;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CCUnitIds))
+                    {
+                        inspectionManagement.CCUnitName = UnitService.getUnitNamesUnitIds(inspectionManagement.CCUnitIds);//  item.CCUnitName;
+                    }
+                    //inspectionManagement.PlanComplateDate = item.PlanComplateDate.HasValue ? item.PlanComplateDate.Value.ToString("yyyy-MM-dd") : "";
+
+                    //inspectionManagement.Status = item.Status;
+                    //inspectionManagement.CompileMan2 = item.CompileMan2;
+
+                    //inspectionManagement.AuditMan = item.AuditMan;
+                    //if (!string.IsNullOrEmpty(inspectionManagement.AuditMan))
+                    //{ inspectionManagement.AuditManName = db.Sys_User.FirstOrDefault(x => x.UserId == item.AuditMan).UserName; }
+
+                    list.Add(inspectionManagement);
+                }
+                return list;
+            }
+        }
+
+
+
+
+        public static List<InspectionManagementDetail> getInspectionManagementDetailByinspectionId(string inspectionId)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var dataList = from x in db.ProcessControl_InspectionManagementDetail
+                               where x.InspectionId == inspectionId
+                               select x;
+                var listRes = dataList.ToList();
+
+                List<InspectionManagementDetail> list = new List<InspectionManagementDetail>();
+                foreach (var item in listRes)
+                {
+                    InspectionManagementDetail detail = new InspectionManagementDetail(){ };
+                    detail.InspectionDetailId = item.InspectionDetailId;
+                    detail.UnitWorkId = item.UnitWorkId;
+                    detail.UnitWorkName = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == item.UnitWorkId).UnitWorkName;
+                    detail.ControlPointType = item.ControlPointType;
+                    detail.CreateDate = item.CreateDate.HasValue ? item.CreateDate.Value.ToString("yyyy-MM-dd") : "";
+                    detail.Branch = item.Branch;
+                    detail.BranchName = ConvertBranch(item.Branch);
+                    detail.ControlPointTypeName = ConvertControlPointType(item.ControlPointType);
+                    detail.ControlPointTypeLevel = ConvertClass(item.ControlPointType);
+
+                    InspectionManagement inspectionManagement = new InspectionManagement();
+
+                    inspectionManagement.InspectionId = item.ProcessControl_InspectionManagement.InspectionId;
+                    inspectionManagement.ProjectId = item.ProcessControl_InspectionManagement.ProjectId;
+                    inspectionManagement.ProjectName = db.Base_Project.FirstOrDefault(x => x.ProjectId == item.ProcessControl_InspectionManagement.ProjectId).ProjectName;
+                    inspectionManagement.UnitId = item.ProcessControl_InspectionManagement.UnitId;
+                    inspectionManagement.UnitName = db.Base_Unit.FirstOrDefault(x => x.UnitId == item.ProcessControl_InspectionManagement.UnitId).UnitName;
+                    inspectionManagement.CNProfessionalId = item.ProcessControl_InspectionManagement.CNProfessionalId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CNProfessionalId))
+                    {
+                        inspectionManagement.CNProfessionalName = db.Base_CNProfessional.FirstOrDefault(x => x.CNProfessionalId == item.ProcessControl_InspectionManagement.CNProfessionalId).ProfessionalName;
+                    }
+                    inspectionManagement.InspectionCode = item.ProcessControl_InspectionManagement.InspectionCode;
+                    inspectionManagement.UnitWorkId = item.ProcessControl_InspectionManagement.UnitWorkId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.UnitWorkId))
+                    {
+                        inspectionManagement.UnitWorkName = db.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == item.ProcessControl_InspectionManagement.UnitWorkId).UnitWorkName;
+                    }
+                    inspectionManagement.Branch = item.ProcessControl_InspectionManagement.Branch;
+                    inspectionManagement.ControlPointType = item.ProcessControl_InspectionManagement.ControlPointType;
+                    inspectionManagement.AcceptanceSite = item.ProcessControl_InspectionManagement.AcceptanceSite;
+                    inspectionManagement.IsOnceQualified = item.ProcessControl_InspectionManagement.IsOnceQualified.HasValue ? item.ProcessControl_InspectionManagement.IsOnceQualified.Value.ToString() : "";
+                    inspectionManagement.InspectionDate = item.ProcessControl_InspectionManagement.InspectionDate.HasValue ? "" : "";
+
+                    //inspectionManagement.AttachUrl = item.ProcessControl_InspectionManagement.AttachUrl;
+                    inspectionManagement.AttachUrl = APIUpLoadFileService.getFileUrl(item.InspectionId, null);
+
+                    inspectionManagement.CheckDate = item.ProcessControl_InspectionManagement.CheckDate.HasValue ? item.ProcessControl_InspectionManagement.CheckDate.Value.ToString("yyyy-MM-dd") : "";
+                    inspectionManagement.CheckMan = item.ProcessControl_InspectionManagement.CheckMan;
+                    inspectionManagement.CheckMan = item.ProcessControl_InspectionManagement.CheckMan;
+                    inspectionManagement.UnqualifiedReason = item.ProcessControl_InspectionManagement.UnqualifiedReason;
+                    inspectionManagement.NoticeCode = item.ProcessControl_InspectionManagement.NoticeCode;
+                    inspectionManagement.AcceptanceCheckMan = item.ProcessControl_InspectionManagement.AcceptanceCheckMan;
+                    inspectionManagement.ParentDivisionProjectId = item.ProcessControl_InspectionManagement.ParentDivisionProjectId;
+                    inspectionManagement.CompileMan = item.ProcessControl_InspectionManagement.CompileMan;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CompileMan))
+                    {
+                        inspectionManagement.CompileManName = db.Sys_User.FirstOrDefault(x => x.UserId == item.ProcessControl_InspectionManagement.CompileMan).UserName;  //item.ProcessControl_InspectionManagement.CompileManName;
+                    }
+                    inspectionManagement.CompileDate = item.ProcessControl_InspectionManagement.CompileDate.HasValue ? item.ProcessControl_InspectionManagement.CompileDate.Value.ToString("yyyy-MM-dd") : "";
+                    inspectionManagement.FileType = item.ProcessControl_InspectionManagement.FileType;
+                    inspectionManagement.AttachUrl2 = item.ProcessControl_InspectionManagement.AttachUrl2;
+                    //inspectionManagement.MainSendUnitId = item.ProcessControl_InspectionManagement.MainSendUnitId;
+                    if (!string.IsNullOrEmpty(inspectionManagement.MainSendUnitId))
+                        inspectionManagement.MainSendUnitName = UnitService.getUnitNamesUnitIds(inspectionManagement.MainSendUnitId);//item.ProcessControl_InspectionManagement.MainSendUnitName;
+                    //inspectionManagement.CCUnitIds = item.ProcessControl_InspectionManagement.CCUnitIds;
+                    if (!string.IsNullOrEmpty(inspectionManagement.CCUnitIds))
+                    {
+                        inspectionManagement.CCUnitName = UnitService.getUnitNamesUnitIds(inspectionManagement.CCUnitIds);//  item.ProcessControl_InspectionManagement.CCUnitName;
+                    }
+                    //inspectionManagement.PlanComplateDate = item.ProcessControl_InspectionManagement.PlanComplateDate.HasValue ? item.ProcessControl_InspectionManagement.PlanComplateDate.Value.ToString("yyyy-MM-dd") : "";
+
+                    //inspectionManagement.Status = item.ProcessControl_InspectionManagement.Status;
+                    //inspectionManagement.CompileMan2 = item.ProcessControl_InspectionManagement.CompileMan2;
+
+                    //inspectionManagement.AuditMan = item.ProcessControl_InspectionManagement.AuditMan;
+                    //if (!string.IsNullOrEmpty(inspectionManagement.AuditMan))
+                    //{ inspectionManagement.AuditManName = db.Sys_User.FirstOrDefault(x => x.UserId == item.ProcessControl_InspectionManagement.AuditMan).UserName; }
+                    detail.inspectionManagement = inspectionManagement;
+                    list.Add(detail);
+                }
+                return list;
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/API/CQMS/BreakdownProjectService.cs b/SGGL/BLL/API/CQMS/BreakdownProjectService.cs
new file mode 100644
index 00000000..13e619e5
--- /dev/null
+++ b/SGGL/BLL/API/CQMS/BreakdownProjectService.cs
@@ -0,0 +1,51 @@
+锘縰sing Model.CQMS;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.API.CQMS
+{
+    public class BreakdownProjectService
+    {
+        public static List<BreakdownProject> getBreakdowns(string projectId, string keyWord)
+        {
+            List<BreakdownProject> res = new List<BreakdownProject>();
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var q = from x in db.View_WBS_BreakdownProject
+                        where x.ProjectId == projectId && x.IsSelected == true
+                        where keyWord == "" || x.BreakdownName.Contains(keyWord)
+                        select x;
+                var list = q.ToList();
+                foreach (var item in list)
+                {
+                    BreakdownProject breakdownProject = new BreakdownProject();
+                    breakdownProject.AttachUrl = item.AttachUrl;
+                    breakdownProject.BreakdownProjectId = item.BreakdownProjectId;
+                    breakdownProject.ProjectId = item.ProjectId;
+                    breakdownProject.BreakdownCode = item.BreakdownCode;
+                    breakdownProject.BreakdownName = item.BreakdownName;
+                    breakdownProject.DivisionProjectId = item.DivisionProjectId;
+                    breakdownProject.Basis = item.Basis;
+                    breakdownProject.CheckPoints = item.CheckPoints;
+                    breakdownProject.RecordAndCode = item.RecordAndCode;
+                    breakdownProject.Class = item.Class;
+                    breakdownProject.SortIndex = item.SortIndex.HasValue ? item.SortIndex.Value.ToString() : "";
+                    breakdownProject.Remark = item.Remark;
+                    breakdownProject.AttachUrl = item.AttachUrl;
+                    breakdownProject.IsAcceptance = item.IsAcceptance.HasValue ? item.IsAcceptance.Value.ToString() : "";
+                    breakdownProject.FenBao = item.FenBao;
+                    breakdownProject.WuHuan = item.WuHuan;
+                    breakdownProject.JianLi = item.JianLi;
+                    breakdownProject.YeZhu = item.YeZhu;
+                    breakdownProject.IsSelected = item.IsSelected.HasValue ? "" : "";
+                    res.Add(breakdownProject);
+
+                }
+            }
+            return res;
+        }
+    }
+}
diff --git a/SGGL/BLL/API/CQMS/QualityAssuranceService.cs b/SGGL/BLL/API/CQMS/QualityAssuranceService.cs
new file mode 100644
index 00000000..77c1e2bd
--- /dev/null
+++ b/SGGL/BLL/API/CQMS/QualityAssuranceService.cs
@@ -0,0 +1,1076 @@
+锘�
+using System;
+using System.Collections.Generic;
+using System.Data.Linq.SqlClient;
+using System.Linq;
+
+namespace BLL
+{
+    public class QualityAssuranceService
+    {
+        #region 璁捐浜ゅ簳
+        public class Comprehensive_DesignDetailsDto : Model.Comprehensive_DesignDetails
+        {
+            /// <summary>
+            /// 涓撲笟鍚嶇О
+            /// </summary>
+            public string ProfessionalName { get; set; }
+
+            /// <summary>
+            /// 鍗曚綅宸ョ▼鍚嶇О
+            /// </summary>
+            public string UnitWorkNames { get; set; }
+
+            /// <summary>
+            /// 鍗曚綅鍚嶇О
+            /// </summary>
+            public string UnitNames { get; set; }
+
+            public string DetailsDates { get; set; }
+        }
+
+        /// <summary>
+        /// 璁捐浜ゅ簳鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static List<Comprehensive_DesignDetailsDto> getDesignDetailsList(string projectId, string cNProfessionalId = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_DesignDetails
+                        join y in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                        where x.ProjectId == projectId
+                        orderby x.CompileDate descending
+                        select new Comprehensive_DesignDetailsDto()
+                        {
+                            DesignDetailsId = x.DesignDetailsId,
+                            CNProfessionalId = x.CNProfessionalId,
+                            ProfessionalName = y.ProfessionalName,
+                            DesignDetailsCode = x.DesignDetailsCode,
+                            DetailsMan = x.DetailsMan,
+                            DetailsDates = string.Format("{0:yyyy-MM-dd}", x.DetailsDate),
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            UnitNames = ConvertCarryUnit(x.UnitName),
+                        }).ToList();
+            if (!string.IsNullOrEmpty(cNProfessionalId))
+            {
+                list = list.Where(x => x.CNProfessionalId == cNProfessionalId).ToList();
+            }
+            return list;
+        }
+
+        public static Comprehensive_DesignDetailsDto getDesignDetails(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_DesignDetails
+                        join y in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                        where x.DesignDetailsId == Id
+                        select new Comprehensive_DesignDetailsDto()
+                        {
+                            DesignDetailsId = x.DesignDetailsId,
+                            ProfessionalName = y.ProfessionalName,
+                            DesignDetailsCode = x.DesignDetailsCode,
+                            DetailsMan = x.DetailsMan,
+                            DetailsDates = string.Format("{0:yyyy-MM-dd}", x.DetailsDate),
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            UnitNames = ConvertCarryUnit(x.UnitName),
+                            JoinPersonNum = x.JoinPersonNum,
+                            RemarCode = x.RemarCode,
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.DesignDetailsId, null),
+                        }).First();
+            return list;
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍗曚綅宸ョ▼鍚嶇О
+        /// </summary>
+        /// <param name="CarryUnitWorks"></param>
+        /// <returns></returns>
+        protected static string ConvertUnitWork(object CarryUnitWorks)
+        {
+            string CarryUnitWorkName = string.Empty;
+            if (CarryUnitWorks != null)
+            {
+                string[] Ids = CarryUnitWorks.ToString().Split(',');
+                foreach (string t in Ids)
+                {
+                    var UnitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(t);
+                    if (UnitWork != null)
+                    {
+                        CarryUnitWorkName += UnitWork.UnitWorkName + ",";
+                    }
+                }
+            }
+            if (CarryUnitWorkName != string.Empty)
+            {
+                return CarryUnitWorkName.Substring(0, CarryUnitWorkName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鍗曚綅鍚嶇О
+        /// </summary>
+        /// <param name="CarryUnitIds"></param>
+        /// <returns></returns>
+        protected static string ConvertCarryUnit(object CarryUnitIds)
+        {
+            string CarryUnitName = string.Empty;
+            if (CarryUnitIds != null)
+            {
+                string[] Ids = CarryUnitIds.ToString().Split(',');
+                foreach (string t in Ids)
+                {
+                    var type = BLL.UnitService.GetUnitByUnitId(t);
+                    if (type != null)
+                    {
+                        CarryUnitName += type.UnitName + ",";
+                    }
+                }
+            }
+            if (CarryUnitName != string.Empty)
+            {
+                return CarryUnitName.Substring(0, CarryUnitName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+        #endregion
+
+        #region 鍥剧焊浼氬
+        public class Comprehensive_ReviewDrawingsDto : Model.Comprehensive_ReviewDrawings
+        {
+            public string ProfessionalName { get; set; }
+
+            public string ReviewDates { get; set; }
+
+            public string UnitWorkNames { get; set; }
+
+            public string ReceiveUnitss { get; set; }
+
+            public string AttachUrl { get; set; }
+        }
+
+        /// <summary>
+        /// 鍥剧焊浼氬鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="cNProfessionalId"></param>
+        /// <returns></returns>
+        public static List<Comprehensive_ReviewDrawingsDto> getReviewDrawingsList(string projectId, string cNProfessionalId = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_ReviewDrawings
+                        join y in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                        where x.ProjectId == projectId
+                        orderby x.CreateDate descending
+                        select new Comprehensive_ReviewDrawingsDto
+                        {
+                            Id = x.Id,
+                            CNProfessionalId = x.CNProfessionalId,
+                            ProfessionalName = y.ProfessionalName,
+                            DraCode = x.DraCode,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            ReceiveUnitss = ConvertCarryUnit(x.ReceiveUnits),
+                            ReviewDates = string.Format("{0:yyyy-MM-dd}", x.ReviewDate),
+                        }).ToList();
+            if (!string.IsNullOrEmpty(cNProfessionalId))
+            {
+                list = list.Where(x => x.CNProfessionalId == cNProfessionalId).ToList();
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 鍥剧焊浼氬璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public static Comprehensive_ReviewDrawingsDto getReviewDrawings(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_ReviewDrawings
+                        join y in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                        where x.Id == Id
+                        select new Comprehensive_ReviewDrawingsDto
+                        {
+                            Id = x.Id,
+                            CNProfessionalId = x.CNProfessionalId,
+                            ProfessionalName = y.ProfessionalName,
+                            DraCode = x.DraCode,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            ReceiveUnitss = ConvertCarryUnit(x.ReceiveUnits),
+                            ReviewDates = string.Format("{0:yyyy-MM-dd}", x.ReviewDate),
+                            RemarkCode = x.RemarkCode,
+                            Remarks = x.Remarks,
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.Id, null),
+                        }).First();
+            return list;
+        }
+        #endregion
+
+        #region 鎶�鏈氦搴�
+        public class Comprehensive_ConTechnologyDisclosureDto : Model.Comprehensive_ConTechnologyDisclosure
+        {
+            public string ProfessionalName { get; set; }
+
+            public string UnitName { get; set; }
+
+            public string UnitWorkNames { get; set; }
+
+            public string DisclosureDates { get; set; }
+        }
+
+        public static List<Comprehensive_ConTechnologyDisclosureDto> getConTechnologyDisclosureList(string projectId, string cNProfessionalId = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
+                        join y in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                        join z in Funs.DB.Base_Unit on x.UnitId equals z.UnitId
+                        where x.ProjectId == projectId
+                        orderby x.CompileDate descending
+                        select new Comprehensive_ConTechnologyDisclosureDto
+                        {
+                            ConTechnologyDisclosureId = x.ConTechnologyDisclosureId,
+                            ProfessionalName = y.ProfessionalName,
+                            DisclosureCode = x.DisclosureCode,
+                            DisclosureName = x.DisclosureName,
+                            UnitName = z.UnitName,
+                            DisclosureMan = x.DisclosureMan,
+                            DisclosureDates = string.Format("{0:yyyy-MM-dd}", x.DisclosureDate),
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            AttendMan = x.AttendMan,
+
+                        }).ToList();
+            if (!string.IsNullOrEmpty(cNProfessionalId))
+            {
+                list = list.Where(x => x.CNProfessionalId == cNProfessionalId).ToList();
+            }
+            return list;
+        }
+
+        public static Comprehensive_ConTechnologyDisclosureDto getConTechnologyDisclosure(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_ConTechnologyDisclosure
+                        join y in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals y.CNProfessionalId
+                        join z in Funs.DB.Base_Unit on x.UnitId equals z.UnitId
+                        where x.ConTechnologyDisclosureId == Id
+                        select new Comprehensive_ConTechnologyDisclosureDto
+                        {
+                            ConTechnologyDisclosureId = x.ConTechnologyDisclosureId,
+                            ProfessionalName = y.ProfessionalName,
+                            DisclosureCode = x.DisclosureCode,
+                            DisclosureName = x.DisclosureName,
+                            UnitName = z.UnitName,
+                            DisclosureMan = x.DisclosureMan,
+                            DisclosureDates = string.Format("{0:yyyy-MM-dd}", x.DisclosureDate),
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            RemarkCode = x.RemarkCode,
+                            AttendMan = x.AttendMan,
+                        }).First();
+            return list;
+        }
+        #endregion
+
+        #region 浜哄憳鎶ラ獙
+        public class Comprehensive_InspectionPersonDto : Model.Comprehensive_InspectionPerson
+        {
+            public string UnitName { get; set; }
+
+            public string ProfessionalName { get; set; }
+
+            public string UnitWorkNames { get; set; }
+
+            public string PostName { get; set; }
+
+            public string ValidityDates { get; set; }
+
+            public string ApprovalTimes { get; set; }
+
+            public string DepartureTimes { get; set; }
+
+            public string IsOnSites { get; set; }
+
+            public string IsTrains { get; set; }
+
+        }
+
+        /// <summary>
+        /// 浜哄憳鎶ラ獙鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="searchText"></param>
+        /// <returns></returns>
+        public static List<Comprehensive_InspectionPersonDto> getInspectionPersonList(string projectId, string searchText = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_InspectionPerson
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join Cn in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals Cn.CNProfessionalId
+                        join z in Funs.DB.Base_Post on x.PostId equals z.PostId
+                        where x.ProjectId == projectId
+                        orderby x.CompileDate descending
+                        select new Comprehensive_InspectionPersonDto
+                        {
+                            InspectionPersonId = x.InspectionPersonId,
+                            UnitName = y.UnitName,
+                            InspectionPersonCode = x.InspectionPersonCode,
+                            ProfessionalName = Cn.ProfessionalName,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            PostName = z.PostName,
+                            PersonName = x.PersonName,
+                            CertificateNumber = x.CertificateNumber,
+                            QualifiedProjectCode = x.QualifiedProjectCode,
+                            ValidityDates = string.Format("{0:yyyy-MM-dd}", x.ValidityDate),
+                            ApprovalTimes = string.Format("{0:yyyy-MM-dd}", x.ApprovalTime),
+                            DepartureTimes = string.Format("{0:yyyy-MM-dd}", x.DepartureTime),
+                        }).ToList();
+            if (!string.IsNullOrEmpty(searchText))
+            {
+                list = list.Where(x => x.PersonName.Contains(searchText)).ToList();
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public static Comprehensive_InspectionPersonDto getInspectionPerson(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_InspectionPerson
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join Cn in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals Cn.CNProfessionalId
+                        join z in Funs.DB.Base_Post on x.PostId equals z.PostId
+                        where x.InspectionPersonId == Id
+                        select new Comprehensive_InspectionPersonDto
+                        {
+                            InspectionPersonId = x.InspectionPersonId,
+                            UnitName = y.UnitName,
+                            InspectionPersonCode = x.InspectionPersonCode,
+                            ProfessionalName = Cn.ProfessionalName,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            PostName = z.PostName,
+                            PersonName = x.PersonName,
+                            CertificateNumber = x.CertificateNumber,
+                            QualifiedProjectCode = x.QualifiedProjectCode,
+                            ValidityDates = string.Format("{0:yyyy-MM-dd}", x.ValidityDate),
+                            ApprovalTimes = string.Format("{0:yyyy-MM-dd}", x.ApprovalTime),
+                            DepartureTimes = string.Format("{0:yyyy-MM-dd}", x.DepartureTime),
+                            IsOnSites = x.IsOnSite == true ? "鏄�" : "鍚�",
+                            IsTrains = x.IsTrain == true ? "鏄�" : "鍚�",
+                            RemarkCode = x.RemarkCode,
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.InspectionPersonId, null),
+                        }).First();
+            return list;
+        }
+        #endregion
+
+        #region 鏉愭枡鎶ラ獙
+        public class Comprehensive_InspectionEquipmentDto : Model.Comprehensive_InspectionEquipment
+        {
+            public string UnitName { get; set; }
+
+            public string ProfessionalName { get; set; }
+
+            public string InspectionDates { get; set; }
+
+            public string Attributes { get; set; }
+        }
+        public static string getAttributesName(string aId)
+        {
+            if (aId == "1")
+            {
+                return "閽㈡潗鍑哄巶鍚堟牸璇併�佽瘯楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "2")
+            {
+                return "閽㈢瓔鏈烘杩炴帴銆佺剨鎺ユ帴澶存楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "3")
+            {
+                return "姘存偿鍚堟牸璇併�佽瘯楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "4")
+            {
+                return "鐮栫煶(鐮屽潡)鍚堟牸璇併�佽瘯楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "5")
+            {
+                return "闃叉按鏉愭枡鍚堟牸璇併�佹楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "6")
+            {
+                return "鍏跺畠鏉愭枡銆佹瀯浠跺悎鏍艰瘉銆佽瘯楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "7")
+            {
+                return "娣峰嚌鍦熴�佺爞娴嗚瘯浠舵姉鍘嬪己搴﹁瘯楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "8")
+            {
+                return "娣峰嚌鍦熸姉娓楄瘯浠惰瘯楠屾姤鍛婃牳鏌ヨ褰�";
+            }
+            else if (aId == "9")
+            {
+                return "鍟嗗搧娣峰嚌鍦熻繘鍦洪獙鏀惰褰�";
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        public static List<Comprehensive_InspectionEquipmentDto> getInspectionEquipmentList(string projectId, string searchText = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_InspectionEquipment
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join Cn in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals Cn.CNProfessionalId
+                        where x.ProjectId == projectId
+                        orderby x.CompileDate descending
+                        select new Comprehensive_InspectionEquipmentDto
+                        {
+                            InspectionEquipmentId = x.InspectionEquipmentId,
+                            UnitName = y.UnitName,
+                            InspectionCode = x.InspectionCode,
+                            EquipmentNO = x.EquipmentNO,
+                            ProfessionalName = Cn.ProfessionalName,
+                            InspectionName = x.InspectionName,
+                            Specifications = x.Specifications,
+                            Supplier = x.Supplier,
+                            Counts = x.Counts,
+                            Unit = x.Unit,
+                            SamplingCount = x.SamplingCount,
+                            SamplingResult = x.SamplingResult,
+                            InspectionDates = string.Format("{0:yyyy-MM-dd}", x.InspectionDate),
+                            UsedPlace = x.UsedPlace,
+
+                            EquipmentOrMatail = x.EquipmentOrMatail,
+                            Attributes = getAttributesName(x.Attribute),
+                            RemarkCode = x.RemarkCode,
+                            //AttachUrl = APIUpLoadFileService.getFileUrl(x.InspectionPersonId, null),
+
+                        }).ToList();
+            if (!string.IsNullOrEmpty(searchText))
+            {
+                list.Where(x => x.InspectionName.Contains(searchText)).ToList();
+            }
+            return list;
+        }
+
+        public static Comprehensive_InspectionEquipmentDto getInspectionEquipment(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_InspectionEquipment
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join Cn in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals Cn.CNProfessionalId
+                        where x.InspectionEquipmentId == Id
+                        select new Comprehensive_InspectionEquipmentDto
+                        {
+                            InspectionEquipmentId = x.InspectionEquipmentId,
+                            UnitName = y.UnitName,
+                            InspectionCode = x.InspectionCode,
+                            EquipmentNO = x.EquipmentNO,
+                            ProfessionalName = Cn.ProfessionalName,
+                            InspectionName = x.InspectionName,
+                            Specifications = x.Specifications,
+                            Supplier = x.Supplier,
+                            Counts = x.Counts,
+                            Unit = x.Unit,
+                            SamplingCount = x.SamplingCount,
+                            SamplingResult = x.SamplingResult,
+                            InspectionDates = string.Format("{0:yyyy-MM-dd}", x.InspectionDate),
+                            UsedPlace = x.UsedPlace,
+
+                            EquipmentOrMatail = x.EquipmentOrMatail,
+                            Attributes = getAttributesName(x.Attribute),
+                            RemarkCode = x.RemarkCode,
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.InspectionEquipmentId, null),
+
+                        }).First();
+
+            return list;
+        }
+
+        #endregion
+
+        #region 鏈哄叿鎶ラ獙
+        public class Comprehensive_InspectionMachineDto : Model.Comprehensive_InspectionMachine
+        {
+            public string UnitName { get; set; }
+
+            public string ProfessionalName { get; set; }
+
+            public string NextTestDates { get; set; }
+
+            public string IsVerifications { get; set; }
+
+            public string InspectionDates { get; set; }
+
+            public string IsCheckOKs { get; set; }
+
+            public string LeaveDates { get; set; }
+
+            public string IsOnSites { get; set; }
+        }
+        public static List<Comprehensive_InspectionMachineDto> getInspectionMachineList(string projectId, string searchText = "")
+        {
+
+            var list = (from x in Funs.DB.Comprehensive_InspectionMachine
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join Cn in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals Cn.CNProfessionalId
+                        where x.ProjectId == projectId
+                        orderby x.CompileDate descending
+                        select new Comprehensive_InspectionMachineDto
+                        {
+                            InspectionMachineId = x.InspectionMachineId,
+                            UnitName = y.UnitName,
+                            InspectionMachineCode = x.InspectionMachineCode,
+                            InspectionMachineName = x.InspectionMachineName,
+                            ProfessionalName = Cn.ProfessionalName,
+                            InspectionType = x.InspectionType,
+                            SpecificationModel = x.SpecificationModel,
+                            NextTestDates = string.Format("{0:yyyy-MM-dd}", x.NextTestDate),
+                            TestCycle = x.TestCycle,
+                            IsVerifications = x.IsVerification == true ? "鏄�" : "鍚�",
+                            InspectionDates = string.Format("{0:yyyy-MM-dd}", x.InspectionDate),
+                            IsCheckOKs = x.IsCheckOK == true ? "鏄�" : "鍚�",
+                            UnitsCount = x.UnitsCount,
+                            LeaveDates = string.Format("{0:yyyy-MM-dd}", x.LeaveDate),
+                            IsOnSites = x.IsOnSite == true ? "鏄�" : "鍚�",
+                            RemarkCode = x.RemarkCode
+                        }).ToList();
+            if (!string.IsNullOrEmpty(searchText))
+            {
+                list.Where(x => x.InspectionMachineName.Contains(searchText)).ToList();
+            }
+            return list;
+        }
+
+        public static Comprehensive_InspectionMachineDto getInspectionMachine(string Id)
+        {
+
+            var list = (from x in Funs.DB.Comprehensive_InspectionMachine
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join Cn in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals Cn.CNProfessionalId
+                        where x.InspectionMachineId == Id
+                        select new Comprehensive_InspectionMachineDto
+                        {
+                            InspectionMachineId = x.InspectionMachineId,
+                            UnitName = y.UnitName,
+                            InspectionMachineCode = x.InspectionMachineCode,
+                            InspectionMachineName = x.InspectionMachineName,
+                            ProfessionalName = Cn.ProfessionalName,
+                            InspectionType = x.InspectionType,
+                            SpecificationModel = x.SpecificationModel,
+                            NextTestDates = string.Format("{0:yyyy-MM-dd}", x.NextTestDate),
+                            TestCycle = x.TestCycle,
+                            IsVerifications = x.IsVerification == true ? "鏄�" : "鍚�",
+                            InspectionDates = string.Format("{0:yyyy-MM-dd}", x.InspectionDate),
+                            IsCheckOKs = x.IsCheckOK == true ? "鏄�" : "鍚�",
+                            UnitsCount = x.UnitsCount,
+                            LeaveDates = string.Format("{0:yyyy-MM-dd}", x.LeaveDate),
+                            IsOnSites = x.IsOnSite == true ? "鏄�" : "鍚�",
+                            RemarkCode = x.RemarkCode,
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.InspectionMachineId, null),
+                        }).First();
+            return list;
+        }
+
+        #endregion
+
+        #region 鏃犳崯妫�娴�
+        public class ProcessControl_NondestructiveTest_NewDto : Model.ProcessControl_NondestructiveTest_New
+        {
+            public string UnitName { get; set; }
+
+            public string CreateDates { get; set; }
+
+            public string AttachUrl { get; set; }
+        }
+
+        public static List<ProcessControl_NondestructiveTest_NewDto> getNondestructiveTest_NewList(string projectId, string searchText = "")
+        {
+            var list = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.ProjectId == projectId
+                        orderby x.CreateDate descending
+                        select new ProcessControl_NondestructiveTest_NewDto
+                        {
+                            Id = x.Id,
+                            UnitName = y.UnitName,
+                            ProfessionalName = x.ProfessionalName,
+                            MonthQuantity = x.MonthQuantity,
+                            TotalQuantity = x.TotalQuantity,
+                            MonthRate = x.MonthRate,
+                            TotalRate = x.TotalRate,
+                            CreateDates = string.Format("{0:yyyy-MM-dd}", x.CreateDate)
+                        }).ToList();
+            return list;
+        }
+
+        public static ProcessControl_NondestructiveTest_NewDto getNondestructiveTest_New(string Id)
+        {
+            var list = (from x in Funs.DB.ProcessControl_NondestructiveTest_New
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.Id == Id
+                        select new ProcessControl_NondestructiveTest_NewDto
+                        {
+                            Id = x.Id,
+                            UnitName = y.UnitName,
+                            ProfessionalName = x.ProfessionalName,
+                            MonthQuantity = x.MonthQuantity,
+                            TotalQuantity = x.TotalQuantity,
+                            MonthRate = x.MonthRate,
+                            TotalRate = x.TotalRate,
+                            CreateDates = string.Format("{0:yyyy-MM-dd}", x.CreateDate),
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.Id, null),
+                        }).First();
+            return list;
+        }
+
+        #endregion
+
+        #region 鍘嬪姏绠￠亾
+        public class Comprehensive_PressurePipeDto : Model.Comprehensive_PressurePipe
+        {
+            public string UnitName { get; set; }
+
+            public string ReportTimes { get; set; }
+            public string AttachUrl { get; set; }
+        }
+
+        public static List<Comprehensive_PressurePipeDto> getPressurePipeList(string projectId, string searchText = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_PressurePipe
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.Projctid == projectId
+                        
+                        select new Comprehensive_PressurePipeDto
+                        {
+                            PressurePipeId = x.PressurePipeId,
+                            UnitName = y.UnitName,
+                            EstimateNumber = x.EstimateNumber,
+                            ActualNumber = x.ActualNumber,
+                            PackageNumber = x.PackageNumber,
+                            CompletePackageNumber = x.CompletePackageNumber,
+                            PressurePipeNumber = x.PressurePipeNumber,
+                            IssuedReportNumber = x.IssuedReportNumber,
+                            RemarkCode = x.RemarkCode,
+                            ReportTimes = string.Format("{0:yyyy-MM-dd}", x.ReportTime)
+                        }).ToList();
+            return list;
+        }
+
+        public static Comprehensive_PressurePipeDto getPressurePipe(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_PressurePipe
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.PressurePipeId == Id
+                        select new Comprehensive_PressurePipeDto
+                        {
+                            PressurePipeId = x.PressurePipeId,
+                            UnitName = y.UnitName,
+                            EstimateNumber = x.EstimateNumber,
+                            ActualNumber = x.ActualNumber,
+                            PackageNumber = x.PackageNumber,
+                            CompletePackageNumber = x.CompletePackageNumber,
+                            PressurePipeNumber = x.PressurePipeNumber,
+                            IssuedReportNumber = x.IssuedReportNumber,
+                            RemarkCode = x.RemarkCode,
+                            ReportTimes = string.Format("{0:yyyy-MM-dd}", x.ReportTime),
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.PressurePipeId, null),
+                        }).First();
+            return list;
+        }
+        #endregion
+
+        #region 鐗圭璁惧
+        public class Comprehensive_SpecialEquipmentDto : Model.Comprehensive_SpecialEquipment
+        {
+            public string UnitName { get; set; }
+
+            public string SpecialEquipmentName { get; set; }
+
+            public string ReportTimes { get; set; }
+            public string AttachUrl { get; set; }
+        }
+
+        public static List<Comprehensive_SpecialEquipmentDto> getSpecialEquipmentList(string projectId, string searchText = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_SpecialEquipment
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join z in Funs.DB.Base_SpecialEquipment on x.EquipmentId equals z.SpecialEquipmentId
+                        where x.ProjectId == projectId
+                        select new Comprehensive_SpecialEquipmentDto
+                        {
+                            SpecialEquipmentId = x.SpecialEquipmentId,
+                            UnitName = y.UnitName,
+                            SpecialEquipmentName = z.SpecialEquipmentName,
+                            PositionNum = x.PositionNum,
+                            SunNumber = x.SunNumber,
+                            InformNumber = x.InformNumber,
+                            SubmitDataNumber = x.SubmitDataNumber,
+                            MonitoringReportNumber = x.MonitoringReportNumber,
+                            RemarkCode = x.RemarkCode,
+                            ReportTimes = string.Format("{0:yyyy-MM-dd}", x.ReportTime),
+                        }
+                        ).ToList();
+            return list;
+        }
+
+        public static Comprehensive_SpecialEquipmentDto getSpecialEquipment(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_SpecialEquipment
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join z in Funs.DB.Base_SpecialEquipment on x.EquipmentId equals z.SpecialEquipmentId
+                        where x.SpecialEquipmentId == Id
+                        select new Comprehensive_SpecialEquipmentDto
+                        {
+                            SpecialEquipmentId = x.SpecialEquipmentId,
+                            UnitName = y.UnitName,
+                            SpecialEquipmentName = z.SpecialEquipmentName,
+                            PositionNum = x.PositionNum,
+                            SunNumber = x.SunNumber,
+                            InformNumber = x.InformNumber,
+                            SubmitDataNumber = x.SubmitDataNumber,
+                            MonitoringReportNumber = x.MonitoringReportNumber,
+                            RemarkCode = x.RemarkCode,
+                            ReportTimes = string.Format("{0:yyyy-MM-dd}", x.ReportTime),
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.SpecialEquipmentId, null),
+                        }
+                        ).First();
+            return list;
+        }
+        #endregion
+
+        #region 鎺у埗鐐规鏌ユ娴�
+
+        #endregion
+
+        #region 鎺у埗鐐规鏌ユ娴嬪悎鏍肩巼缁熻
+        public static DateTime NextDate;
+        public static DateTime NewDate;
+        public static DateTime EndDate;
+        public static List<Model.InspectionManagementStatistics> getInspectionManagementStatisticsList(string projectId, string searchText = "")
+        {
+            var StatisticsList = new List<Model.InspectionManagementStatistics>();
+            Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(projectId);
+            var StartDate = Convert.ToDateTime(project.StartDate);
+
+
+            for (int i = 0; i < i + 1; i++)
+            {
+                Model.InspectionManagementStatistics Statistics = new Model.InspectionManagementStatistics();
+                if (i == 0)
+                {
+                    NextDate = Convert.ToDateTime(DateTime.Parse(StartDate.ToString("yyyy-MM-dd")).AddMonths(1).ToShortDateString());
+                    NewDate = Convert.ToDateTime(NextDate.Year + "-" + NextDate.Month + "-25");
+                    Statistics.CheckDate = string.Format("{0:yyyy-MM-dd}", StartDate) + " 鑷� ";
+                    if (StartDate.Day < 25)
+                    {
+                        if (DateTime.Now < NewDate)
+                        {
+                            List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
+                            List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
+
+                            //缁熻鎵�缁欎簨浠舵鐨勫叏閮ㄦ暟閲�
+                            managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
+                            //缁熻鎵�缁欎簨浠舵鐨勫悎鏍兼暟閲�
+                            managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
+
+                            Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                            Statistics.SunNumber = managementListSunNumber.Count();
+                            Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
+                            if (managementListSunNumber.Count() != 0)//琚櫎鏁颁笉鑳戒负闆�
+                            {
+                                Statistics.OneStatistics = Math.Round((double)managementListOneNumber.Count() / (double)managementListSunNumber.Count() * 100, 2) + "%";//淇濈暀涓や綅灏忔暟銆佸悗鍥涜垗浜斿叆
+                            }
+                            else
+                            {
+                                Statistics.OneStatistics = "0%";
+                            }
+                            StatisticsList.Add(Statistics);
+                            break;
+                        }
+                        else
+                        {
+                            List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
+                            List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
+                            NextDate = Convert.ToDateTime(StartDate.Year + "-" + StartDate.Month + "-25");
+
+                            //缁熻鎵�缁欎簨浠舵鐨勫叏閮ㄦ暟閲�
+                            managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
+                            //缁熻鎵�缁欎簨浠舵鐨勫悎鏍兼暟閲�
+                            managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
+
+                            Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NextDate);
+                            Statistics.SunNumber = managementListSunNumber.Count();
+                            Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
+                            if (managementListSunNumber.Count() != 0)//琚櫎鏁颁笉鑳戒负闆�
+                            {
+                                Statistics.OneStatistics = Math.Round((double)managementListOneNumber.Count() / (double)managementListSunNumber.Count() * 100, 2) + "%";//淇濈暀涓や綅灏忔暟銆佸悗鍥涜垗浜斿叆
+                            }
+                            else
+                            {
+                                Statistics.OneStatistics = "0%";
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (DateTime.Now < NewDate)
+                        {
+                            List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
+                            List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
+
+                            //缁熻鎵�缁欎簨浠舵鐨勫叏閮ㄦ暟閲�
+                            managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
+                            //缁熻鎵�缁欎簨浠舵鐨勫悎鏍兼暟閲�
+                            managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
+
+
+
+                            Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                            Statistics.SunNumber = managementListSunNumber.Count();
+                            Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
+                            if (managementListSunNumber.Count() != 0)//琚櫎鏁颁笉鑳戒负闆�
+                            {
+                                Statistics.OneStatistics = Math.Round((double)managementListOneNumber.Count() / (double)managementListSunNumber.Count() * 100, 2) + "%";//淇濈暀涓や綅灏忔暟銆佸悗鍥涜垗浜斿叆
+                            }
+                            else
+                            {
+                                Statistics.OneStatistics = "0%";
+                            }
+
+                            StatisticsList.Add(Statistics);
+                            break;
+                        }
+                        else
+                        {
+                            List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
+                            List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
+
+                            //缁熻鎵�缁欎簨浠舵鐨勫叏閮ㄦ暟閲�
+                            managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
+                            //缁熻鎵�缁欎簨浠舵鐨勫悎鏍兼暟閲�
+                            managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
+
+                            Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NewDate);
+                            Statistics.SunNumber = managementListSunNumber.Count();
+                            Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
+                            if (managementListSunNumber.Count() != 0)//琚櫎鏁颁笉鑳戒负闆�
+                            {
+                                Statistics.OneStatistics = Math.Round((double)managementListOneNumber.Count() / (double)managementListSunNumber.Count() * 100, 2) + "%";//淇濈暀涓や綅灏忔暟銆佸悗鍥涜垗浜斿叆
+                            }
+                            else
+                            {
+                                Statistics.OneStatistics = "0%";
+                            }
+                        }
+                    }
+                }
+                else
+                {
+
+                    if (StartDate.Day > 25)
+                    {
+                        Statistics.CheckDate = NewDate.Year + "-" + NewDate.Month + "-" + (NewDate.Day + 1) + " 鑷� ";
+                        StartDate = Convert.ToDateTime(NewDate.Year + "-" + NewDate.Month + "-" + (NewDate.Day + 1));//鑾峰彇涓婁竴璁板綍鐨勭粨鏉熸棩鏈熷姞涓�澶╀负鏈璁板綍鐨勫紑濮嬫棩鏈�
+                    }
+                    else
+                    {
+                        Statistics.CheckDate = NextDate.Year + "-" + NextDate.Month + "-" + (NextDate.Day + 1) + " 鑷� ";
+                        StartDate = Convert.ToDateTime(NextDate.Year + "-" + NextDate.Month + "-" + (NextDate.Day + 1));//鑾峰彇涓婁竴璁板綍鐨勭粨鏉熸棩鏈熷姞涓�澶╀负鏈璁板綍鐨勫紑濮嬫棩鏈�
+                    }
+
+                    NextDate = Convert.ToDateTime(DateTime.Parse(NextDate.ToString("yyyy-MM-dd")).AddMonths(1).ToShortDateString());
+                    NewDate = Convert.ToDateTime(NextDate.Year + "-" + NextDate.Month + "-25");
+                    if (DateTime.Now < NewDate)
+                    {
+                        List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
+                        List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
+
+                        //缁熻鎵�缁欎簨浠舵鐨勫叏閮ㄦ暟閲�
+                        managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, false);
+                        //缁熻鎵�缁欎簨浠舵鐨勫悎鏍兼暟閲�
+                        managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, DateTime.Now, true);
+
+                        Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                        Statistics.SunNumber = managementListSunNumber.Count();
+                        Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
+                        if (managementListSunNumber.Count() != 0)//琚櫎鏁颁笉鑳戒负闆�
+                        {
+                            Statistics.OneStatistics = Math.Round((double)managementListOneNumber.Count() / (double)managementListSunNumber.Count() * 100, 2) + "%";//淇濈暀涓や綅灏忔暟銆佸悗鍥涜垗浜斿叆
+                        }
+                        else
+                        {
+                            Statistics.OneStatistics = "0%";
+                        }
+
+                        StatisticsList.Add(Statistics);
+                        break;
+                    }
+                    else
+                    {
+                        List<Model.ProcessControl_InspectionManagement> managementListSunNumber = new List<Model.ProcessControl_InspectionManagement>();
+                        List<Model.ProcessControl_InspectionManagement> managementListOneNumber = new List<Model.ProcessControl_InspectionManagement>();
+
+                        //缁熻鎵�缁欎簨浠舵鐨勫叏閮ㄦ暟閲�
+                        managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, false);
+                        //缁熻鎵�缁欎簨浠舵鐨勫悎鏍兼暟閲�
+                        managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByDate(projectId, StartDate, NewDate, true);
+
+                        Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NewDate);
+                        Statistics.SunNumber = managementListSunNumber.Count();
+                        Statistics.OneStatisticsSunNumber = managementListOneNumber.Count();
+                        if (managementListSunNumber.Count() != 0)//琚櫎鏁颁笉鑳戒负闆�
+                        {
+                            Statistics.OneStatistics = Math.Round((double)managementListOneNumber.Count() / (double)managementListSunNumber.Count() * 100, 2) + "%";//淇濈暀涓や綅灏忔暟銆佸悗鍥涜垗浜斿叆
+                        }
+                        else
+                        {
+                            Statistics.OneStatistics = "0%";
+                        }
+                    }
+                }
+                StatisticsList.Add(Statistics);
+
+            }
+            return StatisticsList;
+        }
+        #endregion
+
+        #region  鏂藉伐缁勭粐璁捐鍙婃柦宸ユ柟妗堢鐞�
+        public class Comprehensive_GeneralPlanApprovalDto : Model.Comprehensive_GeneralPlanApproval
+        {
+            public string UnitName { get; set; }
+
+            public string ProfessionalName { get; set; }
+
+            public string UnitWorkNames { get; set; }
+
+            public string ApprovalDates { get; set; }
+
+            //public string AttachUrl { get; set; }
+        }
+
+        public static List<Comprehensive_GeneralPlanApprovalDto> getGeneralPlanList(string projectId, string searchText = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
+                        where x.ProjectId == projectId
+                        orderby x.ApprovalDate descending
+                        select new Comprehensive_GeneralPlanApprovalDto
+                        {
+                            GeneralPlanApprovalId = x.GeneralPlanApprovalId,
+                            UnitName = y.UnitName,
+                            ProfessionalName = z.ProfessionalName,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            PlanCode = x.PlanCode,
+                            PlanName = x.PlanName,
+                            ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
+                            AuditMan = x.AuditMan,
+                            ApprovalMan = x.ApprovalMan,
+                            ImplementationDeviation = x.ImplementationDeviation,
+                            RemarkCode = x.RemarkCode
+                        }).ToList();
+            return list;
+        }
+
+        public static Comprehensive_GeneralPlanApprovalDto getGeneralPlan(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_GeneralPlanApproval
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
+                        where x.GeneralPlanApprovalId == Id
+                        select new Comprehensive_GeneralPlanApprovalDto
+                        {
+                            GeneralPlanApprovalId = x.GeneralPlanApprovalId,
+                            UnitName = y.UnitName,
+                            ProfessionalName = z.ProfessionalName,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            PlanCode = x.PlanCode,
+                            PlanName = x.PlanName,
+                            ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
+                            AuditMan = x.AuditMan,
+                            ApprovalMan = x.ApprovalMan,
+                            ImplementationDeviation = x.ImplementationDeviation,
+                            RemarkCode = x.RemarkCode,
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.GeneralPlanApprovalId, null),
+                        }).First();
+            return list;
+        }
+        #endregion
+
+        #region 瓒呭嵄澶у伐绋嬫柦宸ユ柟妗堢鐞�
+        public class Comprehensive_MajorPlanApprovalDto : Model.Comprehensive_MajorPlanApproval
+        {
+            public string UnitName { get; set; }
+
+            public string ProfessionalName { get; set; }
+
+            public string UnitWorkNames { get; set; }
+
+            public string ApprovalDates { get; set; }
+
+            public string IsReviews { get; set; }
+        }
+
+        public static List<Comprehensive_MajorPlanApprovalDto> getMajorPlanList(string projectId, string searchText = "")
+        {
+            var list = (from x in Funs.DB.Comprehensive_MajorPlanApproval
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
+                        where x.ProjectId == projectId
+                        orderby x.ApprovalDate descending
+                        select new Comprehensive_MajorPlanApprovalDto {
+                            MajorPlanApprovalId=x.MajorPlanApprovalId,
+                            UnitName = y.UnitName,
+                            ProfessionalName = z.ProfessionalName,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            PlanCode = x.PlanCode,
+                            PlanName = x.PlanName,
+                            ReviewMan=x.ReviewMan,
+                            ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
+                            AuditMan=x.AuditMan,
+                            ApprovalMan=x.ApprovalMan,
+                            ExpertReviewMan = x.ExpertReviewMan,
+                            IsReviews = x.IsReview==true?"鏄�":"鍚�",
+                            ImplementationDeviation=x.ImplementationDeviation,
+                            RemarkCode = x.RemarkCode,
+                        })
+                .ToList();
+            return list;
+        }
+
+        public static Comprehensive_MajorPlanApprovalDto getMajorPlan(string Id)
+        {
+            var list = (from x in Funs.DB.Comprehensive_MajorPlanApproval
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        join z in Funs.DB.Base_CNProfessional on x.CNProfessionalId equals z.CNProfessionalId
+                        where x.MajorPlanApprovalId == Id
+                        select new Comprehensive_MajorPlanApprovalDto
+                        {
+                            MajorPlanApprovalId = x.MajorPlanApprovalId,
+                            UnitName = y.UnitName,
+                            ProfessionalName = z.ProfessionalName,
+                            UnitWorkNames = ConvertUnitWork(x.UnitWorkId),
+                            PlanCode = x.PlanCode,
+                            PlanName = x.PlanName,
+                            ReviewMan = x.ReviewMan,
+                            ApprovalDates = string.Format("{0:yyyy-MM-dd}", x.ApprovalDate),
+                            AuditMan = x.AuditMan,
+                            ApprovalMan = x.ApprovalMan,
+                            IsReviews = x.IsReview == true ? "鏄�" : "鍚�",
+                            ImplementationDeviation = x.ImplementationDeviation,
+                            RemarkCode = x.RemarkCode,
+                            ExpertReviewMan=x.ExpertReviewMan,
+                            AttachUrl = APIUpLoadFileService.getFileUrl(x.MajorPlanApprovalId, null),
+                        })
+                .First();
+            return list;
+        }
+        #endregion
+    }
+}
diff --git a/SGGL/BLL/API/HSSE/APIPageDataService.cs b/SGGL/BLL/API/HSSE/APIPageDataService.cs
index ba6d276c..43746f29 100644
--- a/SGGL/BLL/API/HSSE/APIPageDataService.cs
+++ b/SGGL/BLL/API/HSSE/APIPageDataService.cs
@@ -167,6 +167,37 @@ namespace BLL
                 return getSiteInOutList;
             }
         }
+
+        public static List<Model.PageDataPersonInOutItem> getPersonNumByCompany(DateTime dateValue,string[] pids)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                List<Model.PageDataPersonInOutItem> getSiteInOutList = new List<Model.PageDataPersonInOutItem>();
+                var getDayAll = from x in db.SitePerson_PersonInOutNow
+                                join y in db.SitePerson_Person on x.PersonId equals y.PersonId
+                                join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId
+                                where x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month
+                                && x.ChangeTime.Value.Day == dateValue.Day && pids.Contains(x.ProjectId)
+                                select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType };
+                if (getDayAll.Count() > 0)
+                {
+                    var getInMaxs = from x in getDayAll
+                                    group x by x.PersonId into g
+                                    select new Model.PageDataPersonInOutItem
+                                    {
+                                        PersonId = g.First().PersonId,
+                                        ChangeTime = g.Max(x => x.ChangeTime),
+                                        IsIn = g.First().IsIn,
+                                        PostType = g.First().PostType
+                                    };
+                    if (getInMaxs.Count() > 0)
+                    {
+                        getSiteInOutList = getInMaxs.Where(x => x.IsIn == true).ToList();
+                    }
+                }
+                return getSiteInOutList;
+            }
+        }
         #endregion
     }
 }
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 100e10d6..7a73dcf4 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BLL</RootNamespace>
     <AssemblyName>BLL</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
@@ -51,9 +51,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
     <Reference Include="Microsoft.SQLServer.ManagedDTS, Version=16.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.SqlServer.ManagedDTS\v4.0_16.0.0.0__89845dcd8080cc91\鏂板缓鏂囦欢澶筡Microsoft.SQLServer.ManagedDTS.dll</HintPath>
@@ -96,6 +93,9 @@
     <Compile Include="API\APIUnitService.cs" />
     <Compile Include="API\APIUpLoadFileService.cs" />
     <Compile Include="API\APIUserService.cs" />
+    <Compile Include="API\CQMS\ApiInspectionManagementService.cs" />
+    <Compile Include="API\CQMS\BreakdownProjectService.cs" />
+    <Compile Include="API\CQMS\QualityAssuranceService.cs" />
     <Compile Include="API\HJGL\APIGetHJDataService.cs" />
     <Compile Include="API\HJGL\APIHotProcessHardService.cs" />
     <Compile Include="API\HJGL\APINDETrustService.cs" />
@@ -292,11 +292,13 @@
     <Compile Include="CQMS\WBS\ControlItemAndCycleService.cs" />
     <Compile Include="CQMS\WBS\ControlItemInitService.cs" />
     <Compile Include="CQMS\WBS\ControlItemProjectService.cs" />
+    <Compile Include="CQMS\WBS\DivisionDivideService.cs" />
     <Compile Include="CQMS\WBS\DivisionProjectService.cs" />
     <Compile Include="CQMS\WBS\DivisionService.cs" />
     <Compile Include="CQMS\WBS\ForeignBreakdownProjectService.cs" />
     <Compile Include="CQMS\WBS\ForeignBreakdownService.cs" />
     <Compile Include="CQMS\WBS\ForeignCNProfessionalService.cs" />
+    <Compile Include="CQMS\WBS\SubProjectsService.cs" />
     <Compile Include="CQMS\WBS\WBSsearchService.cs" />
     <Compile Include="CQMS\WBS\WorkPackageInitService.cs" />
     <Compile Include="CQMS\WBS\WorkPackageProjectService.cs" />
@@ -843,10 +845,14 @@
     <Compile Include="ZHGL\HSSESystem\HSSEOrganizeService.cs" />
     <Compile Include="ZHGL\Information\AccidentCauseReportItemService.cs" />
     <Compile Include="ZHGL\Information\AccidentCauseReportService.cs" />
+    <Compile Include="ZHGL\Information\ActionWorkLedgerItemService.cs" />
+    <Compile Include="ZHGL\Information\ActionWorkLedgerService.cs" />
     <Compile Include="ZHGL\Information\EPSummaryReportService.cs" />
     <Compile Include="ZHGL\Information\QualityWorkSummaryReportService.cs" />
     <Compile Include="ZHGL\Information\QuarterlyProjectQualityService.cs" />
     <Compile Include="ZHGL\Information\SafetyBriefingService.cs" />
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluationItemService.cs" />
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluationService.cs" />
     <Compile Include="ZHGL\Information\UrgeReportService.cs" />
     <Compile Include="ZHGL\Information\AnalyseResourceService.cs" />
     <Compile Include="ZHGL\Information\DrillConductedQuarterlyReportItemService.cs" />
diff --git a/SGGL/BLL/BaseInfo/CNProfessionalService.cs b/SGGL/BLL/BaseInfo/CNProfessionalService.cs
index a5361053..ed46a47b 100644
--- a/SGGL/BLL/BaseInfo/CNProfessionalService.cs
+++ b/SGGL/BLL/BaseInfo/CNProfessionalService.cs
@@ -21,6 +21,11 @@ namespace BLL
             var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
             return q;
         }
+
+        public static List<Model.Control_PointCropping> GetCnProList()
+        {
+            return (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList();
+        }
         /// <summary>
         /// 娣诲姞
         /// </summary>
diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs
index 7289c9c1..c8fc3da6 100644
--- a/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/DesignDrawingsService.cs
@@ -62,7 +62,7 @@ namespace BLL
             }
             return from x in q.Skip(startRowIndex).Take(maximumRows)
                    select new
-                   {
+                   { 
                        x.DesignDrawingsId,
                        x.ProjectId,
                        x.CNProfessionalId,
diff --git a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs
index 7f697c09..462e8d7c 100644
--- a/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/SpecialEquipmentService.cs
@@ -107,6 +107,7 @@ namespace BLL
             newEquipment.Status = SpecialEquipment.Status;
             newEquipment.PositionNum = SpecialEquipment.PositionNum;
             newEquipment.RemarkCode = SpecialEquipment.RemarkCode;
+            newEquipment.ReportTime = SpecialEquipment.ReportTime;
             db.Comprehensive_SpecialEquipment.InsertOnSubmit(newEquipment);
             db.SubmitChanges();
         }
@@ -131,6 +132,7 @@ namespace BLL
                 newEquipment.Status = SpecialEquipment.Status;
                 newEquipment.PositionNum = SpecialEquipment.PositionNum;
                 newEquipment.RemarkCode = SpecialEquipment.RemarkCode;
+                newEquipment.ReportTime = SpecialEquipment.ReportTime;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
index f8ff3af4..2d3b6cad 100644
--- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
+++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
@@ -250,6 +250,8 @@ namespace BLL
                 newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason;
                 newInspectionManagement.AcceptanceCheckMan = inspectionManagement.AcceptanceCheckMan;
                 newInspectionManagement.FileType = inspectionManagement.FileType;
+                newInspectionManagement.ChildUnitWorkId = inspectionManagement.ChildUnitWorkId;
+                newInspectionManagement.ChildBranch = inspectionManagement.ChildBranch;
                 db.ProcessControl_InspectionManagement.InsertOnSubmit(newInspectionManagement);
                 db.SubmitChanges();
             }
@@ -282,6 +284,8 @@ namespace BLL
                     newInspectionManagement.ParentDivisionProjectId = inspectionManagement.ParentDivisionProjectId;
                     newInspectionManagement.UnqualifiedReason = inspectionManagement.UnqualifiedReason;
                     newInspectionManagement.AcceptanceCheckMan = inspectionManagement.AcceptanceCheckMan;
+                    newInspectionManagement.ChildUnitWorkId = inspectionManagement.ChildUnitWorkId;
+                    newInspectionManagement.ChildBranch = inspectionManagement.ChildBranch;
                     db.SubmitChanges();
                 }
             }
diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
index a4222ead..3d4ade20 100644
--- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
+++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
@@ -37,6 +37,13 @@ namespace BLL
             return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
         }
 
+        public static List<string> GetUserIdsApprovesBySignTypeNew(string ConstructSolutionId, string signType)
+        {
+            var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId);
+            return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" 
+                    && x.SignType == signType && x.Edition == edtion-1 select x.ApproveMan).ToList();
+        }
+
         public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId)
         {
             int edition = 0;
@@ -54,17 +61,19 @@ namespace BLL
         /// <param name="managerRuleApprove">鏂藉伐鏂规瀹℃壒瀹炰綋</param>
         public static void UpdateConstructSolutionApprove(Model.Solution_CQMSConstructSolutionApprove approve)
         {
-            Model.SGGLDB db = Funs.DB;
-            Model.Solution_CQMSConstructSolutionApprove newApprove = db.Solution_CQMSConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId && e.ApproveDate == null);
-            newApprove.ConstructSolutionId = approve.ConstructSolutionId;
-            newApprove.ApproveMan = approve.ApproveMan;
-            newApprove.ApproveDate = approve.ApproveDate;
-            newApprove.ApproveIdea = approve.ApproveIdea;
-            newApprove.IsAgree = approve.IsAgree;
-            newApprove.ApproveType = approve.ApproveType;
-            newApprove.Edition = approve.Edition;
-            newApprove.Order=approve.Order;
-            db.SubmitChanges();
+            using (var db = new Model.SGGLDB(Funs.ConnString)) { 
+              
+                Model.Solution_CQMSConstructSolutionApprove newApprove = db.Solution_CQMSConstructSolutionApprove.First(e => e.ConstructSolutionApproveId == approve.ConstructSolutionApproveId && e.ApproveDate == null);
+                newApprove.ConstructSolutionId = approve.ConstructSolutionId;
+                newApprove.ApproveMan = approve.ApproveMan;
+                newApprove.ApproveDate = approve.ApproveDate;
+                newApprove.ApproveIdea = approve.ApproveIdea;
+                newApprove.IsAgree = approve.IsAgree;
+                newApprove.ApproveType = approve.ApproveType;
+                newApprove.Edition = approve.Edition;
+                newApprove.Order=approve.Order;
+                db.SubmitChanges();
+            }
         }
         /// <summary>
         /// 鏍规嵁鏂藉伐鏂规鍙戝竷Id鑾峰彇鎵�浠ュ搴旀柦宸ユ柟妗堝鎵逛俊鎭�(鏌ヨ鍏ㄩ儴浼氱鐘舵��)
@@ -78,6 +87,13 @@ namespace BLL
 
         }
 
+        public static List<Model.Solution_CQMSConstructSolutionApprove> GetHandleConstructSolutionApprovesByConstructSolutionId2(string ConstructSolutionId, int edition)
+        {
+            var list = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(p => p.ConstructSolutionId == ConstructSolutionId && p.ApproveType == Const.CQMSConstructSolution_Audit1 && p.Edition == edition).ToList();
+            return list;
+
+        }
+
         public static List<Model.Solution_CQMSConstructSolutionApprove> GetHandleConstruct(string ConstructSolutionId, int edition)
         {
             var list = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(p => p.ConstructSolutionId == ConstructSolutionId && p.ApproveType != "S" && p.ApproveDate != null && p.Edition == edition).ToList();
@@ -162,10 +178,13 @@ namespace BLL
         /// <param name="ConstructSolutionId"></param>
         public static void delSolutionApprove(string constructSolutionId, string man)
         {
-            Model.SGGLDB db = Funs.DB;
-            var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == constructSolutionId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null select x).ToList();
-            db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var q = db.Solution_CQMSConstructSolutionApprove.Where(x => x.ConstructSolutionId == constructSolutionId && x.ApproveType != "S" && x.ApproveMan.Equals(man) && x.ApproveDate == null)
+                   .ToList();
+                db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
 
         }
 
@@ -177,7 +196,7 @@ namespace BLL
         public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId)
         {
             Model.SGGLDB db = Funs.DB;
-            var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
+            var q = (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
             db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
             db.SubmitChanges();
         }
@@ -209,8 +228,8 @@ namespace BLL
         /// <param name="managerRuleApprove">鏂藉伐鏂规瀹℃壒瀹炰綋</param>
         public static void AddConstructSolutionApprove(Model.Solution_CQMSConstructSolutionApprove approve)
         {
-            var db = Funs.DB;
-            Model.Solution_CQMSConstructSolutionApprove newApprove = new Model.Solution_CQMSConstructSolutionApprove();
+            using (var db = new Model.SGGLDB(Funs.ConnString)) { 
+                Model.Solution_CQMSConstructSolutionApprove newApprove = new Model.Solution_CQMSConstructSolutionApprove();
             if (string.IsNullOrWhiteSpace(approve.ConstructSolutionApproveId))
             {
                 newApprove.ConstructSolutionApproveId = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolutionApprove));
@@ -227,9 +246,11 @@ namespace BLL
             newApprove.ApproveType = approve.ApproveType;
             newApprove.SignType = approve.SignType;
             newApprove.Edition = approve.Edition;
-            newApprove.Order= GetMaxOrderByConstructSolutionId(approve.ConstructSolutionId);
+            //newApprove.Order= GetMaxOrderByConstructSolutionId(approve.ConstructSolutionId);
+            newApprove.Order = approve.Order;
             db.Solution_CQMSConstructSolutionApprove.InsertOnSubmit(newApprove);
             db.SubmitChanges();
+            }
         }
 
         public static int GetMaxOrderByConstructSolutionId(string constructSolutionId)
@@ -254,18 +275,87 @@ namespace BLL
                 select x).FirstOrDefault();
             return q;
         }
-        public static string GetThisApproveNameByConstructSolutionId(object  constructSolutionId)
+
+        public static List<Model.Solution_CQMSConstructSolutionApprove> GetThisApproveByConstructSolutionId(string constructSolutionId,string state)
         {
-            string name = "";
-            var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
-                where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate == null
-                orderby x.Order
-                select x).FirstOrDefault();
-            if (q!=null)
+            var constructSolution =
+               CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(constructSolutionId.ToString());
+
+            var q = new List<Model.Solution_CQMSConstructSolutionApprove>();
+            if (state == "2")
             {
-                name = UserService.GetUserNameByUserId(q.ApproveMan);
+                q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
+                     where x.ConstructSolutionId == constructSolutionId && x.ApproveDate == null
+                     && x.SignType == "Yi"
+                     && x.Edition==constructSolution.Edition
+                     orderby x.Order
+                     select x).ToList();
             }
-            return name;
+            else if (state == "3")
+            {
+                q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
+                     where x.ConstructSolutionId == constructSolutionId && x.ApproveDate == null
+                     && x.SignType == "Er"
+                     && x.Edition == constructSolution.Edition
+                     orderby x.Order
+                     select x).ToList();
+            }
+            else {
+                q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
+                     where x.ConstructSolutionId == constructSolutionId && x.ApproveDate == null
+                     && x.SignType == null
+                     && x.Edition == constructSolution.Edition
+                     orderby x.Order
+                     select x).ToList();
+            }
+            return q;
+        }
+
+        //鍔犺浇瀹℃壒浜�
+        public static string GetThisApproveNameByConstructSolutionId(object  constructSolutionId,object state)
+        {
+            var constructSolution =
+               CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(constructSolutionId.ToString());
+
+            string name = "";
+            if (state.ToString() == "2")
+            {
+                var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
+                         where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate == null
+                         && x.Edition == constructSolution.Edition
+                         && x.SignType == "Yi"
+                         orderby x.Order
+                         select x).ToList();
+                if (q.Count > 0)
+                {
+                    foreach (var item in q)
+                    {
+                        name += UserService.GetUserNameByUserId(item.ApproveMan) + ",";
+                    }
+                }
+                return name;
+            }
+            else if (state.ToString() == "3")
+            {
+                var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
+                         where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate == null
+                         && x.SignType == "Er"
+                         && x.Edition == constructSolution.Edition
+                         orderby x.Order
+                         select x).ToList();
+                if (q.Count > 0)
+                {
+                    foreach (var item in q)
+                    {
+                        name += UserService.GetUserNameByUserId(item.ApproveMan) + ",";
+                    }
+                }
+                return name;
+            }
+            else {
+                return "";
+            }
+            
         }
         /// <summary>
         /// 鎺ㄩ�佸緟鍔炵粰涓嬩竴姝ュ姙鐞嗕汉
diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs
index 2d3ac3c9..36c2bc3d 100644
--- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs
+++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionService.cs
@@ -66,6 +66,8 @@ namespace BLL
             newConstructSolution.Edition = constructSolution.Edition;
             newConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
             newConstructSolution.Content= constructSolution.Content;
+            newConstructSolution.CsUsers = constructSolution.CsUsers;
+
             db.Solution_CQMSConstructSolution.InsertOnSubmit(newConstructSolution);
             db.SubmitChanges();
         }
@@ -75,20 +77,22 @@ namespace BLL
         /// <param name="constructSolution">鏂规瀹℃煡瀹炰綋</param>
         public static void UpdateConstructSolution(Model.Solution_CQMSConstructSolution constructSolution)
         {
-            Model.SGGLDB db = Funs.DB;
-            Model.Solution_CQMSConstructSolution newConstructSolution = db.Solution_CQMSConstructSolution.First(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId);
-            newConstructSolution.Code = constructSolution.Code;
-            newConstructSolution.UnitId = constructSolution.UnitId;
-            newConstructSolution.SolutionName = constructSolution.SolutionName;
-            newConstructSolution.SolutionType = constructSolution.SolutionType;
-            newConstructSolution.UnitWorkIds = constructSolution.UnitWorkIds;
-            newConstructSolution.CNProfessionalCodes = constructSolution.CNProfessionalCodes;
-            newConstructSolution.AttachUrl = constructSolution.AttachUrl;
-            newConstructSolution.State = constructSolution.State;
-            newConstructSolution.Edition = constructSolution.Edition;
-            newConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
-            newConstructSolution.Content= constructSolution.Content;
-            db.SubmitChanges();
+            using (var db = new Model.SGGLDB(Funs.ConnString)) { 
+                Model.Solution_CQMSConstructSolution newConstructSolution = db.Solution_CQMSConstructSolution.First(e => e.ConstructSolutionId == constructSolution.ConstructSolutionId);
+                newConstructSolution.Code = constructSolution.Code;
+                newConstructSolution.UnitId = constructSolution.UnitId;
+                newConstructSolution.SolutionName = constructSolution.SolutionName;
+                newConstructSolution.SolutionType = constructSolution.SolutionType;
+                newConstructSolution.UnitWorkIds = constructSolution.UnitWorkIds;
+                newConstructSolution.CNProfessionalCodes = constructSolution.CNProfessionalCodes;
+                newConstructSolution.AttachUrl = constructSolution.AttachUrl;
+                newConstructSolution.State = constructSolution.State;
+                newConstructSolution.Edition = constructSolution.Edition;
+                newConstructSolution.SpecialSchemeTypeId = constructSolution.SpecialSchemeTypeId;
+                newConstructSolution.Content= constructSolution.Content;
+                newConstructSolution.CsUsers = constructSolution.CsUsers;
+                db.SubmitChanges();
+            }
         }
 
 
@@ -112,7 +116,11 @@ namespace BLL
                 }
                 else if (state.ToString() == BLL.Const.CQMSConstructSolution_Audit)
                 {
-                    return "浼氱";
+                    return "涓�绾у鎵�";
+                }
+                else if (state.ToString() == BLL.Const.CQMSConstructSolution_Audit1)
+                {
+                    return "浜岀骇瀹℃牳";
                 }
                 else if (state.ToString() == BLL.Const.CQMSConstructSolution_Complete)
                 {
diff --git a/SGGL/BLL/CQMS/WBS/DivisionDivideService.cs b/SGGL/BLL/CQMS/WBS/DivisionDivideService.cs
new file mode 100644
index 00000000..0da5073b
--- /dev/null
+++ b/SGGL/BLL/CQMS/WBS/DivisionDivideService.cs
@@ -0,0 +1,76 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public class DivisionDivideService
+    {
+        /// <summary>
+        /// 鏍规嵁DivisionId鑾峰彇鍒嗛儴鍒嗛」宸ョ▼鍒掑垎
+        /// </summary>
+        /// <param name="divisionDivideId"></param>
+        /// <returns></returns>
+        public static Model.WBS_DivisionDivide GetDivisionDivideByDivisionId(string unitWorkId, string divisionId)
+        {
+            return Funs.DB.WBS_DivisionDivide.FirstOrDefault(e => e.UnitWorkId == unitWorkId && e.DivisionId == divisionId);
+        }
+
+        /// <summary>
+        /// 娣诲姞鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎銆佽鍓�
+        /// </summary>
+        /// <param name="divide"></param>
+        public static void AddDivisionDivide(Model.WBS_DivisionDivide divide)
+        {
+            Model.WBS_DivisionDivide newDivide = new Model.WBS_DivisionDivide
+            {
+                DivisionDivideId = divide.DivisionDivideId,
+                ProjectId = divide.ProjectId,
+                DivisionId = divide.DivisionId,
+                UnitWorkId = divide.UnitWorkId
+            };
+            Funs.DB.WBS_DivisionDivide.InsertOnSubmit(newDivide);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍒嗛」Id鍒犻櫎
+        /// </summary>
+        /// <param name="divisionId"></param>
+        public static void DeleteDivisionDivideByDivisionId(string divisionId)
+        {
+            Model.WBS_DivisionDivide divisionDivide = Funs.DB.WBS_DivisionDivide.FirstOrDefault(e => e.DivisionId == divisionId);
+            if (divisionDivide!=null)
+            {
+                Funs.DB.WBS_DivisionDivide.DeleteOnSubmit(divisionDivide);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋嬪垹闄�
+        /// </summary>
+        /// <param name="unitWorkId"></param>
+        public static void DeleteDivisionDivideByUnitWorkId(string unitWorkId)
+        {
+            var div = (from x in Funs.DB.WBS_DivisionDivide where x.UnitWorkId == unitWorkId select x).ToList();
+            if (div != null)
+            {
+                Funs.DB.WBS_DivisionDivide.DeleteAllOnSubmit(div);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍗曚綅宸ョ▼Id鑾峰彇鏁版嵁
+        /// </summary>
+        /// <param name="unitWorkId"></param>
+        /// <returns></returns>
+        public static List<Model.WBS_DivisionDivide> GetDivisionDivideByUnitWorkId(string unitWorkId)
+        {
+            return (from x in Funs.DB.WBS_DivisionDivide where x.UnitWorkId == unitWorkId select x).ToList();
+        }
+    }
+}
diff --git a/SGGL/BLL/CQMS/WBS/SubProjectsService.cs b/SGGL/BLL/CQMS/WBS/SubProjectsService.cs
new file mode 100644
index 00000000..32f86579
--- /dev/null
+++ b/SGGL/BLL/CQMS/WBS/SubProjectsService.cs
@@ -0,0 +1,103 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Model;
+
+namespace BLL
+{
+    /// <summary>
+    /// 鍒嗛儴鍒嗛」宸ョ▼
+    /// </summary>
+   public class SubProjectsService
+    {
+        /// <summary>
+        /// 鏍规嵁涓婚敭鑾峰彇鍒嗛儴鍒嗛」宸ョ▼
+        /// </summary>
+        /// <param name="divisionId"></param>
+        /// <returns></returns>
+        public static Model.Division_SubProjects GetSubProjectsById(string divisionId)
+        {
+            return Funs.DB.Division_SubProjects.FirstOrDefault(e => e.DivisionId == divisionId);
+        }
+
+        /// <summary>
+        /// 鏍规嵁椤圭洰Id鑾峰彇鍒嗛儴鍒嗛」宸ョ▼鏁伴噺
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <returns></returns>
+        public static int GetSubProjectsByProjectId(string projectId)
+        {
+            return (from x in Funs.DB.Division_SubProjects where x.ProjectId == projectId select x).Count();
+        }
+
+        /// <summary>
+        /// 娣诲姞鍒嗛儴鍒嗛」
+        /// </summary>
+        /// <param name="subProjects"></param>
+        public static void AddSubProjects(Division_SubProjects subProjects)
+        {
+            Model.Division_SubProjects newSubProjects = new Division_SubProjects
+            {
+                DivisionId = subProjects.DivisionId,
+                ProjectId = subProjects.ProjectId,
+                ParentId = subProjects.ParentId,
+                DivisionLevel = subProjects.DivisionLevel,
+                BranchEngineeringCode = subProjects.BranchEngineeringCode,
+                BranchEngineeringName = subProjects.BranchEngineeringName,
+                SubBranchEngineeringName = subProjects.SubBranchEngineeringName,
+                ProEngineeringCode = subProjects.ProEngineeringCode,
+                ProEngineeringName = subProjects.ProEngineeringName,
+                ProEngineeringNum = subProjects.ProEngineeringNum,
+                Remark = subProjects.Remark,
+                Status=subProjects.Status,
+                AddUser=subProjects.AddUser,
+                OperateTime=subProjects.OperateTime,
+                Sort=subProjects.Sort
+            };
+            Funs.DB.Division_SubProjects.InsertOnSubmit(newSubProjects);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 淇敼鍒嗛儴鍒嗛」
+        /// </summary>
+        /// <param name="subProjects"></param>
+        public static void UpdateSubProjects(Division_SubProjects subProjects)
+        {
+            Model.Division_SubProjects newSubProjects = Funs.DB.Division_SubProjects.FirstOrDefault(e => e.DivisionId == subProjects.DivisionId);
+            if (newSubProjects!=null)
+            {
+                newSubProjects.ParentId = subProjects.ParentId;
+                newSubProjects.DivisionLevel = subProjects.DivisionLevel;
+                newSubProjects.BranchEngineeringCode = subProjects.BranchEngineeringCode;
+                newSubProjects.BranchEngineeringName = subProjects.BranchEngineeringName;
+                newSubProjects.SubBranchEngineeringName = subProjects.SubBranchEngineeringName;
+                newSubProjects.ProEngineeringCode = subProjects.ProEngineeringCode;
+                newSubProjects.ProEngineeringName = subProjects.ProEngineeringName;
+                newSubProjects.ProEngineeringNum = subProjects.ProEngineeringNum;
+                newSubProjects.Remark = subProjects.Remark;
+                newSubProjects.Status = subProjects.Status;
+                newSubProjects.AddUser = subProjects.AddUser;
+                newSubProjects.OperateTime = subProjects.OperateTime;
+                newSubProjects.Sort = subProjects.Sort;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓婚敭鍒犻櫎鍒嗛儴鍒嗛」宸ョ▼
+        /// </summary>
+        /// <param name="divisionId"></param>
+        public static void DeleteSubProjectsById(string divisionId)
+        {
+            var subProjects = Funs.DB.Division_SubProjects.FirstOrDefault(e => e.DivisionId == divisionId);
+            if (subProjects != null)
+            {
+                Funs.DB.Division_SubProjects.DeleteOnSubmit(subProjects);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs
index 9a50abef..d4a5d72d 100644
--- a/SGGL/BLL/Common/AttachFileService.cs
+++ b/SGGL/BLL/Common/AttachFileService.cs
@@ -501,6 +501,9 @@ namespace BLL
             list.Add(".txt");
             list.Add(".xlsx");
             list.Add(".xls");
+            list.Add(".png");
+            list.Add(".jpg");
+            list.Add(".jpeg");
             foreach (var item in list)
             {
                 if (item == FiletExtension)
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index d2b95329..395393e0 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -5,10 +5,11 @@ namespace BLL
 {
     public static class Const
     {
+
         /// <summary>
-        /// 鏃堕棿涔︾锛堢敤浜庣瓫閫夋暟鎹寖鍥达級
+        /// 鏃堕棿涔︾锛堢敤浜庣瓫閫夋暟鎹寖鍥达級淇敼鏃ユ湡 2024-10-19 18:55:14 鐢�2023鏀规垚2020
         /// </summary>
-        public static DateTime DtmarkTime = DateTime.Parse("2023-01-01");
+        public static DateTime DtmarkTime = DateTime.Parse("2020-01-01");
         #region 鏌ヨ瀛楁锛氱郴缁熻缃�
         /// <summary>
         /// 绯荤粺绠＄悊鍛業D
@@ -3364,6 +3365,11 @@ namespace BLL
         /// </summary>
         public const string HseMonthReportNewTemplateUrl = "File\\Word\\HSSE\\椤圭洰瀹夊叏鏈堟姤.doc";
 
+        /// <summary>
+        /// 鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎妯℃澘
+        /// </summary>
+        public const string DivisionDivideTempUrl = "File\\Excel\\DataIn\\鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎瀵煎叆妯℃澘.xls";
+
         #region 瀵煎嚭妯℃澘
         /// <summary>
         /// 璐ㄩ噺涓撻」妫�鏌ユā鏉挎枃浠跺師濮嬭櫄鎷熻矾寰�
@@ -3778,6 +3784,21 @@ namespace BLL
         /// </summary>
         public const string ControlItemAndCycleShowMenuId = "94217974-201A-4D4F-A832-D9477ACD63A5";
 
+        /// <summary>
+        /// 鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎銆佽鍓�
+        /// </summary>
+        public const string DivisionDivideAndCropMenuId = "FB94A120-921B-4AAB-B54F-EC11B6F561FD";
+
+        /// <summary>
+        /// 鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎琛�
+        /// </summary>
+        public const string DivisionDivideListMenuId = "BA250432-492B-49A3-8BB6-D04BF74D2EDD";
+
+        /// <summary>
+        /// 鍒嗛儴鍒嗛」宸ョ▼鏁版嵁搴�
+        /// </summary>
+        public const string DivisionSubProjectsMenuId = "17E206A1-E06B-40C0-8DCB-E3AAA2E3B339";
+
         #endregion
 
         #region 宸ュ簭楠屾敹
@@ -4636,14 +4657,21 @@ namespace BLL
         public static string CQMSConstructSolution_Compile = "1";
 
         /// <summary>
-        /// 浼氱
+        /// 涓�绾у鎵�
         /// </summary>
         public static string CQMSConstructSolution_Audit = "2";
 
+        /// <summary>
+        /// 浜岀骇瀹℃壒
+        /// </summary>
+        public static string CQMSConstructSolution_Audit1 = "3";
+
         /// <summary>
         /// 瀹℃壒瀹屾垚
         /// </summary>
-        public static string CQMSConstructSolution_Complete = "3";
+        public static string CQMSConstructSolution_Complete = "4";
+
+
 
         #endregion
 
@@ -6071,5 +6099,31 @@ namespace BLL
         /// HSSE绠＄悊鏈堟姤鏂�
         /// </summary>
         public const string ManagerMonthCNewMenuId = "9E4B28DF-8C8E-49F8-AB15-270BBDC73449";
+
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        public const string ActionWorkLedgerMenuId = "CB76394B-BDEB-4F45-9D19-F38612DC6591";
+
+
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+        /// </summary>
+        public const string SafetyProductionEvaluationMenuId = "C48087A8-4C9F-485D-B0A4-C85E112BA705";
+
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        public const string ReportType_11 = "11";
+
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处涓婃姤
+        /// </summary>
+        public const string ReportType_12 = "12";
+
+        /// <summary>
+        /// 鏂藉伐宸ョ▼甯堬紙鎬诲寘锛�
+        /// </summary>
+        public const string SGEngineer = "F7302DA3-B522-43F9-98CC-6317622A884E";
     }
 }
\ No newline at end of file
diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs
index d9cfa096..4df1e5b8 100644
--- a/SGGL/BLL/Common/Funs.cs
+++ b/SGGL/BLL/Common/Funs.cs
@@ -10,6 +10,7 @@ namespace BLL
     using System.Linq;
     using System.Net;
     using System.Reflection;
+    using System.Security.Cryptography;
     using System.Text;
 
     /// <summary>
@@ -1281,6 +1282,25 @@ namespace BLL
             IRestResponse response = client.Execute(request);
             return response.Content;
         }
+        public static string GetMD5(string str)
+        {
+            using (MD5 md5 = MD5.Create())
+            {
+                // 将输入字符串转换为字节数组并计算哈希值
+                byte[] inputBytes = Encoding.ASCII.GetBytes(str);
+                byte[] hashBytes = md5.ComputeHash(inputBytes);
+
+                // 将字节数组转换为十六进制字符串
+                StringBuilder sb = new StringBuilder();
+                for (int i = 0; i < hashBytes.Length; i++)
+                {
+                    sb.Append(hashBytes[i].ToString("X2"));
+                }
+
+                return sb.ToString();
+            }
+
+        }
 
     }
 }
diff --git a/SGGL/BLL/Const.txt b/SGGL/BLL/Const.txt
new file mode 100644
index 00000000..768e7fd6
--- /dev/null
+++ b/SGGL/BLL/Const.txt
@@ -0,0 +1,10 @@
+      /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        public const string ActionWorkLedgerMenuId = "CB76394B-BDEB-4F45-9D19-F38612DC6591";
+
+
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+        /// </summary>
+        public const string SafetyProductionEvaluationMenuId = "C48087A8-4C9F-485D-B0A4-C85E112BA705";
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs
index 1252af92..2c988a71 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/CheckSortCService.cs
@@ -77,9 +77,13 @@ namespace BLL
         /// <param name="monthReportId">鏈堟姤鍛婁富閿�</param>
         public static void DeleteCheckSortsByMonthReportId(string monthReportId)
         {
-            var q = (from x in db.Manager_CheckSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_CheckSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            var q = Funs.DB.Manager_CheckSortC.Where(x=>x.MonthReportId== monthReportId).ToList();
+            if (q.Count>0)
+            {
+                Funs.DB.Manager_CheckSortC.DeleteAllOnSubmit(q);
+                Funs.DB.SubmitChanges();
+            }
+           
         }
     }
 }
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ComplianceObligationsCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ComplianceObligationsCService.cs
index 313d61fd..f6f2d6b7 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/ComplianceObligationsCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/ComplianceObligationsCService.cs
@@ -53,5 +53,67 @@ namespace BLL
                 Funs.DB.SubmitChanges();
             }
         }
+
+        #region 鏂藉伐鏂规瀹℃壒
+        public static void AddSolution_CQMSConstructSolutionApprove_Item(Model.Solution_CQMSConstructSolutionApprove_Item data)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString)) { 
+                Model.Solution_CQMSConstructSolutionApprove_Item newData = new Model.Solution_CQMSConstructSolutionApprove_Item
+            {
+                Id = data.Id,
+                TypeSortId = data.TypeSortId,
+                ConstructSolutionId = data.ConstructSolutionId,
+                SortId = data.SortId,
+                Chapter = data.Chapter,
+                Amendment = data.Amendment,
+                Proposer=data.Proposer,
+                ProposerName=data.ProposerName,
+                Modification = data.Modification,
+                ReviewerOpinion = data.ReviewerOpinion,
+                IsAccept = data.IsAccept,
+            };
+            db.Solution_CQMSConstructSolutionApprove_Item.InsertOnSubmit(newData);
+                db.SubmitChanges();
+            }
+        }
+
+        public static void UpdateSolution_CQMSConstructSolutionApprove_Item(Model.Solution_CQMSConstructSolutionApprove_Item data) {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var result = db.Solution_CQMSConstructSolutionApprove_Item.FirstOrDefault(a => a.Id == data.Id);
+                if (result != null)
+                {
+                    result.Modification = data.Modification;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+        public static void UpdateSolution_CQMSConstructSolutionApprove_ItemNew(Model.Solution_CQMSConstructSolutionApprove_Item data)
+        {
+            using (var db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var result = db.Solution_CQMSConstructSolutionApprove_Item.FirstOrDefault(a => a.Id == data.Id);
+                if (result != null)
+                {
+                    result.ReviewerOpinion = data.ReviewerOpinion;
+                    result.IsAccept = data.IsAccept;
+                    db.SubmitChanges();
+                }
+            }
+        }
+
+        public static void DeleteSolution_CQMSConstructSolutionApprove_Item(string ConstructSolutionId,string Proposer)
+        {
+            var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove_Item where x.ConstructSolutionId == ConstructSolutionId
+                     && x.Proposer== Proposer
+                     select x).ToList();
+            if (q .Count>0)
+            {
+                Funs.DB.Solution_CQMSConstructSolutionApprove_Item.DeleteAllOnSubmit(q);
+                Funs.DB.SubmitChanges();
+            }
+        }
+        #endregion
     }
 }
diff --git a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs
index c9a101a8..edf74a54 100644
--- a/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs
+++ b/SGGL/BLL/HSSE/Manager/ManagerMonthC/PersonSortCService.cs
@@ -55,8 +55,11 @@ namespace BLL
         public static void DeletePersonSortsByMonthReportId(string monthReportId)
         {
             var q = (from x in db.Manager_PersonSortC where x.MonthReportId == monthReportId select x).ToList();
-            db.Manager_PersonSortC.DeleteAllOnSubmit(q);
-            db.SubmitChanges();
+            if (q.Count>0)
+            {
+                db.Manager_PersonSortC.DeleteAllOnSubmit(q);
+                db.SubmitChanges();
+            }
         }
 
         /// <summary>
diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs
index cd0f27b9..c206c13c 100644
--- a/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs
+++ b/SGGL/BLL/PZHGL/GJSX/GJSXItemService.cs
@@ -54,7 +54,7 @@ namespace BLL
             string newKeyID = SQLHelper.GetNewID(typeof(Model.GJSX_detail));
             Model.GJSX_detail newGJSXMX = new Model.GJSX_detail();
 
-            newGJSXMX.Cuid = newKeyID;
+            newGJSXMX.Cuid = gjsxmx.Cuid;
             newGJSXMX.GJSXID = gjsxmx.GJSXID;
             newGJSXMX.Progress_user = gjsxmx.Progress_user;
             newGJSXMX.Progress_detail = gjsxmx.Progress_detail;
diff --git a/SGGL/BLL/PZHGL/GJSX/GJSXService.cs b/SGGL/BLL/PZHGL/GJSX/GJSXService.cs
index 5b7e2c10..5060bbf3 100644
--- a/SGGL/BLL/PZHGL/GJSX/GJSXService.cs
+++ b/SGGL/BLL/PZHGL/GJSX/GJSXService.cs
@@ -43,7 +43,9 @@ namespace BLL
                     IsManypeople = _GJSX.IsManypeople,
                     CompleteDate = _GJSX.CompleteDate,
                     AttachUrl = _GJSX.AttachUrl,
-                    User_Acceptance = _GJSX.User_Acceptance
+                    User_Acceptance = _GJSX.User_Acceptance,
+
+                    CsUsers=_GJSX.CsUsers
             };
 
             db.GJSX.InsertOnSubmit(newGJSX);
@@ -75,6 +77,7 @@ namespace BLL
                 newGJSX.CompleteDate = _GJSX.CompleteDate;
                 newGJSX.AttachUrl = _GJSX.AttachUrl;
                 newGJSX.User_Acceptance = _GJSX.User_Acceptance;
+                newGJSX.CsUsers = _GJSX.CsUsers;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index ca2f2232..fcf65cef 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -251,12 +251,23 @@
         /// 鑾峰彇椤圭洰涓嬫媺閫夐」
         /// </summary>
         /// <returns></returns>
-        public static List<Model.Base_Project> GetAllProjectDropDownList()
+        public static List<Model.Base_Project> GetAllProjectDropDownList(string[] pids = null)
         {
-            var list = (from x in Funs.DB.Base_Project
-                        orderby x.ProjectCode descending
-                        select x).ToList();
-            return list;
+            if (pids == null)
+            {
+                var list = (from x in Funs.DB.Base_Project
+                            orderby x.ProjectCode descending
+                            select x).ToList();
+                return list;
+            }
+            else {
+                var list = (from x in Funs.DB.Base_Project
+                            where pids.Contains(x.ProjectId)
+                            orderby x.ProjectCode descending
+                            select x).ToList();
+                return list;
+            }
+          
         }
 
 
@@ -315,7 +326,7 @@
         /// 鑾峰彇userId鍙備笌椤圭洰涓嬫媺妗�
         /// </summary>
         /// <returns></returns>
-        public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state)
+        public static List<Model.Base_Project> GetProjectByUserIdStateDropDownList(string userId, string state,string urlType="")
         {
             if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
             {
@@ -329,20 +340,42 @@
             {
                 /// 鑾峰彇瑙掕壊绫诲瀷
                 var getRoleP = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.RoleId == getUser.RoleId && x.IsOffice == false);
-                if (getRoleP != null)
+                //濡傛灉鏄」鐩骇鍒紝鑾峰彇鍒颁粬鐨勭被鍨嬪悗锛屽苟涓旇繕瑕佸崟浣嶆槸浜旂幆鐨�
+                if (!string.IsNullOrEmpty(urlType))
                 {
-                    return (from x in Funs.DB.Base_Project
-                            where x.ProjectState == state
-                            orderby x.ProjectCode descending
-                            select x).ToList();
+                    //浜旂幆鐨勮兘鐪嬫墍鏈夐」鐩紝鍚﹀垯鍙兘鐪嬮」鐩敤鎴蜂腑鏈夎嚜宸辨垨鑰呮墍灞炲崟浣嶆槸鑷繁鍗曚綅鐨�
+                    if (getRoleP != null && getUser.UnitId== Const.UnitId_CWCEC)
+                    {
+                        return (from x in Funs.DB.Base_Project
+                                where x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).ToList();
+                    }
+                    else
+                    {
+                        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 && y.IsPost == true)|| x.UnitId== getUser.UnitId) && x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).Distinct().ToList();
+                    }
                 }
-                else
-                {
-                    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 && y.IsPost == true && x.ProjectState == state
-                            orderby x.ProjectCode descending
-                            select x).Distinct().ToList();
+                else { 
+                    if (getRoleP != null)
+                    {
+                        return (from x in Funs.DB.Base_Project
+                                where x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).ToList();
+                    }
+                    else
+                    {
+                        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 && y.IsPost == true && x.ProjectState == state
+                                orderby x.ProjectCode descending
+                                select x).Distinct().ToList();
+                    }
                 }
             }
             else
@@ -448,11 +481,11 @@
         /// <param name="dropName"></param>
         /// <param name="userId"></param>
         /// <param name="isShowPlease"></param>
-        public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease)
+        public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease,string urlType="")
         {
             dropName.DataValueField = "ProjectId";
             dropName.DataTextField = "ProjectName";
-            var projectlist = GetProjectByUserIdStateDropDownList(userId, state);
+            var projectlist = GetProjectByUserIdStateDropDownList(userId, state, urlType);
             dropName.DataSource = projectlist;
             dropName.DataBind();
             if (projectlist.Count() == 0)
@@ -669,5 +702,27 @@
 
             return list;
         }
+
+        #region 鍔犺浇鍏徃绾у埆椤圭洰
+        public static List<Model.Base_Project> GetUnEndProjectByUserIdDropDownList(string projectState,
+            string projectName = null, string projectCode = null) {
+            IQueryable<Model.Base_Project> projects = (from x in Funs.DB.Base_Project
+                                                       where x.ProjectState == projectState
+                                                       orderby x.ProjectCode descending
+                                                       select x);
+            if (!string.IsNullOrEmpty(projectName))
+            {
+                projects = from x in projects where x.ProjectName.Contains(projectName) select x;
+            }
+            if (!string.IsNullOrEmpty(projectCode))
+            {
+                projects = from x in projects where x.ProjectCode.Contains(projectCode) select x;
+            }
+            return (from x in projects
+                    join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                    select x).Distinct().ToList();
+
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs
index cf918b4a..8e681db9 100644
--- a/SGGL/BLL/ProjectData/UnitWorkService.cs
+++ b/SGGL/BLL/ProjectData/UnitWorkService.cs
@@ -672,5 +672,14 @@ namespace BLL
             return (from x in Funs.DB.WBS_UnitWork where x.SuperUnitWork == superUnitWork select x).Count() > 0;
         }
 
+        /// <summary>
+        /// 鏍规嵁鍗曚綅宸ョ▼鑾峰彇瀛愬崟浣嶅伐绋嬩俊鎭�
+        /// </summary>
+        /// <param name="supUnitWork"></param>
+        /// <returns></returns>
+        public static List<Model.WBS_UnitWork> GetUnitWorksBySupUnitWork(string supUnitWork)
+        {
+            return (from x in Funs.DB.WBS_UnitWork where x.SuperUnitWork == supUnitWork select x).ToList();
+        }
     }
 }
diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index 0e5e6ed0..ee7bcc3d 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -893,6 +893,27 @@
         #endregion
 
         #region 涓ぎ浼佷笟鐜繚浜т笟浼佷笟鍩烘湰鎯呭喌鍜岀粡钀ユ儏鍐垫眹鎬昏〃
+        private static List<Model.reportItemListDto> getreportItemList(string BusinessReportId)
+        {
+            return Funs.DB.Environmental_OperationReportItem.Where(x => x.BusinessReportId == BusinessReportId)
+                .OrderBy(x => x.SortIndex).OrderBy(x => x.SortUnitName).Select(x => new Model.reportItemListDto()
+                {
+                    BusinessReportItemId = x.BusinessReportItemId,
+                    BusinessReportId = x.BusinessReportId,
+                    SortIndex = x.SortIndex,
+                    Code = x.Code,
+                    UnitLevel = x.UnitLevel,
+                    CreateDate = x.CreateDate,
+                    Place = x.Place,
+                    PersonNum = x.PersonNum,
+                    TotalAssets = x.TotalAssets,
+                    TotalValue = x.TotalValue,
+                    NewInvestment = x.NewInvestment,
+                    UnitName = x.UnitName,
+                    SortUnitName = x.SortUnitName
+                }).ToList();
+        }
+
 
         public static string UpOperationReport(string businessReportId, Model.Sys_User CurrUser)
         {
@@ -903,29 +924,22 @@
                 {
                     var upReport = from x in db.Environmental_OperationReport
                                    where x.BusinessReportId == businessReportId
-                                   select new Model.OperationReportDto
+                                   select new Model.Environmental_OperationReportDto
                                    {
                                        BusinessReportId = x.BusinessReportId,
                                        UnitId = x.UnitId,
                                        Year = x.Year,
                                        Quarters = x.Quarters,
-                                       Code = x.Code,
-                                       UnitLevel = x.UnitLevel,
-                                       CreateDate = x.CreateDate,
-                                       Place = x.Place,
-                                       PersonNum = x.PersonNum,
-                                       TotalAssets = x.TotalAssets,
-                                       TotalValue = x.TotalValue,
-                                       NewInvestment = x.NewInvestment,
                                        FillingMan = x.FillingMan,
                                        FillingDate = x.FillingDate,
                                        StatisticsDutyPerson = x.StatisticsDutyPerson,
                                        UnitDutyPerson = x.UnitDutyPerson,
-                                       Remark = x.Remark
+                                       Remark = x.Remark,
+                                       reportItemList = getreportItemList(x.BusinessReportId)
                                    };
 
                     //鏂版帴鍙pi
-                    code = UpApiOperationReport(upReport).ToString();
+                    code = UpApiOperationReportNew(upReport).ToString();
                     if (code == "1")
                     {
                         var report = db.Environmental_OperationReport.FirstOrDefault(e => e.BusinessReportId == businessReportId);
@@ -951,6 +965,7 @@
 
         }
 
+        #region 涓婃姤涓ぎ浼佷笟鐜繚浜т笟浼佷笟鍩烘湰鎯呭喌鍜岀粡钀ユ儏鍐靛琛�
         private static int UpApiOperationReport(IQueryable<Model.OperationReportDto> upReport)
         {
             string baseurl = "/api/InformationData/SaveOperationReport";
@@ -959,6 +974,16 @@
             return responeData.code;
         }
 
+        private static int UpApiOperationReportNew(IQueryable<Model.Environmental_OperationReportDto> upReport)
+        {
+            string baseurl = "/api/InformationData/SaveOperationReportNew";
+            var resultJsonReport = JsonConvert.SerializeObject(upReport.FirstOrDefault());
+            var responeData = BLL.ServerService.PushCNCEC(resultJsonReport, baseurl);
+            return responeData.code;
+        }
+
+
+        #endregion
 
         #endregion
 
@@ -973,7 +998,7 @@
             {
                 try
                 {
-                    CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
+
                     var upReport = from x in db.Environmental_EnergyReport
                                    where x.EnergyReportId == energyReportId
                                    select new Model.EnergyReport
@@ -1014,6 +1039,7 @@
                                            ServiceOperatingIncome_BasePeriod = x.ServiceOperatingIncome_BasePeriod,
                                            ServiceOperatingIncome_LastYear = x.ServiceOperatingIncome_LastYear,
                                            ServiceOperatingIncome_ThisYear = x.ServiceOperatingIncome_ThisYear,
+                                           SortUnit = x.SortUnit
                                        };
 
                     //鑰佹帴鍙erveice
@@ -3305,6 +3331,192 @@
         }
         #endregion
         #endregion
+
+        #region 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处涓婃姤
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处涓婃姤
+        /// </summary>
+        public static string UpActionWorkLedger(string actionWorkLedgerId, Model.Sys_User CurrUser)
+        {
+            string code = "0";
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                try
+                {
+                    CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
+                    var upReport = from x in db.Information_ActionWorkLedger
+                                   where x.ActionWorkLedgerId == actionWorkLedgerId
+                                   select new Model.ActionWorkLedger
+                                   {
+                                       ActionWorkLedgerId = x.ActionWorkLedgerId,
+                                       UnitId = x.UnitId,
+                                       ReportDate = x.ReportDate,
+                                       Quarter = x.Quarter,
+                                       YearId = x.YearId,
+                                       CompileMan = x.CompileMan,
+                                   };
+
+                    var upReportItem = from x in db.Information_ActionWorkLedgerItem
+                                       where x.ActionWorkLedgerId == actionWorkLedgerId
+                                       select new Model.ActionWorkLedgerItem
+                                       {
+                                           ActionWorkLedgerItemId = x.ActionWorkLedgerItemId,
+                                           ActionWorkLedgerId = x.ActionWorkLedgerId,
+                                           SortIndex = x.SortIndex,
+                                           Focus = x.Focus,
+                                           SpecialTask = x.SpecialTask,
+                                           WorkPoints = x.WorkPoints,
+                                           FillingRequirements = x.FillingRequirements,
+                                           CompletionDeadline = x.CompletionDeadline,
+                                           ImplementationStatus = x.ImplementationStatus,
+                                       };
+
+                    //var getR = hsseC.DataInsertInformation_DrillConductedQuarterlyReportTable(upReport.ToList(), upReportItem.ToList());
+                    //鏂版帴鍙pi
+                    code = UpApiSaveActionWorkLedger(upReport, upReportItem).ToString();
+                    if (code == "1")
+                    {
+                        foreach (var item in upReport.Select(p => p.ActionWorkLedgerId))
+                        {
+                            var report = db.Information_ActionWorkLedger.FirstOrDefault(e => e.ActionWorkLedgerId == item);
+                            if (report != null)
+                            {
+                                report.UpState = BLL.Const.UpState_3;
+                                db.SubmitChanges();
+                                ////鏇存柊 褰撳墠浜鸿澶勭悊鐨勬剰瑙�
+                                ProjectDataFlowSetService.CloseFlowOperate(Const.ActionWorkLedgerMenuId, item, string.Empty);
+                                ////鏇存柊鍌姤淇℃伅 
+                                UrgeReportService.SetComplete(report.UnitId, Const.ReportType_11, report.YearId.ToString(), report.Quarter.ToString());
+                            }
+                        }
+                        LogService.AddSys_Log(CurrUser, "銆愪腑澶紒涓氬畨鍏ㄧ敓浜ф不鏈敾鍧氫笁骞磋鍔ㄥ伐浣滃彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣�" + upReport.Count().ToString() + "鏉℃暟鎹紱", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
+                    }
+                    else
+                    {
+                        LogService.AddSys_Log(CurrUser, "銆愪腑澶紒涓氬畨鍏ㄧ敓浜ф不鏈敾鍧氫笁骞磋鍔ㄥ伐浣滃彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣ㄥけ璐ワ紱", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
+
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ErrLogInfo.WriteLog("銆愪腑澶紒涓氬畨鍏ㄧ敓浜ф不鏈敾鍧氫笁骞磋鍔ㄥ伐浣滃彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣�", ex);
+                    LogService.AddSys_Log(CurrUser, "銆愪腑澶紒涓氬畨鍏ㄧ敓浜ф不鏈敾鍧氫笁骞磋鍔ㄥ伐浣滃彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣ㄥけ璐ワ紱", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
+                }
+
+                return code;
+            }
+        }
+        /// <summary>
+        /// DrillConductedQuarterlyReportApi璋冪敤
+        /// </summary>
+        /// <param name="upReport">涓昏〃</param>
+        /// <param name="upReportItem">鏄庣粏琛�</param>
+        /// <returns></returns>
+        private static int UpApiSaveActionWorkLedger(IQueryable<Model.ActionWorkLedger> upReport, IQueryable<Model.ActionWorkLedgerItem> upReportItem)
+        {
+            string baseurl = "/api/InformationData/SaveActionWorkLedger";
+            //鍚堝苟
+            //var resultJson = JsonConvert.SerializeObject(new { upReport, ReportItem = upReportItem });
+            var resultJson = JsonConvert.SerializeObject(upReport.FirstOrDefault());
+            var resultJson1 = JsonConvert.SerializeObject(new { actionWorkLedgerItem = upReportItem });
+            resultJson = "{\"InformationDataItems\":[" + (resultJson + resultJson1).Replace("}{", ",") + "]}";
+            var responeData = BLL.ServerService.PushCNCEC(resultJson, baseurl);
+            return responeData.code;
+        }
+        #endregion
+
+        #region 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处涓婃姤
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处涓婃姤
+        /// </summary>
+        public static string UpSafetyProductionEvaluation(string safetyProductionEvaluationId, Model.Sys_User CurrUser)
+        {
+            string code = "0";
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                try
+                {
+                    CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
+                    var upReport = from x in db.Information_SafetyProductionEvaluation
+                                   where x.SafetyProductionEvaluationId == safetyProductionEvaluationId
+                                   select new Model.SafetyProductionEvaluation
+                                   {
+                                       SafetyProductionEvaluationId = x.SafetyProductionEvaluationId,
+                                       UnitId = x.UnitId,
+                                       ReportDate = x.ReportDate,
+                                       Quarter = x.Quarter,
+                                       YearId = x.YearId,
+                                       CompileMan = x.CompileMan,
+                                   };
+
+                    var upReportItem = from x in db.Information_SafetyProductionEvaluationItem
+                                       where x.SafetyProductionEvaluationId == safetyProductionEvaluationId
+                                       select new Model.SafetyProductionEvaluationItem
+                                       {
+                                           SafetyProductionEvaluationItemId = x.SafetyProductionEvaluationItemId,
+                                           SafetyProductionEvaluationId = x.SafetyProductionEvaluationId,
+                                           SortIndex = x.SortIndex,
+                                           Type = x.Type,
+                                           EvaluateWork = x.EvaluateWork,
+                                           EvaluationContent = x.EvaluationContent,
+                                           FillingRequirements = x.FillingRequirements,
+                                           CompletionDeadline = x.CompletionDeadline,
+                                           ImplementationStatus = x.ImplementationStatus,
+                                       };
+
+                    //var getR = hsseC.DataInsertInformation_DrillConductedQuarterlyReportTable(upReport.ToList(), upReportItem.ToList());
+                    //鏂版帴鍙pi
+                    code = UpApiSaveSafetyProductionEvaluation(upReport, upReportItem).ToString();
+                    if (code == "1")
+                    {
+                        foreach (var item in upReport.Select(p => p.SafetyProductionEvaluationId))
+                        {
+                            var report = db.Information_SafetyProductionEvaluation.FirstOrDefault(e => e.SafetyProductionEvaluationId == item);
+                            if (report != null)
+                            {
+                                report.UpState = BLL.Const.UpState_3;
+                                db.SubmitChanges();
+                                ////鏇存柊 褰撳墠浜鸿澶勭悊鐨勬剰瑙�
+                                ProjectDataFlowSetService.CloseFlowOperate(Const.SafetyProductionEvaluationMenuId, item, string.Empty);
+                                ////鏇存柊鍌姤淇℃伅 
+                                UrgeReportService.SetComplete(report.UnitId, Const.ReportType_12, report.YearId.ToString(), report.Quarter.ToString());
+                            }
+                        }
+                        LogService.AddSys_Log(CurrUser, "銆愪腑澶紒涓氬畨鍏ㄧ敓浜х鐞嗚瘎浠峰伐浣滆皟搴﹀彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣�" + upReport.Count().ToString() + "鏉℃暟鎹紱", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
+                    }
+                    else
+                    {
+                        LogService.AddSys_Log(CurrUser, "銆愪腑澶紒涓氬畨鍏ㄧ敓浜х鐞嗚瘎浠峰伐浣滆皟搴﹀彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣ㄥけ璐ワ紱", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
+
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ErrLogInfo.WriteLog("銆愪腑澶紒涓氬畨鍏ㄧ敓浜х鐞嗚瘎浠峰伐浣滆皟搴﹀彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣�", ex);
+                    LogService.AddSys_Log(CurrUser, "銆愪腑澶紒涓氬畨鍏ㄧ敓浜х鐞嗚瘎浠峰伐浣滆皟搴﹀彴璐︿笂鎶ャ�戜笂浼犲埌鏈嶅姟鍣ㄥけ璐ワ紱", null, BLL.Const.MillionsMonthlyReportMenuId, BLL.Const.BtnUploadResources);
+                }
+
+                return code;
+            }
+        }
+        /// <summary>
+        /// DrillConductedQuarterlyReportApi璋冪敤
+        /// </summary>
+        /// <param name="upReport">涓昏〃</param>
+        /// <param name="upReportItem">鏄庣粏琛�</param>
+        /// <returns></returns>
+        private static int UpApiSaveSafetyProductionEvaluation(IQueryable<Model.SafetyProductionEvaluation> upReport, IQueryable<Model.SafetyProductionEvaluationItem> upReportItem)
+        {
+            string baseurl = "/api/InformationData/SaveSafetyProductionEvaluation";
+            //鍚堝苟
+            //var resultJson = JsonConvert.SerializeObject(new { upReport, ReportItem = upReportItem });
+            var resultJson = JsonConvert.SerializeObject(upReport.FirstOrDefault());
+            var resultJson1 = JsonConvert.SerializeObject(new { safetyProductionEvaluationItem = upReportItem });
+            resultJson = "{\"InformationDataItems\":[" + (resultJson + resultJson1).Replace("}{", ",") + "]}";
+            var responeData = BLL.ServerService.PushCNCEC(resultJson, baseurl);
+            return responeData.code;
+        }
+        #endregion
     }
 
 
diff --git a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
index ec66dd73..d0037999 100644
--- a/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
@@ -686,36 +686,67 @@ namespace BLL
         ///     鑾峰彇浼佷笟璐熻矗浜哄甫鐝鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyLeadShiftCheckNum()
+        public static int GetCompanyLeadShiftCheckNum(string[] pids=null)
         {
-            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
-                where x.CheckType == "1" && x.CheckDate > Const.DtmarkTime
-                select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "1" && x.CheckDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "1" && x.CheckDate > Const.DtmarkTime
+                              && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         ///     鑾峰彇浼佷笟缁煎悎妫�鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyComprehensiveCheckNum()
+        public static int GetCompanyComprehensiveCheckNum(string[] pids = null)
         {
-            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
-                where x.CheckType == "2" && x.CheckDate > Const.DtmarkTime
-                select x).Count();
-            return result;
+            if (pids == null) { 
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "2" && x.CheckDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "2" && x.CheckDate > Const.DtmarkTime
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         ///     鑾峰彇浼佷笟涓撻」妫�鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanySpecialCheckNum()
+        public static int GetCompanySpecialCheckNum(string[] pids = null)
         {
-            var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
-                where x.CheckType == "3" && x.CheckDate > Const.DtmarkTime
-                select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "3" && x.CheckDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Supervise_SuperviseCheckReport
+                              where x.CheckType == "3" && x.CheckDate > Const.DtmarkTime
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
diff --git a/SGGL/BLL/ZHGL/DataSync/ServerService.cs b/SGGL/BLL/ZHGL/DataSync/ServerService.cs
index 77ad9f81..490d4fb8 100644
--- a/SGGL/BLL/ZHGL/DataSync/ServerService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ServerService.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace BLL
 {
-    public static  class ServerService
+    public static class ServerService
     {
         public static Model.TokenItem GetCNCECToken()
         {
@@ -30,47 +30,53 @@ namespace BLL
             Console.WriteLine(response.Content);
             var responeData = JsonConvert.DeserializeObject<Model.ResponeData>(response.Content.ToString());
             TokenItem tokenItem = new TokenItem();
-            if (responeData.code==1&&string .IsNullOrEmpty(responeData.message) )
+            if (responeData.code == 1 && string.IsNullOrEmpty(responeData.message))
             {
                 var token = JsonConvert.DeserializeObject<Model.TokenItem>(responeData.data.ToString());
-                tokenItem.Token=token.Token.ToString();
-                tokenItem.ExpiryTime= token.ExpiryTime.ToString();
+                tokenItem.Token = token.Token.ToString();
+                tokenItem.ExpiryTime = token.ExpiryTime.ToString();
                 SysConstSetService.SetToken(tokenItem.Token);
                 SysConstSetService.SetTokenExpirationTime(tokenItem.ExpiryTime);
             }
             return tokenItem;
-             
-        }
-        public static Model.ReturnData PushCNCEC(string JsonBody,string apiurl)
-        {
-            Model.ReturnData responeData = new Model.ReturnData();
-            string CNCECPath = SysConstSetService.CNCECPath;
-            if (string.IsNullOrEmpty(CNCECPath))
-            {
-                responeData.code = 0;
-                responeData.message = "鎺ュ彛鍦板潃涓虹┖锛岃閰嶇疆锛�";
-                return responeData;
 
-            }
-            string baseurl = CNCECPath + apiurl;
-            var client = new RestClient(baseurl);
-            client.Timeout = -1;
-            var request = new RestRequest(Method.POST);
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
-            var tokenItem = GetToken();
-            request.AddHeader("token", tokenItem.Token);
-            request.AddJsonBody(JsonBody);
-            IRestResponse response = client.Execute(request);
-            APICommonService.SaveSysHttpLog("api_Out", baseurl, response.Content);
-            var returnData = JsonConvert.DeserializeObject<Model.ResponeData>(response.Content.ToString());
-            if (returnData.code == 0)
+        }
+        public static Model.ReturnData PushCNCEC(string JsonBody, string apiurl)
+        {
+            try
             {
-                responeData.code = 0;
+
+
+                Model.ReturnData responeData = new Model.ReturnData();
+                string CNCECPath = SysConstSetService.CNCECPath;
+                //string CNCECPath = "http://localhost:7143";
+                if (string.IsNullOrEmpty(CNCECPath))
+                {
+                    responeData.code = 0;
+                    responeData.message = "鎺ュ彛鍦板潃涓虹┖锛岃閰嶇疆锛�";
+                    return responeData;
+
+                }
+                string baseurl = CNCECPath + apiurl;
+                var client = new RestClient(baseurl);
+                client.Timeout = -1;
+                var request = new RestRequest(Method.POST);
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+                var tokenItem = GetToken();
+                request.AddHeader("token", tokenItem.Token);
+                request.AddJsonBody(JsonBody);
+                IRestResponse response = client.Execute(request);
+                APICommonService.SaveSysHttpLog("api_Out", baseurl, response.Content);
+                var returnData = JsonConvert.DeserializeObject<Model.ResponeData>(response.Content.ToString());
+                responeData.code = returnData.code;
                 responeData.message = returnData.message;
                 return responeData;
-
             }
-            return responeData;
+            catch (Exception ex)
+            {
+
+                throw;
+            }
         }
         public static Model.TokenItem GetToken()
         {
@@ -81,7 +87,7 @@ namespace BLL
             {
                 //DateTime.Parse(SysConstSetService.CNCECTTokenExTime).AddMinutes(-10) > DateTime.Now
                 tokenItem = GetCNCECToken();
-            } 
+            }
             else if (DateTime.Parse(SysConstSetService.CNCECTTokenExTime).AddMinutes(-10) < DateTime.Now)
             {
                 tokenItem = GetCNCECToken();
diff --git a/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs b/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs
index c08460be..832249c5 100644
--- a/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs	
+++ b/SGGL/BLL/ZHGL/Environmental/EnergyreportItemService .cs	
@@ -99,7 +99,7 @@ namespace BLL
         {
             return (from x in Funs.DB.Environmental_EnergyReportItem
                     where x.EnergyReportId == EnergyReportId
-                    orderby x.SortIndex
+                    orderby x.SortIndex,x.SortUnit
                     select x).ToList();
         }
 
@@ -141,38 +141,39 @@ namespace BLL
         {
             var q = (from x in Funs.DB.Environmental_EnergyReportItem
                      where x.EnergyReportId == EnergyReportId
-                     orderby x.SortIndex
+                     orderby x.SortIndex,x.SortUnit
                      select x).ToList();
-            List<Model.Environmental_EnergyReportItem> newItems = new List<Model.Environmental_EnergyReportItem>();
-            foreach (var item in q)
-            {
-                Model.Environmental_EnergyReportItem newItem = new Model.Environmental_EnergyReportItem();
+            //List<Model.Environmental_EnergyReportItem> newItems = new List<Model.Environmental_EnergyReportItem>();
+            //foreach (var item in q)
+            //{
+            //    Model.Environmental_EnergyReportItem newItem = new Model.Environmental_EnergyReportItem();
 
-                newItem.EnergyReportItemId = item.EnergyReportItemId;
-                newItem.EnergyReportId = item.EnergyReportId;
-                newItem.SortIndex = item.SortIndex;
-                newItem.BusinessCategory = item.BusinessCategory;
-                newItem.Throughput_BasePeriod = item.Throughput_BasePeriod;
-                newItem.Throughput_LastPeriod = item.Throughput_LastPeriod;
-                newItem.Throughput_ThisPeriod = item.Throughput_ThisPeriod;
-                newItem.Throughput_UnitOfMeasurement = item.Throughput_UnitOfMeasurement;
-                newItem.Yield_BasePeriod = item.Yield_BasePeriod;
-                newItem.Yield_LastPeriod = item.Yield_LastPeriod;
-                newItem.Yield_ThisPeriod = item.Yield_ThisPeriod;
-                newItem.Yield_UnitOfMeasurement = item.Yield_UnitOfMeasurement;
-                newItem.OutputValue_BasePeriod = item.OutputValue_BasePeriod;
-                newItem.OutputValue_LastYear = item.OutputValue_LastYear;
-                newItem.OutputValue_ThisYear = item.OutputValue_ThisYear;
-                newItem.OperationScale_BasePeriod = item.OperationScale_BasePeriod;
-                newItem.OperationScale_LastYear = item.OperationScale_LastYear;
-                newItem.OperationScale_ThisYear = item.OperationScale_ThisYear;
-                newItem.OperationScale_UnitOfMeasurement = item.OperationScale_UnitOfMeasurement;
-                newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
-                newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
-                newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
-                newItems.Add(newItem);
-            }
-            return newItems;
+            //    newItem.EnergyReportItemId = item.EnergyReportItemId;
+            //    newItem.EnergyReportId = item.EnergyReportId;
+            //    newItem.SortIndex = item.SortIndex;
+            //    newItem.BusinessCategory = item.BusinessCategory;
+            //    newItem.Throughput_BasePeriod = item.Throughput_BasePeriod;
+            //    newItem.Throughput_LastPeriod = item.Throughput_LastPeriod;
+            //    newItem.Throughput_ThisPeriod = item.Throughput_ThisPeriod;
+            //    newItem.Throughput_UnitOfMeasurement = item.Throughput_UnitOfMeasurement;
+            //    newItem.Yield_BasePeriod = item.Yield_BasePeriod;
+            //    newItem.Yield_LastPeriod = item.Yield_LastPeriod;
+            //    newItem.Yield_ThisPeriod = item.Yield_ThisPeriod;
+            //    newItem.Yield_UnitOfMeasurement = item.Yield_UnitOfMeasurement;
+            //    newItem.OutputValue_BasePeriod = item.OutputValue_BasePeriod;
+            //    newItem.OutputValue_LastYear = item.OutputValue_LastYear;
+            //    newItem.OutputValue_ThisYear = item.OutputValue_ThisYear;
+            //    newItem.OperationScale_BasePeriod = item.OperationScale_BasePeriod;
+            //    newItem.OperationScale_LastYear = item.OperationScale_LastYear;
+            //    newItem.OperationScale_ThisYear = item.OperationScale_ThisYear;
+            //    newItem.OperationScale_UnitOfMeasurement = item.OperationScale_UnitOfMeasurement;
+            //    newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
+            //    newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
+            //    newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
+                
+            //    newItems.Add(newItem);
+            //}
+            return q;
         }
         public static void AddEnvironmental_EnergyReportItem(Model.Environmental_EnergyReportItem newtable)
         {
diff --git a/SGGL/BLL/ZHGL/Information/ActionWorkLedgerItemService.cs b/SGGL/BLL/ZHGL/Information/ActionWorkLedgerItemService.cs
new file mode 100644
index 00000000..b388fd5d
--- /dev/null
+++ b/SGGL/BLL/ZHGL/Information/ActionWorkLedgerItemService.cs
@@ -0,0 +1,104 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处鏄庣粏琛�
+    /// </summary>
+    public static class ActionWorkLedgerItemService
+    {
+        /// <summary>
+        /// 鏍规嵁涓婚敭鑾峰彇涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="ActionWorkLedgerItemId"></param>
+        /// <returns></returns>
+        public static Model.Information_ActionWorkLedgerItem GetActionWorkLedgerItemById(string ActionWorkLedgerItemId)
+        {
+            return Funs.DB.Information_ActionWorkLedgerItem.FirstOrDefault(e => e.ActionWorkLedgerItemId == ActionWorkLedgerItemId);
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处Id鑾峰彇鎵�鏈夌浉鍏虫槑缁嗕俊鎭�
+        /// </summary>
+        /// <param name="ActionWorkLedgerId"></param>
+        /// <returns></returns>
+        public static List<Model.Information_ActionWorkLedgerItem> GetActionWorkLedgerItemList(string ActionWorkLedgerId)
+        {
+            return (from x in Funs.DB.Information_ActionWorkLedgerItem where x.ActionWorkLedgerId == ActionWorkLedgerId orderby x.SortIndex select x).ToList();
+        }
+
+        /// <summary>
+        /// 娣诲姞涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="ActionWorkLedgerItem"></param>
+        public static void AddActionWorkLedgerItem(Model.Information_ActionWorkLedgerItem ActionWorkLedgerItem)
+        {
+            Model.Information_ActionWorkLedgerItem newActionWorkLedgerItem = new Model.Information_ActionWorkLedgerItem
+            {
+                ActionWorkLedgerItemId = ActionWorkLedgerItem.ActionWorkLedgerItemId,
+                ActionWorkLedgerId = ActionWorkLedgerItem.ActionWorkLedgerId,
+                Focus = ActionWorkLedgerItem.Focus,
+                SpecialTask = ActionWorkLedgerItem.SpecialTask,
+                WorkPoints = ActionWorkLedgerItem.WorkPoints,
+                FillingRequirements = ActionWorkLedgerItem.FillingRequirements,
+                CompletionDeadline = ActionWorkLedgerItem.CompletionDeadline,
+                ImplementationStatus = ActionWorkLedgerItem.ImplementationStatus,
+                SortIndex = ActionWorkLedgerItem.SortIndex
+            };
+            Funs.DB.Information_ActionWorkLedgerItem.InsertOnSubmit(newActionWorkLedgerItem);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 淇敼涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="ActionWorkLedgerItem"></param>
+        public static void UpdateActionWorkLedgerItem(Model.Information_ActionWorkLedgerItem ActionWorkLedgerItem)
+        {
+            Model.Information_ActionWorkLedgerItem newActionWorkLedgerItem = Funs.DB.Information_ActionWorkLedgerItem.FirstOrDefault(e => e.ActionWorkLedgerItemId == ActionWorkLedgerItem.ActionWorkLedgerItemId);
+            if (newActionWorkLedgerItem != null)
+            {
+                newActionWorkLedgerItem.Focus = ActionWorkLedgerItem.Focus;
+                newActionWorkLedgerItem.SpecialTask = ActionWorkLedgerItem.SpecialTask;
+                newActionWorkLedgerItem.WorkPoints = ActionWorkLedgerItem.WorkPoints;
+                newActionWorkLedgerItem.FillingRequirements = ActionWorkLedgerItem.FillingRequirements;
+                newActionWorkLedgerItem.CompletionDeadline = ActionWorkLedgerItem.CompletionDeadline;
+                newActionWorkLedgerItem.ImplementationStatus = ActionWorkLedgerItem.ImplementationStatus;
+                newActionWorkLedgerItem.SortIndex = ActionWorkLedgerItem.SortIndex;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓婚敭鍒犻櫎涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="ActionWorkLedgerItemId"></param>
+        public static void DeleteActionWorkLedgerItemById(string ActionWorkLedgerItemId)
+        {
+            Model.Information_ActionWorkLedgerItem ActionWorkLedgerItem = Funs.DB.Information_ActionWorkLedgerItem.FirstOrDefault(e => e.ActionWorkLedgerItemId == ActionWorkLedgerItemId);
+            if (ActionWorkLedgerItem != null)
+            {
+                Funs.DB.Information_ActionWorkLedgerItem.DeleteOnSubmit(ActionWorkLedgerItem);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处涓昏〃id鍒犻櫎鎵�鏈夌浉鍏虫槑缁嗕俊鎭�
+        /// </summary>
+        /// <param name="ActionWorkLedgerId"></param>
+        public static void DeleteActionWorkLedgerItemList(string ActionWorkLedgerId)
+        {
+            var q = (from x in Funs.DB.Information_ActionWorkLedgerItem where x.ActionWorkLedgerId == ActionWorkLedgerId select x).ToList();
+            if (q != null)
+            {
+                Funs.DB.Information_ActionWorkLedgerItem.DeleteAllOnSubmit(q);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs b/SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs
new file mode 100644
index 00000000..603f472f
--- /dev/null
+++ b/SGGL/BLL/ZHGL/Information/ActionWorkLedgerService.cs
@@ -0,0 +1,113 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+    /// </summary>
+    public static class ActionWorkLedgerService
+    {
+        /// <summary>
+        /// 鏍规嵁涓婚敭鑾峰彇涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        /// <param name="ActionWorkLedgerId"></param>
+        /// <returns></returns>
+        public static Model.Information_ActionWorkLedger GetActionWorkLedgerById(string ActionWorkLedgerId)
+        {
+            return Funs.DB.Information_ActionWorkLedger.FirstOrDefault(e => e.ActionWorkLedgerId == ActionWorkLedgerId);
+        }
+
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        /// <param name="unitId">鍗曚綅Id</param>
+        /// <param name="year">骞村害</param>
+        /// <param name="quarters">瀛ｅ害</param>
+        /// <returns>涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处</returns>
+        public static Model.Information_ActionWorkLedger GetActionWorkLedgerByUnitIdAndYearAndQuarters(string unitId, int year, int quarters)
+        {
+            return Funs.DB.Information_ActionWorkLedger.FirstOrDefault(e => e.UnitId == unitId && e.Quarter == quarters && e.YearId == year);
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍗曚綅Id鑾峰彇瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤闆嗗悎
+        /// </summary>
+        /// <param name="UnitId">鍗曚綅Id</param>
+        /// <returns>瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤闆嗗悎</returns>
+        public static List<Model.View_Information_ActionWorkLedger> GetActionWorkLedgersByUnitId(string UnitId)
+        {
+            return (from x in Funs.DB.View_Information_ActionWorkLedger where x.UnitId == UnitId orderby x.ReportDate descending select x).ToList();
+        }
+
+        /// <summary>
+        /// 娣诲姞涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        /// <param name="ActionWorkLedger"></param>
+        public static void AddActionWorkLedger(Model.Information_ActionWorkLedger ActionWorkLedger)
+        {
+            Model.Information_ActionWorkLedger newActionWorkLedger = new Model.Information_ActionWorkLedger
+            {
+                ActionWorkLedgerId = ActionWorkLedger.ActionWorkLedgerId,
+                UnitId = ActionWorkLedger.UnitId,
+                ReportDate = ActionWorkLedger.ReportDate,
+                YearId = ActionWorkLedger.YearId,
+                Quarter = ActionWorkLedger.Quarter,
+                CompileMan = ActionWorkLedger.CompileMan,
+                UpState = ActionWorkLedger.UpState,
+                HandleState = ActionWorkLedger.HandleState,
+                HandleMan = ActionWorkLedger.HandleMan
+            };
+            Funs.DB.Information_ActionWorkLedger.InsertOnSubmit(newActionWorkLedger);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 淇敼涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        /// <param name="ActionWorkLedger"></param>
+        public static void UpdateActionWorkLedger(Model.Information_ActionWorkLedger ActionWorkLedger)
+        {
+            Model.Information_ActionWorkLedger newActionWorkLedger = Funs.DB.Information_ActionWorkLedger.FirstOrDefault(e => e.ActionWorkLedgerId == ActionWorkLedger.ActionWorkLedgerId);
+            if (newActionWorkLedger != null)
+            {
+                newActionWorkLedger.UnitId = ActionWorkLedger.UnitId;
+                newActionWorkLedger.ReportDate = ActionWorkLedger.ReportDate;
+                newActionWorkLedger.YearId = ActionWorkLedger.YearId;
+                newActionWorkLedger.Quarter = ActionWorkLedger.Quarter;
+                newActionWorkLedger.UpState = ActionWorkLedger.UpState;
+                newActionWorkLedger.HandleState = ActionWorkLedger.HandleState;
+                newActionWorkLedger.HandleMan = ActionWorkLedger.HandleMan;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓婚敭鍒犻櫎涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+        /// </summary>
+        /// <param name="ActionWorkLedgerId"></param>
+        public static void DeleteActionWorkLedgerById(string ActionWorkLedgerId)
+        {
+            Model.Information_ActionWorkLedger ActionWorkLedger = Funs.DB.Information_ActionWorkLedger.FirstOrDefault(e => e.ActionWorkLedgerId == ActionWorkLedgerId);
+            if (ActionWorkLedger != null)
+            {
+                Funs.DB.Information_ActionWorkLedger.DeleteOnSubmit(ActionWorkLedger);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍗曚綅銆佸搴﹁幏鍙栦腑澶紒涓氬畨鍏ㄧ敓浜ф不鏈敾鍧氫笁骞磋鍔ㄥ伐浣滃彴璐�
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <param name="quarter"></param>
+        /// <returns></returns>
+        public static Model.Information_ActionWorkLedger GetActionWorkLedgerByUnitIdDate(string unitId, int yearId, int quarter, string ActionWorkLedgerId)
+        {
+            return Funs.DB.Information_ActionWorkLedger.FirstOrDefault(e => e.UnitId == unitId && e.YearId == yearId && e.Quarter == quarter && ((ActionWorkLedgerId == null && e.ActionWorkLedgerId != null) || e.ActionWorkLedgerId != ActionWorkLedgerId));
+        }
+    }
+}
diff --git a/SGGL/BLL/ZHGL/Information/SafetyProductionEvaluationItemService.cs b/SGGL/BLL/ZHGL/Information/SafetyProductionEvaluationItemService.cs
new file mode 100644
index 00000000..0a0e72bb
--- /dev/null
+++ b/SGGL/BLL/ZHGL/Information/SafetyProductionEvaluationItemService.cs
@@ -0,0 +1,104 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处鏄庣粏琛�
+    /// </summary>
+    public static class SafetyProductionEvaluationItemService
+    {
+        /// <summary>
+        /// 鏍规嵁涓婚敭鑾峰彇涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationItemId"></param>
+        /// <returns></returns>
+        public static Model.Information_SafetyProductionEvaluationItem GetSafetyProductionEvaluationItemById(string SafetyProductionEvaluationItemId)
+        {
+            return Funs.DB.Information_SafetyProductionEvaluationItem.FirstOrDefault(e => e.SafetyProductionEvaluationItemId == SafetyProductionEvaluationItemId);
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处Id鑾峰彇鎵�鏈夌浉鍏虫槑缁嗕俊鎭�
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationId"></param>
+        /// <returns></returns>
+        public static List<Model.Information_SafetyProductionEvaluationItem> GetSafetyProductionEvaluationItemList(string SafetyProductionEvaluationId)
+        {
+            return (from x in Funs.DB.Information_SafetyProductionEvaluationItem where x.SafetyProductionEvaluationId == SafetyProductionEvaluationId orderby x.SortIndex select x).ToList();
+        }
+
+        /// <summary>
+        /// 娣诲姞涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationItem"></param>
+        public static void AddSafetyProductionEvaluationItem(Model.Information_SafetyProductionEvaluationItem SafetyProductionEvaluationItem)
+        {
+            Model.Information_SafetyProductionEvaluationItem newSafetyProductionEvaluationItem = new Model.Information_SafetyProductionEvaluationItem
+            {
+                SafetyProductionEvaluationItemId = SafetyProductionEvaluationItem.SafetyProductionEvaluationItemId,
+                SafetyProductionEvaluationId = SafetyProductionEvaluationItem.SafetyProductionEvaluationId,
+                Type = SafetyProductionEvaluationItem.Type,
+                EvaluateWork = SafetyProductionEvaluationItem.EvaluateWork,
+                EvaluationContent = SafetyProductionEvaluationItem.EvaluationContent,
+                FillingRequirements = SafetyProductionEvaluationItem.FillingRequirements,
+                CompletionDeadline = SafetyProductionEvaluationItem.CompletionDeadline,
+                ImplementationStatus = SafetyProductionEvaluationItem.ImplementationStatus,
+                SortIndex = SafetyProductionEvaluationItem.SortIndex
+            };
+            Funs.DB.Information_SafetyProductionEvaluationItem.InsertOnSubmit(newSafetyProductionEvaluationItem);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 淇敼涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationItem"></param>
+        public static void UpdateSafetyProductionEvaluationItem(Model.Information_SafetyProductionEvaluationItem SafetyProductionEvaluationItem)
+        {
+            Model.Information_SafetyProductionEvaluationItem newSafetyProductionEvaluationItem = Funs.DB.Information_SafetyProductionEvaluationItem.FirstOrDefault(e => e.SafetyProductionEvaluationItemId == SafetyProductionEvaluationItem.SafetyProductionEvaluationItemId);
+            if (newSafetyProductionEvaluationItem != null)
+            {
+                newSafetyProductionEvaluationItem.Type = SafetyProductionEvaluationItem.Type;
+                newSafetyProductionEvaluationItem.EvaluateWork = SafetyProductionEvaluationItem.EvaluateWork;
+                newSafetyProductionEvaluationItem.EvaluationContent = SafetyProductionEvaluationItem.EvaluationContent;
+                newSafetyProductionEvaluationItem.FillingRequirements = SafetyProductionEvaluationItem.FillingRequirements;
+                newSafetyProductionEvaluationItem.CompletionDeadline = SafetyProductionEvaluationItem.CompletionDeadline;
+                newSafetyProductionEvaluationItem.ImplementationStatus = SafetyProductionEvaluationItem.ImplementationStatus;
+                newSafetyProductionEvaluationItem.SortIndex = SafetyProductionEvaluationItem.SortIndex;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓婚敭鍒犻櫎涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处鏄庣粏淇℃伅
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationItemId"></param>
+        public static void DeleteSafetyProductionEvaluationItemById(string SafetyProductionEvaluationItemId)
+        {
+            Model.Information_SafetyProductionEvaluationItem SafetyProductionEvaluationItem = Funs.DB.Information_SafetyProductionEvaluationItem.FirstOrDefault(e => e.SafetyProductionEvaluationItemId == SafetyProductionEvaluationItemId);
+            if (SafetyProductionEvaluationItem != null)
+            {
+                Funs.DB.Information_SafetyProductionEvaluationItem.DeleteOnSubmit(SafetyProductionEvaluationItem);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处涓昏〃id鍒犻櫎鎵�鏈夌浉鍏虫槑缁嗕俊鎭�
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationId"></param>
+        public static void DeleteSafetyProductionEvaluationItemList(string SafetyProductionEvaluationId)
+        {
+            var q = (from x in Funs.DB.Information_SafetyProductionEvaluationItem where x.SafetyProductionEvaluationId == SafetyProductionEvaluationId select x).ToList();
+            if (q != null)
+            {
+                Funs.DB.Information_SafetyProductionEvaluationItem.DeleteAllOnSubmit(q);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/ZHGL/Information/SafetyProductionEvaluationService.cs b/SGGL/BLL/ZHGL/Information/SafetyProductionEvaluationService.cs
new file mode 100644
index 00000000..ba36d562
--- /dev/null
+++ b/SGGL/BLL/ZHGL/Information/SafetyProductionEvaluationService.cs
@@ -0,0 +1,113 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+    /// </summary>
+    public static class SafetyProductionEvaluationService
+    {
+        /// <summary>
+        /// 鏍规嵁涓婚敭鑾峰彇涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationId"></param>
+        /// <returns></returns>
+        public static Model.Information_SafetyProductionEvaluation GetSafetyProductionEvaluationById(string SafetyProductionEvaluationId)
+        {
+            return Funs.DB.Information_SafetyProductionEvaluation.FirstOrDefault(e => e.SafetyProductionEvaluationId == SafetyProductionEvaluationId);
+        }
+
+        /// <summary>
+        /// 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+        /// </summary>
+        /// <param name="unitId">鍗曚綅Id</param>
+        /// <param name="year">骞村害</param>
+        /// <param name="quarters">瀛ｅ害</param>
+        /// <returns>涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处</returns>
+        public static Model.Information_SafetyProductionEvaluation GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(string unitId, int year, int quarters)
+        {
+            return Funs.DB.Information_SafetyProductionEvaluation.FirstOrDefault(e => e.UnitId == unitId && e.Quarter == quarters && e.YearId == year);
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍗曚綅Id鑾峰彇瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤闆嗗悎
+        /// </summary>
+        /// <param name="UnitId">鍗曚綅Id</param>
+        /// <returns>瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤闆嗗悎</returns>
+        public static List<Model.View_Information_SafetyProductionEvaluation> GetSafetyProductionEvaluationsByUnitId(string UnitId)
+        {
+            return (from x in Funs.DB.View_Information_SafetyProductionEvaluation where x.UnitId == UnitId orderby x.ReportDate descending select x).ToList();
+        }
+
+        /// <summary>
+        /// 娣诲姞涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+        /// </summary>
+        /// <param name="SafetyProductionEvaluation"></param>
+        public static void AddSafetyProductionEvaluation(Model.Information_SafetyProductionEvaluation SafetyProductionEvaluation)
+        {
+            Model.Information_SafetyProductionEvaluation newSafetyProductionEvaluation = new Model.Information_SafetyProductionEvaluation
+            {
+                SafetyProductionEvaluationId = SafetyProductionEvaluation.SafetyProductionEvaluationId,
+                UnitId = SafetyProductionEvaluation.UnitId,
+                ReportDate = SafetyProductionEvaluation.ReportDate,
+                YearId = SafetyProductionEvaluation.YearId,
+                Quarter = SafetyProductionEvaluation.Quarter,
+                CompileMan = SafetyProductionEvaluation.CompileMan,
+                UpState = SafetyProductionEvaluation.UpState,
+                HandleState = SafetyProductionEvaluation.HandleState,
+                HandleMan = SafetyProductionEvaluation.HandleMan
+            };
+            Funs.DB.Information_SafetyProductionEvaluation.InsertOnSubmit(newSafetyProductionEvaluation);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 淇敼涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+        /// </summary>
+        /// <param name="SafetyProductionEvaluation"></param>
+        public static void UpdateSafetyProductionEvaluation(Model.Information_SafetyProductionEvaluation SafetyProductionEvaluation)
+        {
+            Model.Information_SafetyProductionEvaluation newSafetyProductionEvaluation = Funs.DB.Information_SafetyProductionEvaluation.FirstOrDefault(e => e.SafetyProductionEvaluationId == SafetyProductionEvaluation.SafetyProductionEvaluationId);
+            if (newSafetyProductionEvaluation != null)
+            {
+                newSafetyProductionEvaluation.UnitId = SafetyProductionEvaluation.UnitId;
+                newSafetyProductionEvaluation.ReportDate = SafetyProductionEvaluation.ReportDate;
+                newSafetyProductionEvaluation.YearId = SafetyProductionEvaluation.YearId;
+                newSafetyProductionEvaluation.Quarter = SafetyProductionEvaluation.Quarter;
+                newSafetyProductionEvaluation.UpState = SafetyProductionEvaluation.UpState;
+                newSafetyProductionEvaluation.HandleState = SafetyProductionEvaluation.HandleState;
+                newSafetyProductionEvaluation.HandleMan = SafetyProductionEvaluation.HandleMan;
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁涓婚敭鍒犻櫎涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationId"></param>
+        public static void DeleteSafetyProductionEvaluationById(string SafetyProductionEvaluationId)
+        {
+            Model.Information_SafetyProductionEvaluation SafetyProductionEvaluation = Funs.DB.Information_SafetyProductionEvaluation.FirstOrDefault(e => e.SafetyProductionEvaluationId == SafetyProductionEvaluationId);
+            if (SafetyProductionEvaluation != null)
+            {
+                Funs.DB.Information_SafetyProductionEvaluation.DeleteOnSubmit(SafetyProductionEvaluation);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍗曚綅銆佸搴﹁幏鍙栦腑澶紒涓氬畨鍏ㄧ敓浜х鐞嗚瘎浠峰伐浣滆皟搴﹀彴璐�
+        /// </summary>
+        /// <param name="unitId"></param>
+        /// <param name="quarter"></param>
+        /// <returns></returns>
+        public static Model.Information_SafetyProductionEvaluation GetSafetyProductionEvaluationByUnitIdDate(string unitId, int yearId, int quarter, string SafetyProductionEvaluationId)
+        {
+            return Funs.DB.Information_SafetyProductionEvaluation.FirstOrDefault(e => e.UnitId == unitId && e.YearId == yearId && e.Quarter == quarter && ((SafetyProductionEvaluationId == null && e.SafetyProductionEvaluationId != null) || e.SafetyProductionEvaluationId != SafetyProductionEvaluationId));
+        }
+    }
+}
diff --git a/SGGL/BLL/app.config b/SGGL/BLL/app.config
index 39f6fcea..11911cae 100644
--- a/SGGL/BLL/app.config
+++ b/SGGL/BLL/app.config
@@ -61,4 +61,4 @@
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx b/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx
index a8827aaf..d3a3b96f 100644
--- a/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx
+++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditing.aspx
@@ -201,7 +201,7 @@
                         fileInfo: {
                             name: '',
                             ext: '',
-                            primary: '',
+                            primary: urlString,
                             creator: '',
                             createTime: new Date('20210505')
                         },
diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx
new file mode 100644
index 00000000..f2e33906
--- /dev/null
+++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx
@@ -0,0 +1,300 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OnlineEditingPrivate.aspx.cs" Inherits="FineUIPro.Web.AttachFile.OnlineEditingPrivate" %>
+<%@ Import Namespace="BLL" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="icon" href="/favicon.ico" type="image/x-icon" />
+    <title>
+        Spire.Office
+    </title>
+
+    <style>
+        html {
+            height: 100%;
+            width: 100%;
+        }
+
+        body {
+            background: #fff;
+            color: #333;
+            font-family: Arial, Tahoma, sans-serif;
+            font-size: 12px;
+            font-weight: normal;
+            height: 100%;
+            margin: 0;
+            overflow-y: hidden;
+            padding: 0;
+            text-decoration: none;
+        }
+
+        form {
+            height: 100%;
+        }
+
+        div {
+            margin: 0;
+            padding: 0;
+        }
+    </style>
+
+    <script language="javascript" type="text/javascript"
+        src="https://lygcgs.com.cn:8060/web/editors/spireapi/SpireCloudEditor.js"></script>
+
+    <script type="text/javascript" language="javascript">
+        var docEditor;
+        var fileName = "";
+        var lang = "zh";
+        var fileType = "";
+        var token = null;
+        var appid = null;
+        var appkey = null;
+        //console.log(Appid + "---" + appkey);
+        var innerAlert = function (message) {
+            if (console && console.log)
+                console.log(message);
+        };
+
+        var onReady = function () {
+            innerAlert("Document editor ready");
+
+        };
+
+        var onDocumentStateChange = function (event) {
+            var title = document.title.replace(/\*$/g, "");
+            document.title = title + (event.data ? "*" : "");
+        };
+
+        var onRequestEditRights = function () {
+            location.href = location.href.replace(RegExp("action=view\&?", "i"), "");
+        };
+
+        var onError = function (event) {
+            if (event)
+                innerAlert(event.data);
+        };
+
+        var onOutdatedVersion = function (event) {
+            location.reload(true);
+        };
+
+        function ajax(options) {
+            options = options || {};
+            var method = (options.type || "GET").toUpperCase(),
+                url = options.url,
+                queryString = null;
+            if (!url)
+                return;
+            if (options.data) {
+                queryString = [];
+                for (var attr in options.data) {
+                    queryString.push(attr + "=" + options.data[attr]);
+                }
+                queryString = queryString.join("&");
+            }
+            if (method === "GET" && queryString) {
+                url += "?" + queryString;
+                queryString = "";
+            }
+            var xhr = new XMLHttpRequest();
+            xhr.open(method, url, true);
+            if (method === "POST")
+                xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+            xhr.setRequestHeader("token", "<%=this.CurrUser.UserId%>");
+            xhr.send(queryString);
+            xhr.onreadystatechange = function () {
+                if (xhr.readyState === 4) {
+                    if (xhr.status === 200) {
+                        var data = xhr.responseText;
+                        if (options.dataType === "json")
+                            data = JSON.parse(data);
+                        options.success && options.success(data);
+                    } else {
+                        options.error && options.error(xhr.status);
+                    }
+                }
+            }
+        }
+        var callbackfn = function (result) {
+            console.log(result.data);
+            if (result && result.data) {
+                var data = result.data,
+                    fileName = data[0],
+                    url = data[1];
+                if (fileName.indexOf('=') > -1)
+                    fileName = fileName.split('=')[1];
+                var host = location.hostname;
+                ajax({
+                    url: '<%=CallBackUrl%>',
+                    type: 'post',
+                    data: {
+                        'UrlStr': url,
+                        'PCUrl': '<%=PCUrl%>',
+                    },
+                    dataType: 'json',
+                    async: false,
+                    success: function (json) {
+                        if (json.code == 1 || json.code == '1') {
+                            alert('淇濆瓨鎴愬姛');
+                        } else {
+                            this.error(json, '淇濆瓨澶辫触');
+                        }
+                    },
+                    error: function (json, msg) {
+                        alert(+msg);
+                    }
+                });
+            }
+        };
+        var connectEditor = function () {
+            var type = 'desktop';
+            if (type == "desktop") {
+                var app = navigator.appVersion;
+                if (app.toLowerCase().indexOf('window') != -1) {
+                    type = "desktop";
+                } else {
+                    type = "mobile";
+                }
+            };
+        // var urlString = "https://cloud.e-iceblue.cn/demo/sample.docx";
+           <%-- //var urlString = "<%=BLL.Funs.SGGLUrl%>" + "<%=PCUrl%>";--%>
+            var urlString =   "<%=urlString%>";
+
+            var arrfn = urlString.split(".");
+            var strp = arrfn[arrfn.length - 1];
+            var documentTypeValue = null;
+            switch (strp) {
+                case "xls":
+                case "xlsx":
+                case "xlsm":
+                case "xlt":
+                case "xltx":
+                case "xltm":
+                case "ods":
+                case "fods":
+                case "ots":
+                case "csv":
+                    documentTypeValue = "spreadsheet";
+                    break;
+                case "pps":
+                case "ppsx":
+                case "ppsm":
+                case "ppt":
+                case "pptx":
+                case "pptm":
+                case "pot":
+                case "potx":
+                case "potm":
+                case "odp":
+                case "fodp":
+                case "otp":
+                    documentTypeValue = "presentation";
+                    break;
+                default:
+                    documentTypeValue = "document";
+                    break;
+            }
+
+            docEditor = new SpireCloudEditor.OpenApi("iframeEditor", {
+                fileAttrs: {
+                    fileInfo: {
+                        name: '',
+                        ext: '',
+                        primary: '<%=urlStringMD5%>',
+                        creator: '',
+                        createTime: new Date('20210505')
+                    },
+                    sourceUrl: urlString,
+                    createUrl: '',
+                    callbackUrl: '', ////This item can be empty, but only if the 'onSave' callback function must be defined in events. If the callback function is undefined and this item is empty, Cloud Editor will not provide save function.
+                    verification: null, //鐢ㄦ埛鏂囦欢绯荤粺涓嬭浇鏂囦欢鏃惰嫢闇�瑕侀獙璇佺被浼紅oken鐨勬暟鎹彲浠ュ啓鍦ㄨ繖閲�
+                    canEdit: true
+                },
+                templates: "",
+                whiteLabel: true,
+                user: {
+                    primary: '',
+                    name: '<%=this.CurrUser.UserName%>',
+                    canSave: true,
+                    customization: {
+                        public: {
+                            common: {
+                                whiteLabel: true,
+                                defaultZoom: 1,
+                                openReviewChanges: false,
+                                permGroups: ['everyone'], //闄愬埗缂栬緫鍒嗙粍
+                                viewVersion: false,
+                                header: {
+                                    hideTitle: false,
+                                    defaultView: 'full'
+                                }
+                            },
+                            word: null, //doc瀹氬埗
+                            powerpoint: null, //ppt瀹氬埗
+                            excel: null //xls瀹氬埗
+                        },
+                        "private": {
+                            "token": null,
+                            "appid": null,
+                            "appkey": null
+                        }
+                    }
+                },
+                editorAttrs: { //缂栬緫鍣ㄩ厤缃�
+                    editorWidth: '100%',
+                    editorHeight: '100%',
+                    editorMode: '<%=editorMode%>',
+                    editorType: 'document', //缂栬緫鍣ㄧ被鍨嬶紝鍙笉閰嶇疆锛岀▼搴忔牴鎹枃浠剁被鍨嬭幏鍙栵紝缁撴灉涓� document,presentation,spreadsheet
+                    platform: 'windows', //缂栬緫鍣ㄥ钩鍙扮被鍨嬶紝鍙�墂indows锛� mobile锛� embedded
+                    viewLanguage: 'zh', //骞冲彴鐣岄潰灞曠ず璇█鍙�塭n/zh
+                    canChat: true, //鏄惁鍙亰澶�
+                    canComment: true, //鏄惁鍙壒娉�
+                    canReview: true,
+                    canDownload: true,
+                    canForcesave: true,
+                    embedded: {
+                        saveUrl: '',
+                        embedUrl: '',
+                        shareUrl: ''
+                    },
+                    events: {
+                        'onReady': onReady,
+                        'onDocumentStateChange': onDocumentStateChange,
+                        'onError': onError,
+                        'onRequestEditRights': onRequestEditRights,
+                        'onOutdatedVersion': onOutdatedVersion,
+                        'onSave': callbackfn
+                    }
+                }
+            },
+                appid,
+                appkey
+            );
+        };
+        if (window.addEventListener) {
+            window.addEventListener("load", connectEditor);
+        } else if (window.attachEvent) {
+            window.attachEvent("load", connectEditor);
+        }
+    </script>
+</head>
+
+<body>
+    <form name="form1" method="post" action="./docEditor.aspx?fileID=demo+(2).docx&lang=zh" id="form1">
+        <div>
+            <input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE"
+                value="/wEPDwUKMTkyMjc5MTU4M2RkBQQQBsVcOHQbzTlwYapiES2Trc9Z/U4CC+r9rluZubc=" />
+        </div>
+        <div>
+            <input type="hidden" name="__VIEWSTATEGENERATOR" id="__VIEWSTATEGENERATOR" value="C2EAC0DE" />
+        </div>
+        <div id="iframeEditor">
+        </div>
+    </form>
+</body>
+
+</html>
+
diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs
new file mode 100644
index 00000000..78b061e3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs
@@ -0,0 +1,82 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
+
+namespace FineUIPro.Web.AttachFile
+{
+    public partial class OnlineEditingPrivate : PageBase
+    {
+        #region 瀹氫箟鍙傛暟
+
+        public string CallBackUrl
+        {
+            get
+            {
+                var sysSet = (from x in Funs.DB.Sys_Const where x.ConstText == "OnlineEditCallBackurl" select x).ToList().FirstOrDefault();
+                if (sysSet != null)
+                {
+                    return sysSet.ConstValue;
+                }
+                else
+                {
+                    return "";
+                }
+            }
+        }
+        public string ReadOnly
+        {
+            get
+            {
+                return (string)ViewState["ReadOnly"];
+            }
+            set
+            {
+                ViewState["ReadOnly"] = value;
+            }
+        }
+        public string PCUrl
+        {
+            get
+            {
+                return (string)ViewState["PCUrl"];
+            }
+            set
+            {
+                ViewState["PCUrl"] = value;
+            }
+        }
+        public string editorMode
+        {
+            get
+            {
+                return (string)ViewState["editorMode"];
+            }
+            set
+            {
+                ViewState["editorMode"] = value;
+            }
+        }
+        public string urlString = String.Empty;
+        public string urlStringMD5 = String.Empty;
+        #endregion
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                /*UserId = Request.Params["UserId"];
+                AttachFileId = Request.Params["AttachFileId"];
+                ReadOnly = Request.Params["ReadOnly"];*/
+                PCUrl = Request.Params["fileUrl"];
+                editorMode = Request.Params["editorMode"];
+
+                urlString = Funs.SGGLUrl + PCUrl;
+                urlStringMD5 = Funs.GetMD5(urlString);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.designer.cs b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.designer.cs
new file mode 100644
index 00000000..56ed2427
--- /dev/null
+++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.designer.cs
@@ -0,0 +1,17 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.AttachFile
+{
+
+
+    public partial class OnlineEditingPrivate
+    {
+    }
+}
diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
index 3333ace5..4d5fc9b1 100644
--- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
+++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs
@@ -968,7 +968,17 @@ namespace FineUIPro.Web.AttachFile
                         if (isSupportType)
                         {
                             url = url.Replace(Funs.RootPath, "");
-                            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../AttachFile/OnlineEditing.aspx?fileUrl={0}&&editorMode={1}", url, editorMode, "缂栬緫  -")));
+                            var sysSet4 = (from x in Funs.DB.Sys_Const where x.ConstText == "IsUseLoaclService" select x).ToList().FirstOrDefault();
+                            if (sysSet4!=null&& sysSet4.ConstValue=="1")
+                            {
+                                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../AttachFile/OnlineEditingPrivate.aspx?fileUrl={0}&&editorMode={1}", url, editorMode, "缂栬緫  -")));
+
+                            }
+                            else
+                            {
+                                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../AttachFile/OnlineEditing.aspx?fileUrl={0}&&editorMode={1}", url, editorMode, "缂栬緫  -")));
+
+                            }
                         }
                         else
                         {
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
index 91601a21..838acfdf 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
@@ -59,7 +59,7 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center">
+                        <f:TemplateField ColumnID="tfPageIndex" Width="80px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
index 2360fcd0..3edb1a77 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
@@ -490,7 +490,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                             Ins.TestCycle = pds.Rows[i][7].ToString().Trim();
 
-                            Ins.IsOnSite = pds.Rows[i][8].ToString().Trim() == "鏄�" ? true : false;
+                            Ins.IsVerification = pds.Rows[i][8].ToString().Trim() == "鏄�" ? true : false;
 
                             if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
                             {
@@ -542,7 +542,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
 
                             oldViewInfo.TestCycle = pds.Rows[i][7].ToString().Trim();
 
-                            oldViewInfo.IsOnSite = pds.Rows[i][8].ToString().Trim() == "鏄�" ? true : false;
+                            oldViewInfo.IsVerification = pds.Rows[i][8].ToString().Trim() == "鏄�" ? true : false;
 
                             if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
                             {
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
index 60ca2d1f..d91d6e0f 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
@@ -16,7 +16,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            if (!IsPostBack) {
+            if (!IsPostBack)
+            {
                 Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
                 this.txtStartDate.Text = "2015-01-01";
                 this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
@@ -104,8 +105,11 @@ namespace FineUIPro.Web.CQMS.ManageReport
                     NCRStatisc.Num = i;
                     NCRStatisc.WorkName = item.ProfessionalName;
                     NCRStatisc.CheckNum = managementList.Count();
-                    NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
-                    NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
+                    //NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
+                    //NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
+                    int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("宸查棴鍚�")).Count();
+                    NCRStatisc.OKNum = okNum;
+                    NCRStatisc.NotOKNum = managementList.Count() - okNum;
                     NCRStatisc.Remark = "";
                     if (NCRStatisc.CheckNum != 0)//琚櫎鏁颁笉鑳戒负闆�
                     {
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
index 1b5f32b6..58c8016d 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
@@ -916,7 +916,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                                 u.UnitId,
                                 u.UnitName,
                                 c.IssuedDate,
-                                c.Status
+                                c.Status,
+                                c.ImplementationFrontState,
 
                             };
 
@@ -926,8 +927,10 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
                 NCRStatisc.Num = i;
                 NCRStatisc.WorkName = item.UnitName;
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
-                NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
+                //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("宸查棴鍚�")).Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("宸查棴鍚�")).Count();
                 NCRStatisc.CheckNum = AllList.Count();
                 if (NCRStatisc.CheckNum != 0)//琚櫎鏁颁笉鑳戒负闆�
                 {
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index c4149d2b..d451cdfa 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         #endregion
 
         #region 鍔犺浇鎵�鏈夊崟浣�
+        [Serializable]
         public class UnitClass {
             public string UnitId { get; set; }
             public string UnitName { get; set; }
@@ -72,16 +73,40 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             public string UnitType { get; set; }
         }
 
-        public List<UnitClass> units = new List<UnitClass>();
+        //public List<UnitClass> units = new List<UnitClass>();
+
+        public List<UnitClass> units
+        {
+            get
+            {
+                return (List<UnitClass>)ViewState["units"];
+            }
+            set
+            {
+                ViewState["units"] = value;
+            }
+        }
         #endregion
 
         #region 鍔犺浇鎵�鏈変笓涓�
+        [Serializable]
         public class ProfessionalsClass {
             public string CNProfessionalId { get; set; }
             public string ProfessionalName { get; set; }
         }
 
-        public List<ProfessionalsClass> CNProfessionals = new List<ProfessionalsClass>();
+        //public List<ProfessionalsClass> CNProfessionals = new List<ProfessionalsClass>();
+        public List<ProfessionalsClass> CNProfessionals
+        {
+            get
+            {
+                return (List<ProfessionalsClass>)ViewState["CNProfessionals"];
+            }
+            set
+            {
+                ViewState["CNProfessionals"] = value;
+            }
+        }
         #endregion
 
         #region 鍔犺浇椤甸潰
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
index e1faeafe..bec70518 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
@@ -25,7 +25,18 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             if (!IsPostBack)
             {
                 GetButtonPower();
-                BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//涓撲笟
+                if (this.CurrUser.UserId == BLL.Const.hfnbdId)
+                {
+                    this.drpCNProfessional.DataTextField = "DetectionItems";
+                    this.drpCNProfessional.DataValueField = "ControlId";
+                    this.drpCNProfessional.DataSource = BLL.CNProfessionalService.GetCnProList();
+                    this.drpCNProfessional.DataBind();
+                    Funs.FineUIPleaseSelect(this.drpCNProfessional);
+                }
+                else
+                {
+                    BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessional, true);//涓撲笟
+                }
                 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//鏂藉伐鍒嗗寘鍟�
                 BindGrid();
             }
@@ -36,13 +47,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// </summary>
         public void BindGrid()
         {
-            string strSql = @"SELECT P.InspectionId, 
+            if (this.CurrUser.UserId==BLL.Const.hfnbdId)
+            {
+
+                string strSql = @"SELECT P.InspectionId, 
                                     P.ProjectId,
                                     P.UnitId,
                                     P.CNProfessionalId,
                                     P.UnitWorkId,
                                     U.UnitName,
-                                    C.ProfessionalName,
+                                    C.DetectionItems as ProfessionalName,
                                     P.NoticeCode,
                                     UnitWork.UnitWorkName,
                                     DP.DivisionName AS Branch,
@@ -50,42 +64,96 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                                     BP.Class,
                                     P.AcceptanceSite,
                                     P.AcceptanceCheckMan"
-                            + @" FROM ProcessControl_InspectionManagement AS P"
-                            + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId"
-                            + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId"
-                            + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId"
-                            + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch"
-                            + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType"
-                            + @" WHERE P.ProjectId=@ProjectId ";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            if (drpUnit.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND P.UnitId=@UnitId";
-                listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
+                                + @" FROM ProcessControl_InspectionManagement AS P"
+                                + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId"
+                                + @" LEFT JOIN Control_PointCropping C ON C.ControlId = P.CNProfessionalId"
+                                + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId"
+                                + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch"
+                                + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType"
+                                + @" WHERE P.ProjectId=@ProjectId ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                if (drpUnit.SelectedValue != BLL.Const._Null)
+                {
+                    strSql += " AND P.UnitId=@UnitId";
+                    listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
+                }
+                if (drpCNProfessional.SelectedValue != BLL.Const._Null)
+                {
+                    strSql += " AND P.CNProfessionalId=@CNProfessionalId";
+                    listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+                {
+                    strSql += " AND P.InspectionDate >= @startTime";
+                    listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+                }
+                if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+                {
+                    strSql += " AND P.InspectionDate <= @endTime";
+                    listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
             }
-            if (drpCNProfessional.SelectedValue != BLL.Const._Null)
+            else
             {
-                strSql += " AND P.CNProfessionalId=@CNProfessionalId";
-                listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue));
+                string strSql = @"SELECT P.InspectionId, 
+                                    P.ProjectId,
+                                    P.UnitId,
+                                    P.CNProfessionalId,
+                                    P.UnitWorkId,
+                                    U.UnitName,
+                                    C.ProfessionalName as ProfessionalName,
+                                    P.NoticeCode,
+                                    UnitWork.UnitWorkName,
+                                    DP.DivisionName AS Branch,
+                                    BP.BreakdownName AS ControlPointType,
+                                    BP.Class,
+                                    P.AcceptanceSite,
+                                    P.AcceptanceCheckMan"
+                                + @" FROM ProcessControl_InspectionManagement AS P"
+                                + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId"
+                                + @" left join Base_CNProfessional c on c.CNProfessionalId = P.CNProfessionalId"
+                                + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId"
+                                + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch"
+                                + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType"
+                                + @" WHERE P.ProjectId=@ProjectId ";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+                if (drpUnit.SelectedValue != BLL.Const._Null)
+                {
+                    strSql += " AND P.UnitId=@UnitId";
+                    listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
+                }
+                if (drpCNProfessional.SelectedValue != BLL.Const._Null)
+                {
+                    strSql += " AND P.CNProfessionalId=@CNProfessionalId";
+                    listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessional.SelectedValue));
+                }
+                if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+                {
+                    strSql += " AND P.InspectionDate >= @startTime";
+                    listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+                }
+                if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+                {
+                    strSql += " AND P.InspectionDate <= @endTime";
+                    listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+                }
+                SqlParameter[] parameter = listStr.ToArray();
+                DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+                Grid1.RecordCount = tb.Rows.Count;
+                //tb = GetFilteredTable(Grid1.FilteredData, tb);
+                var table = this.GetPagedDataTable(Grid1, tb);
+                Grid1.DataSource = table;
+                Grid1.DataBind();
             }
-            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
-            {
-                strSql += " AND P.InspectionDate >= @startTime";
-                listStr.Add(new SqlParameter("@startTime", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
-            {
-                strSql += " AND P.InspectionDate <= @endTime";
-                listStr.Add(new SqlParameter("@endTime", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
-            }
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            Grid1.RecordCount = tb.Rows.Count;
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
-            Grid1.DataBind();
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx
index 6d83600f..6dbf5b0d 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx
@@ -15,79 +15,56 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="drpUnit" runat="server" Label="鏂藉伐鍒嗗寘鍟�" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px" >
+                        <f:DropDownList ID="drpUnit" runat="server" Label="鏂藉伐鍒嗗寘鍟�" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px">
                         </f:DropDownList>
-                        <f:DropDownList ID="drpCNProfessionalId" runat="server" Label="涓撲笟" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px" ></f:DropDownList>
+                        <f:DropDownList ID="drpCNProfessionalId" runat="server" Label="涓撲笟" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px"></f:DropDownList>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtNoticeCode" runat="server" Label="鍏辨閫氱煡鍗曠紪鍙�" MaxLength="50" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px" ></f:TextBox>
-                        <f:TextBox runat="server" ID="txtAcceptanceSite" Label="楠屾敹閮ㄤ綅"  LabelAlign="Right" LabelWidth="130px" ></f:TextBox>
+                        <f:TextBox ID="txtNoticeCode" runat="server" Label="鍏辨閫氱煡鍗�" MaxLength="50" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
+                        <f:DropDownList ID="drpUnitWorkId" runat="server" Label="鍗曚綅宸ョ▼" LabelAlign="Right" LabelWidth="130px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWorkId_SelectedIndexChanged" Hidden="true"></f:DropDownList>
                     </Items>
                 </f:FormRow>
-                <%--<f:FormRow ColumnWidths="95% 5%">
+                <f:FormRow ID="fr1" runat="server" Hidden="true">
                     <Items>
-                        <f:TextBox ID="txtUnitWork" Label="鍗曚綅宸ョ▼鍚嶇О" runat="server" Readonly="true" LabelAlign="Right" LabelWidth="130px">
-                        </f:TextBox>
-                        <f:Button ID="btnSearch" OnClick="btnSearch_Click" ToolTip="鎼滅储" Icon="Find" EnablePostBack="true" runat="server">
+                        <f:DropDownList ID="drpChirldUnitWorkId" runat="server" Label="瀛愬崟浣嶅伐绋�" LabelAlign="Right" LabelWidth="130px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpChirldUnitWorkId_SelectedIndexChanged"></f:DropDownList>
+                        <f:DropDownList ID="drpBranch" runat="server" Label="鍒嗛儴宸ョ▼" LabelAlign="Right" LabelWidth="130px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpBranch_SelectedIndexChanged"></f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="fr2" runat="server" Hidden="true">
+                    <Items>
+                        <f:DropDownList ID="drpChildBranch" runat="server" Label="瀛愬垎閮ㄥ伐绋�" LabelAlign="Right" LabelWidth="130px" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpChildBranch_SelectedIndexChanged"></f:DropDownList>
+                        <f:DropDownList ID="drpProEngineering" runat="server" Label="鍒嗛」宸ョ▼" LabelAlign="Right" LabelWidth="130px" EnableEdit="true"></f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox runat="server" ID="txtAcceptanceSite" Label="楠屾敹閮ㄤ綅" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ColumnWidths="50% 10% 30%">
+                    <Items>
+                        <f:DropDownList ID="drpAcceptanceCheckMan" runat="server" Label="妫�鏌ヤ汉" EnableCheckBoxSelect="true" LabelWidth="130px"
+                            EnableMultiSelect="true">
+                        </f:DropDownList>
+                        <f:Label ID="Label1" runat="server" Label="涓婁紶闄勪欢"
+                            LabelWidth="130px" LabelAlign="Right">
+                        </f:Label>
+                        <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="闄勪欢" runat="server" OnClick="btnAttach_Click">
                         </f:Button>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox runat="server" ID="txtBranch" Label="鍒嗛儴" Readonly="true" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextBox runat="server" ID="txtControlPointType" Label="鎺у埗鐐瑰唴瀹�"  LabelAlign="Right" LabelWidth="130px" Readonly="true"></f:TextBox>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:TextBox runat="server" ID="txtClass" Label="鎺у埗鐐圭瓑绾�"  LabelAlign="Right" LabelWidth="130px" Readonly="true"></f:TextBox>
-                    </Items>
-                </f:FormRow>--%>
-                <f:FormRow ColumnWidths="50% 10% 30%">
-                    <Items>
-                          <f:DropDownList ID="drpAcceptanceCheckMan"  runat="server" Label="妫�鏌ヤ汉" EnableCheckBoxSelect="true" LabelWidth="130px"
-                        EnableMultiSelect="true">
-                    </f:DropDownList>
-                       <%-- <f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="妫�鏌ヤ汉"  LabelAlign="Right" LabelWidth="130px" ></f:TextBox>--%>
-                        <f:Label ID="Label1" runat="server" Label="涓婁紶闄勪欢"   
-                                    LabelWidth="130px" LabelAlign="Right" >
-                                </f:Label>
-                                <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="闄勪欢" runat="server" OnClick="btnAttach_Click" >
-                                </f:Button>
-                    </Items>
-                </f:FormRow>
-                 
-                <f:FormRow>
-                    <Items>
-                        
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
-                            <Items>
-                                
-                            </Items>
-                        </f:Panel>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow>
-                    <Items>
-                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="鍏辨鍐呭鍒楄〃" EnableCollapse="false" runat="server" 
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="鍏辨鍐呭鍒楄〃" EnableCollapse="false" runat="server"
                             BoxFlex="1" DataKeyNames="InspectionDetailId,ControlPointType" AllowCellEditing="true" EnableColumnLines="true"
                             ClicksToEdit="1" DataIDField="InspectionDetailId" OnRowCommand="Grid1_RowCommand" AllowSorting="true" ForceFit="true" SortField="CreateDate"
-                            EnableTextSelection="True" >
+                            EnableTextSelection="True">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar4" ToolbarAlign="Right" runat="server">
                                     <Items>
@@ -98,8 +75,7 @@
                             </Toolbars>
                             <Columns>
                                 <f:RowNumberField Width="40px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center" />
-                                <f:TemplateField ColumnID="UnitWork" Width="120px" HeaderText="鍗曚綅宸ョ▼鍚嶇О" HeaderTextAlign="Center" TextAlign="Center"
-                                    >
+                                <f:TemplateField ColumnID="UnitWork" Width="120px" HeaderText="鍗曚綅宸ョ▼鍚嶇О" HeaderTextAlign="Center" TextAlign="Center">
                                     <ItemTemplate>
                                         <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
                                     </ItemTemplate>
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs
index dbaec460..6745f3ea 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs
@@ -18,11 +18,52 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         {
             if (!IsPostBack)
             {
+                //娴嬭瘯闃舵锛屼粎hfnbd璐﹀彿浣跨敤
+                if (this.CurrUser.UserId == BLL.Const.hfnbdId)
+                {
+                    this.drpUnitWorkId.Hidden = false;
+                    this.fr1.Hidden = false;
+                    this.fr2.Hidden = false;
+                }
                 GetButtonPower();
                 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//鏂藉伐鍒嗗寘鍟�
-                BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//涓撲笟
+               
                 UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false);
                 //UserService.InitUserNameProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false);
+                if (this.CurrUser.UserId == BLL.Const.hfnbdId)//娴嬭瘯闃舵锛屼粎hfnbd璐﹀彿浣跨敤
+                {
+                    //涓撲笟
+                    this.drpCNProfessionalId.DataTextField = "DetectionItems";
+                    this.drpCNProfessionalId.DataValueField = "ControlId";
+                    this.drpCNProfessionalId.DataSource = BLL.CNProfessionalService.GetCnProList();
+                    this.drpCNProfessionalId.DataBind();
+                    Funs.FineUIPleaseSelect(this.drpCNProfessionalId);
+                }
+                else
+                {
+                    BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//涓撲笟
+                }
+
+                //鍗曚綅宸ョ▼
+                var q = (from x in Funs.DB.WBS_DivisionDivide
+                         join y in Funs.DB.WBS_UnitWork on x.UnitWorkId equals y.UnitWorkId
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         && (y.SuperUnitWork == null || y.SuperUnitWork == "0")
+                         select new
+                         {
+                             y.UnitWorkId,
+                             UnitWorkName = y.UnitWorkCode + "-" + y.UnitWorkName
+                         }).Distinct().ToList();
+                this.drpUnitWorkId.DataTextField = "UnitWorkName";
+                this.drpUnitWorkId.DataValueField = "UnitWorkId";
+                this.drpUnitWorkId.DataSource = q;
+                this.drpUnitWorkId.DataBind();
+                Funs.FineUIPleaseSelect(this.drpUnitWorkId);//鍗曚綅宸ョ▼
+                Funs.FineUIPleaseSelect(this.drpChirldUnitWorkId);//瀛愬崟浣嶅伐绋�
+                Funs.FineUIPleaseSelect(this.drpBranch);//鍒嗛儴宸ョ▼
+                Funs.FineUIPleaseSelect(this.drpChildBranch);//瀛愬垎閮ㄥ伐绋�
+                Funs.FineUIPleaseSelect(this.drpProEngineering);//鍒嗛」宸ョ▼
+
                 this.hdInspectionNoticeId.Text = Request.Params["inspectionId"];
                 if (!string.IsNullOrEmpty(Request.Params["View"]))
                 {
@@ -46,6 +87,170 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                         {
                             this.drpAcceptanceCheckMan.SelectedValueArray = inspectionManagement.AcceptanceCheckMan.Split(',');
                         }
+                        //鍗曚綅宸ョ▼銆佸垎閮ㄥ伐绋嬨�佸垎椤瑰伐绋�
+                        if (!string.IsNullOrEmpty(inspectionManagement.UnitWorkId))
+                        {
+                            this.drpUnitWorkId.SelectedValue = inspectionManagement.UnitWorkId;
+                            if (!string.IsNullOrEmpty(inspectionManagement.ChildUnitWorkId))
+                            {
+                                //瀛愬崟浣嶅伐绋�
+                                var childUnitWorks = (from x in Funs.DB.WBS_DivisionDivide
+                                                      join y in Funs.DB.WBS_UnitWork on x.UnitWorkId equals y.UnitWorkId
+                                                      where x.ProjectId == this.CurrUser.LoginProjectId
+                                                      && y.SuperUnitWork == inspectionManagement.UnitWorkId
+                                                      && (y.SuperUnitWork != "0")
+                                                      select new
+                                                      {
+                                                          y.UnitWorkId,
+                                                          UnitWorkName = y.UnitWorkCode + "-" + y.UnitWorkName
+                                                      }).Distinct().ToList();
+                                this.drpChirldUnitWorkId.DataTextField = "UnitWorkName";
+                                this.drpChirldUnitWorkId.DataValueField = "UnitWorkId";
+                                this.drpChirldUnitWorkId.DataSource = childUnitWorks;
+                                this.drpChirldUnitWorkId.DataBind();
+                                Funs.FineUIPleaseSelect(this.drpChirldUnitWorkId);
+                                this.drpChirldUnitWorkId.SelectedIndex = 0;
+                                this.drpChirldUnitWorkId.SelectedValue = inspectionManagement.ChildUnitWorkId;
+                            }
+                            if (!string.IsNullOrEmpty(inspectionManagement.Branch))
+                            {
+                                if (string.IsNullOrEmpty(inspectionManagement.ChildUnitWorkId))//鏃犲瓙鍗曚綅宸ョ▼
+                                {
+                                    //鍒嗛儴宸ョ▼
+                                    var a = (from x in Funs.DB.WBS_DivisionDivide
+                                             join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                             where x.ProjectId == this.CurrUser.LoginProjectId
+                                             && x.UnitWorkId == inspectionManagement.UnitWorkId
+                                             && y.ParentId == null
+                                             select new
+                                             {
+                                                 y.DivisionId,
+                                                 y.BranchEngineeringName
+                                             }).Distinct().ToList();
+                                    this.drpBranch.DataTextField = "BranchEngineeringName";
+                                    this.drpBranch.DataValueField = "DivisionId";
+                                    this.drpBranch.DataSource = a;
+                                    this.drpBranch.DataBind();
+                                    Funs.FineUIPleaseSelect(this.drpBranch);
+                                    this.drpBranch.SelectedIndex = 0;
+                                    this.drpBranch.SelectedValue = inspectionManagement.Branch;
+                                }
+                                else
+                                {
+                                    //鍒嗛儴宸ョ▼(鏈夊瓙鍗曚綅宸ョ▼)
+                                    var a = (from x in Funs.DB.WBS_DivisionDivide
+                                             join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                             where x.ProjectId == this.CurrUser.LoginProjectId
+                                             && x.UnitWorkId == inspectionManagement.ChildUnitWorkId
+                                             && y.ParentId == null
+                                             select new
+                                             {
+                                                 y.DivisionId,
+                                                 y.BranchEngineeringName
+                                             }).Distinct().ToList();
+                                    this.drpBranch.DataTextField = "BranchEngineeringName";
+                                    this.drpBranch.DataValueField = "DivisionId";
+                                    this.drpBranch.DataSource = a;
+                                    this.drpBranch.DataBind();
+                                    Funs.FineUIPleaseSelect(this.drpBranch);
+                                    this.drpBranch.SelectedIndex = 0;
+                                    this.drpBranch.SelectedValue = inspectionManagement.Branch;
+                                }
+                                if (!string.IsNullOrEmpty(inspectionManagement.ChildBranch))
+                                {
+                                    #region 瀛愬垎閮ㄥ伐绋�
+                                    if (!string.IsNullOrEmpty(inspectionManagement.ChildUnitWorkId))
+                                    {
+                                        //瀛愬垎閮ㄥ伐绋�
+                                        var childBranchs = (from x in Funs.DB.WBS_DivisionDivide
+                                                            join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                                            where x.ProjectId == this.CurrUser.LoginProjectId
+                                                            && y.ParentId == inspectionManagement.Branch
+                                                            && x.UnitWorkId == inspectionManagement.ChildUnitWorkId
+                                                            && y.SubBranchEngineeringName != null
+                                                            select new
+                                                            {
+                                                                y.DivisionId,
+                                                                y.SubBranchEngineeringName
+                                                            }).Distinct().ToList();
+                                        this.drpChildBranch.DataTextField = "SubBranchEngineeringName";
+                                        this.drpChildBranch.DataValueField = "DivisionId";
+                                        this.drpChildBranch.DataSource = childBranchs;
+                                        this.drpChildBranch.DataBind();
+                                        Funs.FineUIPleaseSelect(this.drpChildBranch);
+                                        this.drpChildBranch.SelectedIndex = 0;
+                                    }
+                                    else
+                                    {
+                                        var childBranchs = (from x in Funs.DB.WBS_DivisionDivide
+                                                            join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                                            where x.ProjectId == this.CurrUser.LoginProjectId
+                                                            && y.ParentId == inspectionManagement.Branch
+                                                            && x.UnitWorkId == inspectionManagement.UnitWorkId
+                                                            && y.SubBranchEngineeringName != null
+                                                            select new
+                                                            {
+                                                                y.DivisionId,
+                                                                y.SubBranchEngineeringName
+                                                            }).Distinct().ToList();
+                                        this.drpChildBranch.DataTextField = "SubBranchEngineeringName";
+                                        this.drpChildBranch.DataValueField = "DivisionId";
+                                        this.drpChildBranch.DataSource = childBranchs;
+                                        this.drpChildBranch.DataBind();
+                                        Funs.FineUIPleaseSelect(this.drpChildBranch);
+                                        this.drpChildBranch.SelectedIndex = 0;
+                                    }
+                                    this.drpChildBranch.SelectedValue = inspectionManagement.ChildBranch;
+                                    #endregion
+                                }
+
+                                if (!string.IsNullOrEmpty(inspectionManagement.ControlPointType))
+                                {
+                                    //鍒嗛」宸ョ▼
+                                    var b = (from x in Funs.DB.WBS_DivisionDivide
+                                             join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                             where x.ProjectId == this.CurrUser.LoginProjectId
+                                             && x.UnitWorkId == this.drpUnitWorkId.SelectedValue
+                                             && y.ParentId == this.drpBranch.SelectedValue
+                                             && y.ParentId != null
+                                             select new
+                                             {
+                                                 y.DivisionId,
+                                                 y.ProEngineeringName,
+                                                 y.SubBranchEngineeringName
+                                             }).Distinct().ToList();
+                                    if (b.Where(w => w.SubBranchEngineeringName == null).Count() > 0)
+                                    {
+                                        this.drpProEngineering.DataTextField = "ProEngineeringName";
+                                        this.drpProEngineering.DataValueField = "DivisionId";
+                                        this.drpProEngineering.DataSource = b;
+                                    }
+                                    else
+                                    {
+                                        var c = (from x in Funs.DB.WBS_DivisionDivide
+                                                 join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                                 join z in Funs.DB.Division_SubProjects on y.ParentId equals z.DivisionId
+                                                 join w in Funs.DB.Division_SubProjects on z.ParentId equals w.DivisionId
+                                                 where x.ProjectId == this.CurrUser.LoginProjectId
+                                                 && x.UnitWorkId == this.drpUnitWorkId.SelectedValue
+                                                 && z.ParentId == this.drpBranch.SelectedValue
+                                                 select new
+                                                 {
+                                                     y.DivisionId,
+                                                     y.ProEngineeringName
+                                                 }).Distinct().ToList();
+                                        this.drpProEngineering.DataTextField = "ProEngineeringName";
+                                        this.drpProEngineering.DataValueField = "DivisionId";
+                                        this.drpProEngineering.DataSource = c;
+                                    }
+                                    this.drpProEngineering.DataBind();
+                                    Funs.FineUIPleaseSelect(this.drpProEngineering);
+                                    this.drpProEngineering.SelectedIndex = 0;
+                                    
+                                    this.drpProEngineering.SelectedValue = inspectionManagement.ControlPointType;
+                                }
+                            }
+                        }
                         this.txtNoticeCode.Text = inspectionManagement.NoticeCode;
                         this.Grid1.DataSource = BLL.InspectionManagementDetailService.GetInspectionDetails(this.hdInspectionNoticeId.Text.Trim());
                         this.Grid1.DataBind();
@@ -58,7 +263,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 if (requestArg.StartsWith("ReloadGrid$"))
                 {
                     this.hdItemsString.Text = requestArg.Substring("ReloadGrid$".Length);
-                    Window1_Close(null,null);
+                    Window1_Close(null, null);
                 }
             }
         }
@@ -72,7 +277,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (this.drpUnit.SelectedValue==BLL.Const._Null)
+            if (this.drpUnit.SelectedValue == BLL.Const._Null)
             {
                 Alert.ShowInTop("璇峰厛閫夋嫨鏂藉伐鍒嗗寘鍟嗭紒", MessageBoxIcon.Warning);
                 return;
@@ -112,6 +317,27 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 CheckManIds = CheckManIds.Substring(0, CheckManIds.LastIndexOf(","));
             }
             inspectionManagement.AcceptanceCheckMan = CheckManIds;
+
+            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            {
+                inspectionManagement.UnitWorkId = this.drpUnitWorkId.SelectedValue;
+            }
+            if (this.drpChirldUnitWorkId.SelectedValue!=BLL.Const._Null)
+            {
+                inspectionManagement.ChildUnitWorkId = this.drpChirldUnitWorkId.SelectedValue;
+            }
+            if (this.drpBranch.SelectedValue != BLL.Const._Null)
+            {
+                inspectionManagement.Branch = this.drpBranch.SelectedValue;
+            }
+            if (this.drpChildBranch.SelectedValue!=BLL.Const._Null)
+            {
+                inspectionManagement.ChildBranch = this.drpChildBranch.SelectedValue;
+            }
+            if (this.drpProEngineering.SelectedValue != BLL.Const._Null)
+            {
+                inspectionManagement.ControlPointType = this.drpProEngineering.SelectedValue;
+            }
             //inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
             if (string.IsNullOrEmpty(Request.Params["inspectionId"]))
             {
@@ -146,7 +372,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             {
                 //缂栧彿涓嶈兘閲嶅
                 var InspectionManagementModel = Funs.DB.ProcessControl_InspectionManagement.FirstOrDefault(x => x.NoticeCode == this.txtNoticeCode.Text.Trim()
-                && x.InspectionId!= Request.Params["inspectionId"]);
+                && x.InspectionId != Request.Params["inspectionId"]);
                 if (InspectionManagementModel != null)
                 {
                     ShowNotify("鍏辨閫氱煡鍗曠紪鍙峰凡瀛樺湪锛屼笉鑳介噸澶嶏紒", MessageBoxIcon.Warning);
@@ -192,6 +418,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         }
         #endregion
 
+        #region Grid1琛屽唴浜嬩欢
+        /// <summary>
+        /// Grid1琛屽唴浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
         {
             string itemId = Grid1.DataKeys[e.RowIndex][0].ToString();
@@ -210,6 +442,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 Grid1.DataBind();
             }
         }
+        #endregion
 
         #region 鎼滅储
         /// <summary>
@@ -250,7 +483,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 {
                     detail.CreateDate = Convert.ToDateTime(createDate);
                 }
-             
+
                 details.Add(detail);
             }
             return details;
@@ -400,5 +633,213 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             return name;
         }
         #endregion
+
+        #region DropDownList涓嬫媺閫夋嫨浜嬩欢
+        /// <summary>
+        /// 鍗曚綅宸ョ▼涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnitWorkId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.drpChirldUnitWorkId.Items.Clear();
+            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            {
+                //瀛愬崟浣嶅伐绋�
+                var childUnitWorks = (from x in Funs.DB.WBS_DivisionDivide
+                                      join y in Funs.DB.WBS_UnitWork on x.UnitWorkId equals y.UnitWorkId
+                                      where x.ProjectId == this.CurrUser.LoginProjectId
+                                      && y.SuperUnitWork == this.drpUnitWorkId.SelectedValue
+                                      && (y.SuperUnitWork != "0")
+                                      select new
+                                      {
+                                          y.UnitWorkId,
+                                          UnitWorkName = y.UnitWorkCode + "-" + y.UnitWorkName
+                                      }).Distinct().ToList();
+                this.drpChirldUnitWorkId.DataTextField = "UnitWorkName";
+                this.drpChirldUnitWorkId.DataValueField = "UnitWorkId";
+                this.drpChirldUnitWorkId.DataSource = childUnitWorks;
+                this.drpChirldUnitWorkId.DataBind();
+                Funs.FineUIPleaseSelect(this.drpChirldUnitWorkId);
+                this.drpChirldUnitWorkId.SelectedIndex = 0;
+
+                //鍒嗛儴宸ョ▼
+                this.drpBranch.Items.Clear();
+                var q = (from x in Funs.DB.WBS_DivisionDivide
+                         join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         && x.UnitWorkId == this.drpUnitWorkId.SelectedValue
+                         && y.ParentId == null
+                         select new
+                         {
+                             y.DivisionId,
+                             y.BranchEngineeringName
+                         }).Distinct().ToList();
+                this.drpBranch.DataTextField = "BranchEngineeringName";
+                this.drpBranch.DataValueField = "DivisionId";
+                this.drpBranch.DataSource = q;
+                this.drpBranch.DataBind();
+                Funs.FineUIPleaseSelect(this.drpBranch);
+                this.drpBranch.SelectedIndex = 0;
+            }
+        }
+
+        /// <summary>
+        /// 瀛愬崟浣嶅伐绋嬩笅鎷夐�夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpChirldUnitWorkId_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.drpChirldUnitWorkId.SelectedValue != BLL.Const._Null)
+            {
+                this.drpBranch.Items.Clear();
+                var q = (from x in Funs.DB.WBS_DivisionDivide
+                         join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         && x.UnitWorkId == this.drpChirldUnitWorkId.SelectedValue
+                         && y.ParentId == null
+                         select new
+                         {
+                             y.DivisionId,
+                             y.BranchEngineeringName
+                         }).Distinct().ToList();
+                this.drpBranch.DataTextField = "BranchEngineeringName";
+                this.drpBranch.DataValueField = "DivisionId";
+                this.drpBranch.DataSource = q;
+                this.drpBranch.DataBind();
+                Funs.FineUIPleaseSelect(this.drpBranch);
+                this.drpBranch.SelectedIndex = 0;
+            }
+        }
+
+        /// <summary>
+        /// 鍒嗛儴宸ョ▼涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpBranch_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.drpChildBranch.Items.Clear();
+            if (this.drpBranch.SelectedValue != BLL.Const._Null)
+            {
+                #region 瀛愬垎閮ㄥ伐绋�
+                if (this.drpChirldUnitWorkId.SelectedValue != BLL.Const._Null)
+                {
+                    //瀛愬垎閮ㄥ伐绋�
+                    var childBranchs = (from x in Funs.DB.WBS_DivisionDivide
+                                        join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                        where x.ProjectId == this.CurrUser.LoginProjectId
+                                        && y.ParentId == this.drpBranch.SelectedValue
+                                        && x.UnitWorkId == this.drpChirldUnitWorkId.SelectedValue
+                                        && y.SubBranchEngineeringName != null
+                                        select new
+                                        {
+                                            y.DivisionId,
+                                            y.SubBranchEngineeringName
+                                        }).Distinct().ToList();
+                    this.drpChildBranch.DataTextField = "SubBranchEngineeringName";
+                    this.drpChildBranch.DataValueField = "DivisionId";
+                    this.drpChildBranch.DataSource = childBranchs;
+                    this.drpChildBranch.DataBind();
+                    Funs.FineUIPleaseSelect(this.drpChildBranch);
+                    this.drpChildBranch.SelectedIndex = 0;
+                }
+                else
+                {
+                    var childBranchs = (from x in Funs.DB.WBS_DivisionDivide
+                                        join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                                        where x.ProjectId == this.CurrUser.LoginProjectId
+                                        && y.ParentId == this.drpBranch.SelectedValue
+                                        && x.UnitWorkId == this.drpUnitWorkId.SelectedValue
+                                        && y.SubBranchEngineeringName != null
+                                        select new
+                                        {
+                                            y.DivisionId,
+                                            y.SubBranchEngineeringName
+                                        }).Distinct().ToList();
+                    this.drpChildBranch.DataTextField = "SubBranchEngineeringName";
+                    this.drpChildBranch.DataValueField = "DivisionId";
+                    this.drpChildBranch.DataSource = childBranchs;
+                    this.drpChildBranch.DataBind();
+                    Funs.FineUIPleaseSelect(this.drpChildBranch);
+                    this.drpChildBranch.SelectedIndex = 0;
+                }
+                #endregion
+               
+                //鍒嗛」宸ョ▼
+                this.drpProEngineering.Items.Clear();            
+                var q = (from x in Funs.DB.WBS_DivisionDivide
+                         join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         && x.UnitWorkId == this.drpUnitWorkId.SelectedValue
+                         && y.ParentId == this.drpBranch.SelectedValue
+                         && y.ParentId != null
+                         select new
+                         {
+                             y.DivisionId,
+                             y.ProEngineeringName,
+                             y.SubBranchEngineeringName
+                         }).Distinct().ToList();
+                if (q.Where(w => w.SubBranchEngineeringName == null).Count() > 0)
+                {
+                    this.drpProEngineering.DataTextField = "ProEngineeringName";
+                    this.drpProEngineering.DataValueField = "DivisionId";
+                    this.drpProEngineering.DataSource = q;
+                }
+                else
+                {
+                    var a = (from x in Funs.DB.WBS_DivisionDivide
+                             join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                             join z in Funs.DB.Division_SubProjects on y.ParentId equals z.DivisionId
+                             join w in Funs.DB.Division_SubProjects on z.ParentId equals w.DivisionId
+                             where x.ProjectId == this.CurrUser.LoginProjectId
+                             && x.UnitWorkId == this.drpUnitWorkId.SelectedValue
+                             && z.ParentId == this.drpBranch.SelectedValue
+                             select new
+                             {
+                                 y.DivisionId,
+                                 y.ProEngineeringName
+                             }).Distinct().ToList();
+                    this.drpProEngineering.DataTextField = "ProEngineeringName";
+                    this.drpProEngineering.DataValueField = "DivisionId";
+                    this.drpProEngineering.DataSource = a;
+                }                
+                this.drpProEngineering.DataBind();
+                Funs.FineUIPleaseSelect(this.drpProEngineering);
+            }
+            this.drpProEngineering.SelectedIndex = 0;
+        }
+
+        /// <summary>
+        /// 瀛愬垎閮ㄥ伐绋嬩笅鎷夐�夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpChildBranch_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.drpProEngineering.Items.Clear();
+            if (this.drpChildBranch.SelectedValue != BLL.Const._Null)
+            {
+                //鍒嗛」宸ョ▼
+                var a = (from x in Funs.DB.WBS_DivisionDivide
+                         join y in Funs.DB.Division_SubProjects on x.DivisionId equals y.DivisionId
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         && x.UnitWorkId == this.drpUnitWorkId.SelectedValue
+                         && y.ParentId == this.drpChildBranch.SelectedValue
+                         select new
+                         {
+                             y.DivisionId,
+                             y.ProEngineeringName
+                         }).Distinct().ToList();
+                this.drpProEngineering.DataTextField = "ProEngineeringName";
+                this.drpProEngineering.DataValueField = "DivisionId";
+                this.drpProEngineering.DataSource = a;
+                this.drpProEngineering.DataBind();
+                Funs.FineUIPleaseSelect(this.drpProEngineering);
+                this.drpProEngineering.SelectedIndex = 0;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs
index 90502fd5..63f508cf 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.designer.cs
@@ -7,13 +7,11 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.ProcessControl
-{
-
-
-    public partial class InspectionNoticeEdit
-    {
-
+namespace FineUIPro.Web.CQMS.ProcessControl {
+    
+    
+    public partial class InspectionNoticeEdit {
+        
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 鎺т欢銆�
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// SimpleForm1 鎺т欢銆�
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-
+        
         /// <summary>
         /// drpUnit 鎺т欢銆�
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-
+        
         /// <summary>
         /// drpCNProfessionalId 鎺т欢銆�
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessionalId;
-
+        
         /// <summary>
         /// txtNoticeCode 鎺т欢銆�
         /// </summary>
@@ -67,7 +65,70 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtNoticeCode;
-
+        
+        /// <summary>
+        /// drpUnitWorkId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitWorkId;
+        
+        /// <summary>
+        /// fr1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.FormRow fr1;
+        
+        /// <summary>
+        /// drpChirldUnitWorkId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChirldUnitWorkId;
+        
+        /// <summary>
+        /// drpBranch 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpBranch;
+        
+        /// <summary>
+        /// fr2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.FormRow fr2;
+        
+        /// <summary>
+        /// drpChildBranch 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChildBranch;
+        
+        /// <summary>
+        /// drpProEngineering 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProEngineering;
+        
         /// <summary>
         /// txtAcceptanceSite 鎺т欢銆�
         /// </summary>
@@ -76,7 +137,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtAcceptanceSite;
-
+        
         /// <summary>
         /// drpAcceptanceCheckMan 鎺т欢銆�
         /// </summary>
@@ -85,7 +146,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList drpAcceptanceCheckMan;
-
+        
         /// <summary>
         /// Label1 鎺т欢銆�
         /// </summary>
@@ -94,7 +155,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-
+        
         /// <summary>
         /// btnAttach 鎺т欢銆�
         /// </summary>
@@ -103,16 +164,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
-
-        /// <summary>
-        /// Panel2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel2;
-
+        
         /// <summary>
         /// Grid1 鎺т欢銆�
         /// </summary>
@@ -121,7 +173,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-
+        
         /// <summary>
         /// Toolbar4 鎺т欢銆�
         /// </summary>
@@ -130,7 +182,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar4;
-
+        
         /// <summary>
         /// btnNew 鎺т欢銆�
         /// </summary>
@@ -139,7 +191,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-
+        
         /// <summary>
         /// Label2 鎺т欢銆�
         /// </summary>
@@ -148,7 +200,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-
+        
         /// <summary>
         /// Label3 鎺т欢銆�
         /// </summary>
@@ -157,7 +209,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-
+        
         /// <summary>
         /// Label5 鎺т欢銆�
         /// </summary>
@@ -166,7 +218,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label5;
-
+        
         /// <summary>
         /// Label4 鎺т欢銆�
         /// </summary>
@@ -175,7 +227,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label4;
-
+        
         /// <summary>
         /// Toolbar1 鎺т欢銆�
         /// </summary>
@@ -184,7 +236,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
+        
         /// <summary>
         /// hdItemsString 鎺т欢銆�
         /// </summary>
@@ -193,7 +245,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.HiddenField hdItemsString;
-
+        
         /// <summary>
         /// hdInspectionNoticeId 鎺т欢銆�
         /// </summary>
@@ -202,7 +254,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.HiddenField hdInspectionNoticeId;
-
+        
         /// <summary>
         /// btnSave 鎺т欢銆�
         /// </summary>
@@ -211,7 +263,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-
+        
         /// <summary>
         /// Window1 鎺т欢銆�
         /// </summary>
@@ -220,7 +272,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-
+        
         /// <summary>
         /// WindowAtt 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
index 8a96bfa1..b731d669 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
@@ -92,8 +92,8 @@
                                 <f:DropDownList ID="drpSolutionType" runat="server" Width="350px" Label="鏂规绫诲埆" LabelAlign="Right" EnableEdit="true">
                                 </f:DropDownList>
                                   <f:DropDownList ID="drpState" runat="server" Label="瀹℃壒鐘舵��" LabelAlign="Right" EnableEdit="true" >
-                                        <f:ListItem Text="宸查棴鍚�" Value="1" />
-                                        <f:ListItem Text="鏈棴鍚�" Value="0" />
+                                        <f:ListItem Text="宸插畬鎴�" Value="1" />
+                                        <f:ListItem Text="鏈畬鎴�" Value="0" />
                                 </f:DropDownList>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
 
@@ -108,56 +108,56 @@
 
                     </Toolbars>
                     <Columns>
-                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
+                        <f:TemplateField ColumnID="tfPageIndex" minWidth="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="code" DataField="code" Width="50px"
+                        <f:RenderField ColumnID="code" DataField="code" minWidth="50px"
                             SortField="code" FieldType="String" HeaderText="缂栧彿" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField ColumnID="SolutionName" DataField="SolutionName" Width="130px"
+                        <f:RenderField ColumnID="SolutionName" DataField="SolutionName" minWidth="130px"
                             SortField="SolutionName" FieldType="String" HeaderText="鏂规鍚嶇О" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
 
-                        <f:RenderField ColumnID="UnitName" DataField="UnitName" Width="160px" 
+                        <f:RenderField ColumnID="UnitName" DataField="UnitName" minWidth="160px" 
                             SortField="UnitName" FieldType="String" HeaderText="鏂藉伐鍗曚綅" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
-                          <f:RenderField ColumnID="UnitWorkIds" Width="120px" DataField="UnitWorkIds"
+                          <f:RenderField ColumnID="UnitWorkIds" minWidth="120px" DataField="UnitWorkIds"
                             SortField="UnitWorkIds" FieldType="String" HeaderText="鍗曚綅宸ョ▼" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="120px" ColumnID="CNProfessionalCodes"  DataField="CNProfessionalCodes" SortField="CNProfessionalCodes"
+                        <f:RenderField minWidth="120px" ColumnID="CNProfessionalCodes"  DataField="CNProfessionalCodes" SortField="CNProfessionalCodes"
                             FieldType="String" HeaderText="涓撲笟" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
 
-                        <f:RenderField Width="120px" ColumnID="SolutionTempleteTypeName"  DataField="SolutionTempleteTypeName" SortField="SolutionTempleteTypeName"
+                        <f:RenderField minWidth="120px" ColumnID="SolutionTempleteTypeName"  DataField="SolutionTempleteTypeName" SortField="SolutionTempleteTypeName"
                             FieldType="String" HeaderText="鏂规绫诲埆" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
 
 
-                        <f:RenderField ColumnID="CompileManName" Width="70px" DataField="CompileManName"
+                        <f:RenderField ColumnID="CompileManName" minWidth="70px" DataField="CompileManName"
                             SortField="CompileManName" FieldType="String" HeaderText="缂栧埗浜�" TextAlign="Center"
                             HeaderTextAlign="Center">
                         </f:RenderField>
 
-                        <f:RenderField Width="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
+                        <f:RenderField minWidth="100px" ColumnID="CompileDate" DataField="CompileDate" SortField="CompileDate"
                             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="缂栧埗鏃堕棿" TextAlign="Center" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:TemplateField ColumnID="State" Width="60px" HeaderText="鐘舵��" HeaderTextAlign="Center" TextAlign="Center"
+                        <f:TemplateField ColumnID="State" minWidth="60px" HeaderText="鐘舵��" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
                                 <asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:TemplateField ColumnID="ApprovaMan" Width="60px" HeaderText="褰撳墠瀹℃壒浜�" HeaderTextAlign="Center" TextAlign="Center"
+                        <f:TemplateField ColumnID="ApprovaMan" minWidth="120px" HeaderText="褰撳墠瀹℃壒浜�" HeaderTextAlign="Center" TextAlign="Center"
                                          EnableLock="true" Locked="False">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.GetThisApproveNameByConstructSolutionId(Eval("ConstructSolutionId")) %>'></asp:Label>
+                                <asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.GetThisApproveNameByConstructSolutionId(Eval("ConstructSolutionId"),Eval("State")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                     </Columns>
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
index 28f40e5f..05e1f62f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
@@ -128,12 +128,12 @@ namespace FineUIPro.Web.CQMS.Solution
                 if (drpState.SelectedValue == "1")   //宸查棴鍚�
                 {
                     strSql += " AND State=@State";
-                    listStr.Add(new SqlParameter("@State", "3"));
+                    listStr.Add(new SqlParameter("@State", "4"));
                 }
                 else   //鏈棴鍚�
                 {
                     strSql += " AND State!=@State";
-                    listStr.Add(new SqlParameter("@State", "3"));
+                    listStr.Add(new SqlParameter("@State", "4"));
                 }
             }
             strSql += " order by chec.code desc ";
@@ -253,16 +253,21 @@ namespace FineUIPro.Web.CQMS.Solution
                     return;
                 }
             }
-            else if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile)
+            //涓�绾у鏍搞�佷簩绾у鎵广�侀噸鎶�
+            else if (constructSolution.State == Const.CQMSConstructSolution_Audit
+                || constructSolution.State == Const.CQMSConstructSolution_Audit1
+                || constructSolution.State == Const.CQMSConstructSolution_ReCompile)
             {
-                var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id);
-                if (approve!=null && approve.ApproveMan==this.CurrUser.UserId)
+                //瀹℃壒鍒楄〃涓槸鍚﹀寘鍚綋鍓嶇敤鎴�
+                var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id, constructSolution.State);
+                //if (approve!=null && approve.ApproveMan==this.CurrUser.UserId)
+                if (approve.Any(x=>x.ApproveMan.IndexOf(CurrUser.UserId)>-1))
                 {
                     PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id)));
                 }
                 else
                 {
-                    Alert.ShowInTop("鎮ㄤ笉鏄姙鐞嗙敤鎴凤紝鏃犳硶鎿嶄綔锛佽鍙抽敭鏌ョ湅", MessageBoxIcon.Warning);
+                    Alert.ShowInTop("鎮ㄤ笉鏄鏍镐汉鍛橈紝鏃犳硶鎿嶄綔锛佽鍙抽敭鏌ョ湅", MessageBoxIcon.Warning);
                     return;
                 }
                 //Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId);
@@ -285,6 +290,7 @@ namespace FineUIPro.Web.CQMS.Solution
 
                 //}
             }
+            
 
 
         }
@@ -324,7 +330,7 @@ namespace FineUIPro.Web.CQMS.Solution
                     }
                     else
                     {
-                        Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Success);
+                        Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
                     }
                 }
                 else
@@ -339,14 +345,14 @@ namespace FineUIPro.Web.CQMS.Solution
                         Alert.ShowInTop("鍒犻櫎鎴愬姛锛�", MessageBoxIcon.Success);
                         return;
                     }
-                    Alert.ShowInTop("鍒犻櫎澶辫触锛屾柟妗堟鍦ㄥ鎵逛腑锛�", MessageBoxIcon.Success);
+                    Alert.ShowInTop("鍒犻櫎澶辫触锛屽彧鑳藉垹闄ゆ湭涓婃姤鐨勬暟鎹紒", MessageBoxIcon.Warning);
                 }
                
 
             }
             else
             {
-                Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Success);
+                Alert.ShowInTop("鎮ㄦ病鏈夎繖涓潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒", MessageBoxIcon.Warning);
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx
index cae51a81..8343e1d5 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx
@@ -144,6 +144,78 @@
                                             </f:DropDownBox>--%>
                                         </Items>
                                     </f:FormRow>
+
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox Readonly="true" runat="server" ID="txtzyUserIds" Label="涓�绾у鏍镐汉鍛�" LabelWidth="120px" ></f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                     <f:FormRow>
+                                        <Items>
+                                            <f:TextBox Readonly="true" runat="server" ID="txtaqUserIds" Label="浜岀骇瀹℃壒浜哄憳" LabelWidth="120px" ></f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <%-- <f:FormRow>
+                                        <Items>
+                                            <f:TextBox Readonly="true" runat="server" ID="txtsgUserIds" Label="鎬诲寘浼氱鏂藉伐缁忕悊" LabelWidth="160px" ></f:TextBox>
+                                        </Items>
+                                    </f:FormRow>--%>
+
+                                     <f:FormRow>
+                                        <Items>
+                                            <f:TextBox Readonly="true" runat="server" ID="txtCsUsers" Label="鎶勯�佷汉鍛�" LabelWidth="120px" ></f:TextBox>
+                                        </Items>
+                                    </f:FormRow>
+
+                                    <f:FormRow ID="options1" Hidden="true">
+                    <Items>
+                       <f:Grid ID="gvOperateComplianceObligations" ShowBorder="true" ShowHeader="false" Title="" runat="server"
+                        AllowCellEditing="true"  DataIDField="Id" DataKeyNames="Id"
+                        EnableMultiSelect="false" ShowGridHeader="true" Height="220px" EnableColumnLines="true">
+                        <Columns>
+                            <f:RowNumberField EnablePagingNumber="true" HeaderText="搴忓彿" Width="50px" HeaderTextAlign="Center"
+                                TextAlign="Center" />
+
+                            <f:RenderField Width="250px" ColumnID="Chapter" DataField="Chapter" FieldType="String"
+                                HeaderText="绔犺妭" HeaderTextAlign="Center" TextAlign="Left">
+                               
+                            </f:RenderField>
+
+                            <f:RenderField Width="250px" ColumnID="Amendment" DataField="Amendment" FieldType="String"
+                                HeaderText="淇敼鎰忚" HeaderTextAlign="Center" TextAlign="Left">
+                              
+                            </f:RenderField>
+
+                            <f:RenderField Width="100px" ColumnID="ProposerName" DataField="ProposerName" FieldType="String"
+                                HeaderText="鎻愬嚭浜�" HeaderTextAlign="Center" TextAlign="Left">
+                            </f:RenderField>
+
+                            <f:RenderField Width="250px" ColumnID="Modification" DataField="Modification" FieldType="String"
+                                HeaderText="淇敼鎯呭喌" HeaderTextAlign="Center" TextAlign="Left">
+                                
+                            </f:RenderField>
+
+                            <f:RenderField Width="250px" ColumnID="ReviewerOpinion" DataField="ReviewerOpinion" FieldType="String"
+                                HeaderText="瀹℃牳浜烘剰瑙�" HeaderTextAlign="Center" TextAlign="Left">
+                               
+                            </f:RenderField>
+
+                            <f:RenderField Width="250px" ColumnID="IsAccept" DataField="IsAccept" FieldType="String"
+                                HeaderText="鏄惁鎺ュ彈" HeaderTextAlign="Center" TextAlign="Left">
+                               
+                            </f:RenderField>
+
+                            
+                        </Columns>
+                    </f:Grid>
+
+                       <%-- <f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="鍔炵悊鎰忚" MaxLength="3000">
+                        </f:TextArea>--%>
+
+                    </Items>
+                </f:FormRow>
+
+
                                     <f:FormRow runat="server">
                                         <Items>
                                             <f:TabStrip ID="TabStrip1" IsFluid="true" Height="500px" ShowBorder="true" TabPosition="Top"
@@ -188,7 +260,7 @@
                     </Items>
                 </f:FormRow>
 
-                <f:FormRow>
+                <f:FormRow Hidden="true">
                     <Items>
                         <f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" ShowBorder="true"
                             Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="鎬诲寘浼氱">
@@ -278,7 +350,7 @@
                                         </ItemTemplate>
                                     </f:TemplateField>
                                     <f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="鍔炵悊鏃堕棿" />
-                                    <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="鍔炵悊鎰忚" />
+                                    <%--<f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="鍔炵悊鎰忚" />--%>
                                     <f:LinkButtonField HeaderText="闄勪欢" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
                                 </Columns>
                             </f:Grid>
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs
index cc468c57..0dc472e7 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs
@@ -29,12 +29,35 @@ namespace FineUIPro.Web.CQMS.Solution
             String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
             -1, ConstructSolutionId, Const.CQMSConstructSolutionMenuId)));
         }
+        private string GetUserNames(string Ids)
+        {
+            string[] arr = Ids.Split(',');
+            var data = Funs.DB.Sys_User.Where(t => arr.Contains(t.UserId)).Select(t => t.UserName).ToList();
+            if (data.Count > 0)
+                return string.Join(",", data);
+            return null;
+
+        }
+
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
-
+                
                 ConstructSolutionId = Request.Params["constructSolutionId"];
+                if (Funs.DB.Solution_CQMSConstructSolutionApprove_Item.Where(x => x.ConstructSolutionId == ConstructSolutionId).OrderBy(x => x.SortId).ToList().Count > 0)
+                {
+                    //鏈夐噸鎶ョ殑鎯呭喌锛屾樉绀簅ptions1
+                    options1.Hidden = false;
+                    var complianceObligationsCs = Funs.DB.Solution_CQMSConstructSolutionApprove_Item.Where(x => x.ConstructSolutionId == ConstructSolutionId)
+                      .OrderBy(x => x.Proposer).OrderBy(x => x.SortId).ToList();
+                    if (complianceObligationsCs.Count > 0)
+                    {
+                        gvOperateComplianceObligations.DataSource = complianceObligationsCs;
+                        gvOperateComplianceObligations.DataBind();
+                    }
+                }
                 if (!string.IsNullOrWhiteSpace(ConstructSolutionId))
                 {
                     txtProjectName.Text = ProjectService.GetProjectByProjectId(CurrUser.LoginProjectId).ProjectName;
@@ -79,21 +102,49 @@ namespace FineUIPro.Web.CQMS.Solution
                     BindKZRole();
                     BindSGRole();
                     BindXMRole();
-                    var zyUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZY");
+                    var zyUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Yi");
                     if (zyUserIds.Count > 0)
                     {
+                        var zyUserIdsStr = string.Join(",", zyUserIds);
+                        txtzyUserIds.Text = GetUserNames(zyUserIdsStr);
+
                         SetCheck(trOne, zyUserIds);
                     }
-                    var zlUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZL");
-                    if (zlUserIds.Count > 0)
-                    {
-                        SetCheck(trTwo, zlUserIds);
+                    else {
+                        zyUserIds =
+                        CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignTypeNew(ConstructSolutionId, "Yi");
+                        if (zyUserIds.Count > 0)
+                        {
+                            var zyUserIdsStr = string.Join(",", zyUserIds);
+                            txtzyUserIds.Text = GetUserNames(zyUserIdsStr);
+
+                            SetCheck(trOne, zyUserIds);
+                        }
                     }
-                    var aqUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "AQ");
+                    //var zlUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Er");
+                    //if (zlUserIds.Count > 0)
+                    //{
+                    //    SetCheck(trTwo, zlUserIds);
+                    //}
+                    var aqUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Er");
                     if (aqUserIds.Count > 0)
                     {
+                        var zyUserIdsStr = string.Join(",", aqUserIds);
+                        txtaqUserIds.Text = GetUserNames(zyUserIdsStr);
+
                         SetCheck(trThree, aqUserIds);
                     }
+                    else {
+                        aqUserIds =
+                           CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignTypeNew(ConstructSolutionId, "Er");
+                        if (aqUserIds.Count > 0)
+                        {
+                            var zyUserIdsStr = string.Join(",", aqUserIds);
+                            txtaqUserIds.Text = GetUserNames(zyUserIdsStr);
+
+                            SetCheck(trThree, aqUserIds);
+                        }
+                    }
                     var kzUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "KZ");
                     if (kzUserIds.Count > 0)
                     {
@@ -102,6 +153,9 @@ namespace FineUIPro.Web.CQMS.Solution
                     var sgUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "SG");
                     if (sgUserIds.Count > 0)
                     {
+                        var zyUserIdsStr = string.Join(",", sgUserIds);
+                        //txtsgUserIds.Text = GetUserNames(zyUserIdsStr);
+
                         SetCheck(trFive, sgUserIds);
                     }
                     var xmUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "XM");
@@ -118,6 +172,10 @@ namespace FineUIPro.Web.CQMS.Solution
                             BLL.CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve);
                         }
                     }
+                    if (!string.IsNullOrEmpty(constructSolution.CsUsers))
+                    {
+                        txtCsUsers.Text= GetUserNames(constructSolution.CsUsers);
+                    }
 
                     AddAttachTab();
                 }
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs
index 89eb03b4..6bb74d78 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs
@@ -149,6 +149,51 @@ namespace FineUIPro.Web.CQMS.Solution
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitWork;
 
+        /// <summary>
+        /// txtzyUserIds 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtzyUserIds;
+
+        /// <summary>
+        /// txtaqUserIds 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtaqUserIds;
+
+        /// <summary>
+        /// txtCsUsers 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCsUsers;
+
+        /// <summary>
+        /// options1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.FormRow options1;
+
+        /// <summary>
+        /// gvOperateComplianceObligations 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid gvOperateComplianceObligations;
+
         /// <summary>
         /// TabStrip1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx
index 1e1393b6..23048537 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx
@@ -111,6 +111,247 @@
                                             </f:DatePicker>
                                         </Items>
                                     </f:FormRow>
+
+                                    <f:FormRow>
+                                        <Items>
+                                              <f:DropDownBox runat="server" ID="drpzyUserIds" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px" 
+                                                  Label="涓�绾у鏍镐汉鍛�" Required="true" ShowRedStar="true" EmptyText="璇蜂粠涓嬫媺琛ㄦ牸涓�夋嫨" EnableMultiSelect="true" MatchFieldWidth="false">
+                                                <PopPanel>
+                                                    <f:Grid ID="Grid1" Width="800px" Height="300px" Hidden="true"
+                                                        DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
+                                                        PageSize="100" ShowBorder="true" ShowHeader="false" 
+                                                        AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
+                                                        DataKeyNames="UserId" OnPageIndexChange="Grid1_PageIndexChange"
+                                                        AllowSorting="true" SortField="UserName" SortDirection="ASC"
+                                                        OnSort="Grid1_Sort">
+                                                        <Columns>
+                                                            <f:RowNumberField />
+                                                            <f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
+                                                                HeaderText="濮撳悕" />
+                                                        </Columns>
+                                                        <Toolbars>
+                                                            <f:Toolbar runat="server" Position="Top">
+                                                                <Items>
+                                                                    <f:TwinTriggerBox Width="300px" runat="server" EmptyText="鍦ㄥ鍚嶄腑鏌ユ壘" ShowLabel="false" ID="ttbSearch1"
+                                                                        ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click1" OnTrigger2Click="ttbSearch_Trigger2Click1"
+                                                                        Trigger1Icon="Clear" Trigger2Icon="Search">
+                                                                    </f:TwinTriggerBox>
+                                                                </Items>
+                                                            </f:Toolbar>
+                                                        </Toolbars>
+                                                    </f:Grid>
+                                                </PopPanel>
+                                        </f:DropDownBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Label runat="server" Text="涓�绾у鏍镐汉鍛樺繀椤婚�夋嫨鏂藉伐宸ョ▼甯堝拰HSE宸ョ▼甯�" LabelWidth="120px"  CssStyle="color:red"></f:Label>
+                                        </Items>
+                                    </f:FormRow>
+
+                                     <f:FormRow>
+                                        <Items>
+                                              <f:DropDownBox runat="server" ID="drpaqUserIds" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px" 
+                                                  Label="浜岀骇瀹℃壒浜哄憳" Required="true" ShowRedStar="true" EmptyText="璇蜂粠涓嬫媺琛ㄦ牸涓�夋嫨" EnableMultiSelect="true" MatchFieldWidth="false">
+                                                <PopPanel>
+                                                    <f:Grid ID="Grid2" Width="800px" Height="300px" Hidden="true"
+                                                        DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
+                                                        PageSize="100" ShowBorder="true" ShowHeader="false" 
+                                                        AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
+                                                        DataKeyNames="UserId" OnPageIndexChange="Grid2_PageIndexChange"
+                                                        AllowSorting="true" SortField="UserName" SortDirection="ASC"
+                                                        OnSort="Grid2_Sort">
+                                                        <Columns>
+                                                            <f:RowNumberField />
+                                                            <f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
+                                                                HeaderText="濮撳悕" />
+                                                        </Columns>
+                                                        <Toolbars>
+                                                            <f:Toolbar runat="server" Position="Top">
+                                                                <Items>
+                                                                    <f:TwinTriggerBox Width="300px" runat="server" EmptyText="鍦ㄥ鍚嶄腑鏌ユ壘" ShowLabel="false" ID="ttbSearch2"
+                                                                        ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click2" OnTrigger2Click="ttbSearch_Trigger2Click2"
+                                                                        Trigger1Icon="Clear" Trigger2Icon="Search">
+                                                                    </f:TwinTriggerBox>
+                                                                </Items>
+                                                            </f:Toolbar>
+                                                        </Toolbars>
+                                                    </f:Grid>
+                                                </PopPanel>
+                                        </f:DropDownBox>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Label runat="server" Text="浜岀骇瀹℃壒浜哄憳蹇呴』閫夋嫨鏂藉伐缁忕悊銆丠SE缁忕悊銆佽川閲忕粡鐞�" LabelWidth="120px"  CssStyle="color:red"></f:Label>
+                                        </Items>
+                                    </f:FormRow>
+
+                                   <%-- <f:FormRow>
+                                        <Items>
+                                              <f:DropDownBox runat="server" ID="drpsgUserIds" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="160px" 
+                                                  Label="鎬诲寘浼氱鏂藉伐缁忕悊" Required="true" ShowRedStar="true" EmptyText="璇蜂粠涓嬫媺琛ㄦ牸涓�夋嫨" EnableMultiSelect="true" MatchFieldWidth="false">
+                                                <PopPanel>
+                                                    <f:Grid ID="Grid3" Width="800px" Height="300px" Hidden="true"
+                                                        DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
+                                                        PageSize="100" ShowBorder="true" ShowHeader="false" 
+                                                        AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
+                                                        DataKeyNames="UserId" OnPageIndexChange="Grid3_PageIndexChange"
+                                                        AllowSorting="true" SortField="UserName" SortDirection="ASC"
+                                                        OnSort="Grid3_Sort">
+                                                        <Columns>
+                                                            <f:RowNumberField />
+                                                            <f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
+                                                                HeaderText="濮撳悕" />
+                                                        </Columns>
+                                                        <Toolbars>
+                                                            <f:Toolbar runat="server" Position="Top">
+                                                                <Items>
+                                                                    <f:TwinTriggerBox Width="300px" runat="server" EmptyText="鍦ㄥ鍚嶄腑鏌ユ壘" ShowLabel="false" ID="ttbSearch3"
+                                                                        ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click3" OnTrigger2Click="ttbSearch_Trigger2Click3"
+                                                                        Trigger1Icon="Clear" Trigger2Icon="Search">
+                                                                    </f:TwinTriggerBox>
+                                                                </Items>
+                                                            </f:Toolbar>
+                                                        </Toolbars>
+                                                    </f:Grid>
+                                                </PopPanel>
+                                        </f:DropDownBox>
+                                        </Items>
+                                    </f:FormRow>--%>
+
+                                    <f:FormRow>
+                                        <Items>
+                                              <f:DropDownBox runat="server" ID="drpCsUsers" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px" 
+                                                  Label="鎶勯�佷汉鍛�"  EmptyText="璇蜂粠涓嬫媺琛ㄦ牸涓�夋嫨" EnableMultiSelect="true" MatchFieldWidth="false">
+                                                <PopPanel>
+                                                    <f:Grid ID="Grid4" Width="800px" Height="300px" Hidden="true"
+                                                        DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
+                                                        PageSize="100" ShowBorder="true" ShowHeader="false" 
+                                                        AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
+                                                        DataKeyNames="UserId" OnPageIndexChange="Grid4_PageIndexChange"
+                                                        AllowSorting="true" SortField="UserName" SortDirection="ASC"
+                                                        OnSort="Grid4_Sort">
+                                                        <Columns>
+                                                            <f:RowNumberField />
+                                                            <f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
+                                                                HeaderText="濮撳悕" />
+                                                        </Columns>
+                                                        <Toolbars>
+                                                            <f:Toolbar runat="server" Position="Top">
+                                                                <Items>
+                                                                    <f:TwinTriggerBox Width="300px" runat="server" EmptyText="鍦ㄥ鍚嶄腑鏌ユ壘" ShowLabel="false" ID="ttbSearch4"
+                                                                        ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click4" OnTrigger2Click="ttbSearch_Trigger2Click4"
+                                                                        Trigger1Icon="Clear" Trigger2Icon="Search">
+                                                                    </f:TwinTriggerBox>
+                                                                </Items>
+                                                            </f:Toolbar>
+                                                        </Toolbars>
+                                                    </f:Grid>
+                                                </PopPanel>
+                                        </f:DropDownBox>
+                                        </Items>
+                                    </f:FormRow>
+
+                                     <f:FormRow ID="agree">
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsAgree" Label="鏄惁鍚屾剰" ShowRedStar="true" AutoPostBack="true"
+                            OnSelectedIndexChanged="radChange">
+                            <f:RadioItem Text="鍚屾剰" Value="true" Selected="true" />
+                            <f:RadioItem Text="涓嶅悓鎰�" Value="false" />
+                        </f:RadioButtonList>
+                        <f:Label runat="server" CssStyle="display:none"></f:Label>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow ID="options" Hidden="true">
+                    <Items>
+                         <f:Button ID="btnNew" Text="鏂板" ToolTip="鏂板" Icon="Add" runat="server" OnClick="btnNew_Click">
+                            </f:Button>
+                        </Items>
+                    </f:FormRow>
+                <f:FormRow ID="options1" Hidden="true">
+                    <Items>
+                       <f:Grid ID="gvOperateComplianceObligations" ShowBorder="true" ShowHeader="false" Title="" runat="server"
+                        AllowCellEditing="true" ClicksToEdit="1" DataIDField="Id" DataKeyNames="Id"
+                        EnableMultiSelect="false" ShowGridHeader="true" Height="220px" EnableColumnLines="true"
+                        OnRowCommand="gvOperateComplianceObligations_RowCommand">
+                        <Columns>
+                            <f:LinkButtonField Width="40px" ConfirmText="鍒犻櫎閫変腑琛岋紵" ConfirmTarget="Parent" CommandName="Delete"
+                                ToolTip="鍒犻櫎" Icon="Delete" TextAlign="Center" />
+                            <f:RowNumberField EnablePagingNumber="true" HeaderText="搴忓彿" Width="50px" HeaderTextAlign="Center"
+                                TextAlign="Center" />
+
+                            <f:RenderField Width="150px" ColumnID="Chapter" DataField="Chapter" FieldType="String"
+                                HeaderText="绔犺妭" HeaderTextAlign="Center" TextAlign="Left">
+                                <Editor>
+                                    <f:TextBox runat="server" ID="TextBox7">
+                                    </f:TextBox>
+                                </Editor>
+                            </f:RenderField>
+
+                            <f:RenderField Width="250px" ColumnID="Amendment" DataField="Amendment" FieldType="String"
+                                HeaderText="淇敼鎰忚" HeaderTextAlign="Center" TextAlign="Left">
+                                <Editor>
+                                    <f:TextBox runat="server" ID="TextBox1">
+                                    </f:TextBox>
+                                </Editor>
+                            </f:RenderField>
+
+                            <f:RenderField Width="100px" ColumnID="ProposerName" DataField="ProposerName" FieldType="String"
+                                HeaderText="鎻愬嚭浜�" HeaderTextAlign="Center" TextAlign="Left">
+                            </f:RenderField>
+
+                            <f:RenderField Width="250px" ColumnID="Modification" DataField="Modification" FieldType="String"
+                                HeaderText="淇敼鎯呭喌" HeaderTextAlign="Center" TextAlign="Left">
+                                <Editor>
+                                    <f:TextBox runat="server" ID="TextBox2">
+                                    </f:TextBox>
+                                </Editor>
+                            </f:RenderField>
+
+                            <f:RenderField Width="250px" ColumnID="ReviewerOpinion" DataField="ReviewerOpinion" FieldType="String"
+                                HeaderText="瀹℃牳浜烘剰瑙�" HeaderTextAlign="Center" TextAlign="Left">
+                                <Editor>
+                                    <f:TextBox runat="server" ID="TextBox3">
+                                    </f:TextBox>
+                                </Editor>
+                            </f:RenderField>
+
+                            <f:RenderField Width="150px" ColumnID="IsAccept" DataField="IsAccept" FieldType="String"
+                                HeaderText="鏄惁鎺ュ彈" HeaderTextAlign="Center" TextAlign="Left">
+                                <Editor>
+                                    <f:DropDownList runat="server" ID="drpIsAccept">
+                                        <f:ListItem Value="鎺ュ彈AE" Text="鎺ュ彈AE" Selected="true"/>
+                                        <f:ListItem Value="甯︽剰瑙佹帴鍙桝C" Text="甯︽剰瑙佹帴鍙桝C"/>
+                                        <f:ListItem Value="鎷掔粷AJ" Text="鎷掔粷AJ"/>
+                                    </f:DropDownList>
+                                </Editor>
+                            </f:RenderField>
+
+                            
+                        </Columns>
+                    </f:Grid>
+
+                       <%-- <f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="鍔炵悊鎰忚" MaxLength="3000">
+                        </f:TextArea>--%>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="optio">
+
+                    <Items>
+                        <f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
+                            <Items>
+                                <f:Label runat="server" Text="闄勪欢锛�" ShowRedStar="true" CssStyle="padding-left:53px" Width="100px" CssClass="marginr" ShowLabel="false"></f:Label>
+                                <f:Button ID="btnapprove" Text="闄勪欢" ToolTip="涓婁紶鍙婃煡鐪�" Icon="TableCell" OnClick="btnapprove_Click" runat="server">
+                                </f:Button>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+
                                     <f:FormRow runat="server">
                                         <Items>
                                             <f:TabStrip ID="TabStrip1" IsFluid="true" Height="500px" ShowBorder="true" TabPosition="Top"
@@ -133,6 +374,8 @@
                                             </f:TabStrip>
                                         </Items>
                                     </f:FormRow>
+
+                                    
                                  <%--   <f:FormRow Hidden="True">
                                         <Items>
                                             <f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
@@ -149,102 +392,14 @@
                         </f:ContentPanel>
                     </Items>
                 </f:FormRow>
-            <f:FormRow runat="server">
+            <%--<f:FormRow runat="server">
                 <Items>
                     <f:TextBox runat="server" ID="txtCopyMan" Label="鎬诲寘浼氱浜哄憳"  Readonly="True" Enabled="False"/>
 
                 </Items>
-            </f:FormRow>
-            <f:FormRow>
-                    <Items>
-                        <f:Panel ID="Panel2" IsFluid="true" CssClass="mytable blockpanel" runat="server" AutoScroll="true" ShowBorder="true"
-                            Layout="Table" TableConfigColumns="3" ShowHeader="true" Title="鎬诲寘浼氱">
-                            <Items>
-                                <f:Panel ID="Panel1" Title="Panel1" Width="200px"
-                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Height="200px">
-                                    <Items>
-                                        <f:Tree runat="server" ID="trOne" ShowHeader="false" AutoScroll="true" ShowBorder="false" OnNodeCheck="trOne_NodeCheck" EnableArrows="true">
-                                        </f:Tree>
-                                    </Items>
-                                </f:Panel>
-                                <%--<f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
-                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Hidden="True">
-                                    <Items>
-                                        <f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false" OnNodeCheck="trTwo_NodeCheck">
-                                            <Nodes>
-                                            </Nodes>
-                                        </f:Tree>
-                                    </Items>
-                                </f:Panel>--%>
-                                <f:Panel ID="Panel4" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
-                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
-                                    <Items>
-                                        <f:Tree runat="server" ID="trThree" ShowHeader="false" ShowBorder="false" OnNodeCheck="trThree_NodeCheck">
-                                            <Nodes>
-                                            </Nodes>
-                                        </f:Tree>
-                                    </Items>
-                                </f:Panel>
-                                <%--<f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
-                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
-                                    <Items>
-                                        <f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFour_NodeCheck">
-                                            <Nodes>
-                                            </Nodes>
-                                        </f:Tree>
-                                    </Items>
-                                </f:Panel>--%>
-                                <f:Panel ID="Panel6" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
-                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
-                                    <Items>
-                                        <f:Tree runat="server" ID="trFive" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFive_NodeCheck">
-                                            <Nodes>
-                                            </Nodes>
-                                        </f:Tree>
-                                    </Items>
-                                </f:Panel> 
-                                <%--<f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
-                                    TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
-                                    <Items>
-                                        <f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false" OnNodeCheck="trSixe_NodeCheck">
-                                            <Nodes>
-                                            </Nodes>
-                                        </f:Tree>
-                                    </Items>
-                                </f:Panel>--%>
-                            </Items>
-                        </f:Panel>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow ID="agree">
-                    <Items>
-
-                        <f:RadioButtonList runat="server" ID="rblIsAgree" Label="鏄惁鍚屾剰" ShowRedStar="true" AutoPostBack="true">
-                            <f:RadioItem Text="鍚屾剰" Value="true" Selected="true" />
-                            <f:RadioItem Text="涓嶅悓鎰�" Value="false" />
-                        </f:RadioButtonList>
-                        <f:Label runat="server" CssStyle="display:none"></f:Label>
-                    </Items>
-                </f:FormRow>
-                <f:FormRow ID="options">
-                    <Items>
-                        <f:TextArea ID="txtOptions" ShowRedStar="true" Required="true" runat="server" Label="鍔炵悊鎰忚" MaxLength="3000">
-                        </f:TextArea>
-
-                    </Items>
-                </f:FormRow>
-                <f:FormRow ID="optio">
-
-                    <Items>
-                        <f:Panel ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
-                            <Items>
-                                <f:Label runat="server" Text="闄勪欢锛�" ShowRedStar="true" CssStyle="padding-left:53px" Width="100px" CssClass="marginr" ShowLabel="false"></f:Label>
-                                <f:Button ID="btnapprove" Text="闄勪欢" ToolTip="涓婁紶鍙婃煡鐪�" Icon="TableCell" OnClick="btnapprove_Click" runat="server">
-                                </f:Button>
-                            </Items>
-                        </f:Panel>
-                    </Items>
-                </f:FormRow>
+            </f:FormRow>--%>
+            
+               
                 <f:FormRow ID="plApprove2">
                     <Items>
 
@@ -274,7 +429,7 @@
                                         </ItemTemplate>
                                     </f:TemplateField>
                                     <f:BoundField Width="100px" DataField="ApproveDate" HeaderTextAlign="Center" TextAlign="Center" DataFormatString="{0:yyyy-MM-dd}" HeaderText="鍔炵悊鏃堕棿" />
-                                    <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="鍔炵悊鎰忚" />
+                                   <%-- <f:BoundField Width="180px" DataField="ApproveIdea" HeaderTextAlign="Center" TextAlign="Center" HeaderText="鍔炵悊鎰忚" />--%>
                                     <f:LinkButtonField HeaderText="闄勪欢" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
                                 </Columns>
                             </f:Grid>
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
index da744c0a..97f6e90e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
@@ -1,10 +1,13 @@
 锘縰sing System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
+using System.Reflection;
 using System.Web;
 using BLL;
 using FineUIPro.Web.HSSE.Solution;
 using Model;
+using Newtonsoft.Json.Linq;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.CQMS.Solution
@@ -23,22 +26,55 @@ namespace FineUIPro.Web.CQMS.Solution
             set => ViewState["ConstructSolutionId"] = value;
         }
 
+        /// <summary>
+        /// 鏄惁绗簩娆″苟涓斾笉鍚屾剰鐨勬椂鍊�
+        /// </summary>
+        public bool isSendTrue
+        {
+            get => (bool)ViewState["isSendTrue"];
+            set => ViewState["isSendTrue"] = value;
+        }
         #endregion
 
+        private static List<Model.Solution_CQMSConstructSolutionApprove_Item> complianceObligationsCs = new List<Model.Solution_CQMSConstructSolutionApprove_Item>();
+
         public int ContactImg
         {
             get => Convert.ToInt32(ViewState["ContactImg"]);
             set => ViewState["ContactImg"] = value;
         }
 
+        private string[] GetUserNames(string Ids)
+        {
+            string[] arr = Ids.Split(',');
+            var data = Funs.DB.Sys_User.Where(t => arr.Contains(t.UserId)).Select(t => t.UserName).ToList();
+            if (data.Count > 0)
+                return data.ToArray();
+            return null;
+
+        }
+
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
+                isSendTrue = false;
+                complianceObligationsCs.Clear();
                 InitDropDownList(); //鍔犺浇涓嬫媺妗�
-                BindZYRole();
-                BindAQRole();
-                BindSGRole();
+
+                //鍔犺浇涓�绾у鏍镐汉鍛�
+                GetCheckManBindGrid1();
+                //鍔犺浇浜岀骇瀹℃壒浜哄憳
+                GetCheckManBindGrid2();
+
+                //GetCheckManBindGrid3();
+
+                GetCheckManBindGrid4();
+
+                //BindZYRole();
+                //BindAQRole();
+                //BindSGRole();
                 ContactImg = 0;
                 txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
                 ConstructSolutionId = Request.Params["constructSolutionId"];
@@ -101,38 +137,122 @@ namespace FineUIPro.Web.CQMS.Solution
                     #region 妫�鏌ユ爲鑺傜偣
 
                     var zyUserIds =
-                        CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZY");
+                        CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Yi");
                     if (zyUserIds.Count > 0)
                     {
-                        SetCheck(trOne, zyUserIds);
+                        var zyUserIdsStr = string.Join(",", zyUserIds);
+                        drpzyUserIds.Values = zyUserIdsStr.Split(',');
+                        drpzyUserIds.Texts = GetUserNames(zyUserIdsStr);
+                        //SetCheck(trOne, zyUserIds);
                     }
 
                     var aqUserIds =
-                        CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "AQ");
+                        CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "Er");
                     if (aqUserIds.Count > 0)
                     {
-                        SetCheck(trThree, aqUserIds);
+                        var aqUserIdsStr = string.Join(",", aqUserIds);
+                        drpaqUserIds.Values = aqUserIdsStr.Split(',');
+                        drpaqUserIds.Texts = GetUserNames(aqUserIdsStr);
+                        //SetCheck(trThree, aqUserIds);
                     }
 
                     var sgUserIds =
                         CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "SG");
                     if (sgUserIds.Count > 0)
                     {
-                        SetCheck(trFive, sgUserIds);
+                        var sgUserIdsStr = string.Join(",", sgUserIds);
+                        //drpsgUserIds.Values = sgUserIdsStr.Split(',');
+                        //drpsgUserIds.Texts = GetUserNames(sgUserIdsStr);
+                        //SetCheck(trFive, sgUserIds);
                     }
 
+                    if (!string.IsNullOrEmpty(constructSolution.CsUsers))
+                    {
+                        drpCsUsers.Values = constructSolution.CsUsers.Split(',');
+                        drpCsUsers.Texts = GetUserNames(constructSolution.CsUsers);
+                    }
                     #endregion
 
                     
                     if (constructSolution.State == Const.CQMSConstructSolution_ReCompile)
-                    {
-                        agree.Hidden = true;
-                        options.Hidden = true;
-                        optio.Hidden = true;
-                    }
-
-                    if (constructSolution.State == Const.CQMSConstructSolution_Audit)
                     {
+                        txtProjectName.Enabled = false;
+                        txtCode.Enabled = false;
+                        drpUnit.Enabled = false;
+                        drpModelType.Enabled = false;
+                        drpSpecialType.Enabled = false;
+                        txtCompileDate.Enabled = false;
+                        txtSolutionName.Enabled = false;
+                        txtCNProfessional.Enabled = false;
+                        txtUnitWork.Enabled = false;
+                        //ContactImg = -2;
+                        //Panel2.Enabled = false;
+                        //Panel2.Hidden = true;
+                        btnSave.Hidden = true;
+                        //txtDocContent.Readonly = true;
+                        drpzyUserIds.Enabled = false;
+                        drpaqUserIds.Enabled = false;
+                        //drpsgUserIds.Enabled = false;
+                        drpCsUsers.Enabled = false;
+                        txtEdition.Enabled = false;
+
+                        agree.Hidden = true;
+                       
+                        optio.Hidden = true;
+
+                        #region 閲嶆姤
+                        zyUserIds =
+                        CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignTypeNew(ConstructSolutionId, "Yi");
+                        if (zyUserIds.Count > 0)
+                        {
+                            var zyUserIdsStr = string.Join(",", zyUserIds);
+                            drpzyUserIds.Values = zyUserIdsStr.Split(',');
+                            drpzyUserIds.Texts = GetUserNames(zyUserIdsStr);
+                            //SetCheck(trOne, zyUserIds);
+                        }
+
+                         aqUserIds =
+                            CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignTypeNew(ConstructSolutionId, "Er");
+                        if (aqUserIds.Count > 0)
+                        {
+                            var aqUserIdsStr = string.Join(",", aqUserIds);
+                            drpaqUserIds.Values = aqUserIdsStr.Split(',');
+                            drpaqUserIds.Texts = GetUserNames(aqUserIdsStr);
+                            //SetCheck(trThree, aqUserIds);
+                        }
+
+                         sgUserIds =
+                            CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignTypeNew(ConstructSolutionId, "SG");
+                        if (sgUserIds.Count > 0)
+                        {
+                            var sgUserIdsStr = string.Join(",", sgUserIds);
+                            //drpsgUserIds.Values = sgUserIdsStr.Split(',');
+                            //drpsgUserIds.Texts = GetUserNames(sgUserIdsStr);
+                            //SetCheck(trFive, sgUserIds);
+                        }
+                        #endregion
+                        //閲嶆姤鐨勬儏鍐典笅
+                        //鍔犺浇
+                        complianceObligationsCs = Funs.DB.Solution_CQMSConstructSolutionApprove_Item.Where(x => x.ConstructSolutionId == ConstructSolutionId)
+                           .OrderBy(x => x.SortId).OrderBy(x => x.Proposer).ToList();
+                        if (complianceObligationsCs.Count > 0)
+                        {
+                            gvOperateComplianceObligations.DataSource = complianceObligationsCs;
+                            gvOperateComplianceObligations.DataBind();
+                        }
+
+                        options.Hidden = false;
+                        options1.Hidden = false;
+                        btnNew.Hidden = true;
+                        gvOperateComplianceObligations.AllColumns[0].Hidden = true;
+                        gvOperateComplianceObligations.AllColumns[6].Hidden = true;
+                        gvOperateComplianceObligations.AllColumns[7].Hidden = true;
+                    }
+
+                    if (constructSolution.State == Const.CQMSConstructSolution_Audit ||
+                        constructSolution.State == Const.CQMSConstructSolution_Audit1)
+                    {
+                        plApprove2.Hidden = true;
                         txtProjectName.Enabled = false;
                         txtCode.Enabled = false;
                         drpUnit.Enabled = false;
@@ -143,12 +263,33 @@ namespace FineUIPro.Web.CQMS.Solution
                         txtCNProfessional.Enabled = false;
                         txtUnitWork.Enabled = false;
                         ContactImg = -2;
-                        Panel2.Enabled = false;
-                        Panel2.Hidden = true;
+                        //Panel2.Enabled = false;
+                        //Panel2.Hidden = true;
                         btnSave.Hidden=true;
                         txtDocContent.Readonly=true;
+                        drpzyUserIds.Enabled = false;
+                        drpaqUserIds.Enabled = false;
+                        //drpsgUserIds.Enabled = false;
+                        drpCsUsers.Enabled = false;
+                        txtEdition.Enabled = false;
+
+                        //1绾у鎵� 浜岀骇瀹℃壒锛屽鏋滃～鍐欒繃Solution_CQMSConstructSolutionApprove_Item鐨勬儏鍐� 鍒欐樉绀�
+                        complianceObligationsCs = Funs.DB.Solution_CQMSConstructSolutionApprove_Item.Where(x => x.ConstructSolutionId == ConstructSolutionId
+                        && x.Proposer == CurrUser.UserId).OrderBy(x => x.SortId).ToList();
+                        if (complianceObligationsCs.Count > 0)
+                        {
+                            isSendTrue = true;
+                            options.Hidden = false;
+                            options1.Hidden = false;
+                            gvOperateComplianceObligations.DataSource = complianceObligationsCs;
+                            gvOperateComplianceObligations.DataBind();
+                            gvOperateComplianceObligations.AllColumns[4].Hidden = true;
+                        }
+                        
                     }
 
+                   
+
                     ////鎻愪氦鐗堟湰浜哄娆′慨鏀�
                     //if (constructSolution.CompileMan.Equals(CurrUser.UserId))
                     //{
@@ -177,6 +318,7 @@ namespace FineUIPro.Web.CQMS.Solution
                     agree.Hidden = true;
                     txtEdition.Text = "0";
                     options.Hidden = true;
+                    options1.Hidden = true;
                     optio.Hidden = true;
                     plApprove2.Hidden = true;
                     txtCode.Text = SQLHelper.RunProcNewId2("SpGetNewCode3ByProjectId",
@@ -281,7 +423,15 @@ namespace FineUIPro.Web.CQMS.Solution
             {
                 constructSolution.CNProfessionalCodes = string.Join(",", txtCNProfessional.Values);
             }
-              
+
+            //鎶勯�佷汉
+            string sendUserIds = string.Empty;
+            if (!string.IsNullOrEmpty(drpCsUsers.Value))
+            {
+                sendUserIds = string.Join(",", drpCsUsers.Values);
+            }
+            constructSolution.CsUsers = sendUserIds;
+
             constructSolution.Edition = Convert.ToInt32(txtEdition.Text);
             constructSolution.ConstructSolutionId = HFConstructSolutionId.Text;
             constructSolution.Content = txtDocContent.Text.Trim();
@@ -324,88 +474,207 @@ namespace FineUIPro.Web.CQMS.Solution
                 countersign(constructSolution.ConstructSolutionId);
                 constructSolution.State = Const.CQMSConstructSolution_Audit;
                 CQMSConstructSolutionService.UpdateConstructSolution(constructSolution);
+                var approve = Funs.DB.Solution_CQMSConstructSolutionApprove.Where(x => x.ApproveDate == null &&
+                x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == CurrUser.UserId && x.ApproveType=="0").First();
 
-                var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(ConstructSolutionId);
-                if (approve.ApproveMan == this.CurrUser.UserId && approve.ApproveType == Const.CQMSConstructSolution_ReCompile)
+                if (approve!=null)
                 {
                     approve.ApproveDate = DateTime.Now;
-                    approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); 
-                    CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve); 
+                    CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve);
+                    TbrOperateComplianceObligationsCSort();
                 }
 
             }
+            //涓�绾у鏍�
             else if (constructSolution.State == Const.CQMSConstructSolution_Audit && saveType == "submit")
             {
-                UpdateApprove();
+                UpdateApprove("Yi");
+            }
+            //浜岀骇瀹℃壒
+            else if (constructSolution.State == Const.CQMSConstructSolution_Audit1 && saveType == "submit")
+            {
+                UpdateApprove("Er");
             }
         }
         /// <summary>
         /// 淇敼瀹℃壒鎰忚
         /// </summary>
-        private void UpdateApprove()
+        private void UpdateApprove(string signType)
         {
-            var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(ConstructSolutionId);
-            if (approve.ApproveMan==this.CurrUser.UserId )
+            var state = "";
+            if (signType == "Yi")
             {
-                approve.ApproveDate = DateTime.Now;
-                approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
-                approve.ApproveIdea = txtOptions.Text.Trim();
-                approve.Edition=Convert.ToInt32(txtEdition.Text);
-                CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve);
-                CheckIsAllAgree();
+                state = "2";
+            }
+            else {
+                state = "3";
+            }
+            var approveList = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(ConstructSolutionId, state);
+            if (approveList.Any(x => x.ApproveMan.IndexOf(CurrUser.UserId) > -1))
+            {
+                var approve = approveList.FirstOrDefault(x => x.ApproveMan == CurrUser.UserId);
+                if (approve.ApproveMan == this.CurrUser.UserId)
+                {
+                    approve.ApproveDate = DateTime.Now;
+                    approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
+                    //approve.ApproveIdea = txtOptions.Text.Trim();
+                    approve.Edition = Convert.ToInt32(txtEdition.Text);
+                    CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve);
+
+                    //濡傛灉绗簩娆″鎵癸紝骞朵笖鏈変笉鍚屾剰鐨勬儏鍐典笅锛岃繘琛屼慨鏀�
+                    if (isSendTrue)
+                    {
+                        SprOperateComplianceObligationsCSort();
+                    }
+
+                    //涓嶅悓鎰忕殑鎯呭喌涓� 瀹℃壒浜哄鍔犲垪琛�
+                    if (Convert.ToBoolean(rblIsAgree.SelectedValue) == false)
+                    {
+                        if (isSendTrue)
+                        {
+                            SprOperateComplianceObligationsCSort();
+                        }
+                        else {
+                            OperateComplianceObligationsCSort();
+                        }
+                        
+                    }
+
+                    CheckIsAllAgree(signType);
+                }
             }
-          
         }
         /// <summary>
         /// 鍒ゆ柇鏄惁鍏ㄩ儴鍚屾剰
         /// </summary>
-        private void CheckIsAllAgree()
+        private void CheckIsAllAgree(string signType)
         {
             var edtion = Convert.ToInt32(txtEdition.Text);
             var constructSolution =
                 CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(ConstructSolutionId);
-            var allApproves = CQMSConstructSolutionApproveService.GetHandleConstructSolutionApprovesByConstructSolutionId(ConstructSolutionId,
-                    constructSolution.Edition == null ? 0 : Convert.ToInt32(constructSolution.Edition));
+         
 
-            var needApporveCount = allApproves.Where(x => x.ApproveDate == null).Count();
-            if (needApporveCount>0) return; //鍒ゆ柇鏄惁鏈�鍚庝竴涓鎵�
+            //var needApporveCount = allApproves.Where(x => x.ApproveDate == null).Count();
+            //if (needApporveCount>0) return; //鍒ゆ柇鏄惁鏈�鍚庝竴涓鎵�
              
-            var count = allApproves.Where(p =>
-                p.ApproveDate != null && p.IsAgree != null && Convert.ToBoolean(p.IsAgree)).Count(); //鏌ヨ浼氱鍚屾剰鐨�
-            var fcount = allApproves.Where(p =>
-                p.ApproveDate != null && p.IsAgree != null && !Convert.ToBoolean(p.IsAgree)).Count(); //鏌ヨ浼氱涓嶅悓鎰忕殑
-            if (count == allApproves.Count)//鍏ㄩ儴鍚屾剰
-            {
-                var cons =
-                    CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(
-                        ConstructSolutionId);
-                cons.State = Const.CQMSConstructSolution_Complete;
-                cons.CompileDate = DateTime.Now;
-                CQMSConstructSolutionService.UpdateConstructSolution(cons);
-            }
+           
 
-            //鏈変笉鍚屾剰鎰忚锛屾墦鍥為噸鏂扮紪鍒�
-            if (fcount > 0)
+            //涓�绾у鏍�
+            if (signType=="Yi")
             {
-                var cons =
-                    CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(
-                        ConstructSolutionId);
-                var reApprove = new Solution_CQMSConstructSolutionApprove();
-                reApprove.ConstructSolutionId = constructSolution.ConstructSolutionId;
-                reApprove.ApproveMan = cons.CompileMan;
-                reApprove.ApproveType = Const.CQMSConstructSolution_ReCompile;
-                edtion++;
-                reApprove.Edition = edtion;
-                CQMSConstructSolutionApproveService.AddConstructSolutionApprove(reApprove);
+                var allApproves = CQMSConstructSolutionApproveService.GetHandleConstructSolutionApprovesByConstructSolutionId(ConstructSolutionId,
+                 constructSolution.Edition == null ? 0 : Convert.ToInt32(constructSolution.Edition));
+
+                var count = allApproves.Where(p => p.SignType == "Yi").Count(); //鏌ヨ涓�绾ф墍鏈夋暟閲�
+
+                var ycount = allApproves.Where(p =>p.ApproveDate != null && p.IsAgree != null 
+                && Convert.ToBoolean(p.IsAgree) && p.SignType=="Yi").Count(); //鏌ヨ涓�绾у鏍稿悓鎰忕殑
+
+                var fcount = allApproves.Where(p =>p.ApproveDate != null && p.IsAgree != null 
+                && !Convert.ToBoolean(p.IsAgree) && p.SignType == "Yi").Count(); //鏌ヨ涓�绾у鏍镐笉鍚屾剰鐨�
+
+                //濡傛灉褰撳墠宸茬粡瀹℃牳瀹�
+                if (count == (ycount + fcount))
+                {
+                    //鍏ㄩ儴鍚屾剰
+                    if (ycount == count)
+                    {
+                        //璧板埌涓嬩竴姝ワ紝淇敼鏂藉伐鏂规鐘舵�佷负浜岀骇瀹℃壒
+                        var cons = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(ConstructSolutionId);
+                        cons.State = Const.CQMSConstructSolution_Audit1;
+                        CQMSConstructSolutionService.UpdateConstructSolution(cons);
+
+                    }
+                    else {
+                        //鏈変笉鍚屾剰鐨勭洿鎺ユ墦鍥�
+                        var cons = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(
+                        ConstructSolutionId);
+                        var reApprove = new Solution_CQMSConstructSolutionApprove();
+                        reApprove.ConstructSolutionId = constructSolution.ConstructSolutionId;
+                        reApprove.ApproveMan = cons.CompileMan;
+                        reApprove.ApproveType = Const.CQMSConstructSolution_ReCompile;
+                        edtion++;
+                        reApprove.Edition = edtion;
+                        CQMSConstructSolutionApproveService.AddConstructSolutionApprove(reApprove);
+
+                        cons.State = Const.CQMSConstructSolution_ReCompile;
+                        cons.CompileDate = DateTime.Now;
+                        cons.Edition = edtion;
+                        constructSolution.State = Const.CQMSConstructSolution_ReCompile;
+                        CQMSConstructSolutionService.UpdateConstructSolution(cons);
+                        LogService.AddSys_Log(CurrUser, constructSolution.Code, ConstructSolutionId,
+                            Const.CQMSConstructSolutionMenuId, "淇敼鏂藉伐鏂规");
+                    }
+                }
+                else {
+                    //娌℃湁瀹℃牳瀹屽氨璺冲嚭
+                    return;
+                }
 
-                cons.State = Const.CQMSConstructSolution_ReCompile;
-                cons.CompileDate = DateTime.Now;
-                cons.Edition= edtion;
-                constructSolution.State = Const.CQMSConstructSolution_ReCompile;
-                CQMSConstructSolutionService.UpdateConstructSolution(cons);
-                LogService.AddSys_Log(CurrUser, constructSolution.Code, ConstructSolutionId,
-                    Const.CQMSConstructSolutionMenuId, "淇敼鏂藉伐鏂规");
             }
+            else if (signType=="Er")
+            {
+                var allApproves = CQMSConstructSolutionApproveService.GetHandleConstructSolutionApprovesByConstructSolutionId2(ConstructSolutionId,
+                 constructSolution.Edition == null ? 0 : Convert.ToInt32(constructSolution.Edition));
+                var count = allApproves.Where(p => p.SignType == "Er").Count(); //鏌ヨ浜岀骇鎵�鏈夋暟閲�
+
+                var ycount = allApproves.Where(p => p.ApproveDate != null && p.IsAgree != null
+                && Convert.ToBoolean(p.IsAgree) && p.SignType == "Er").Count(); //鏌ヨ浜岀骇瀹℃牳鍚屾剰鐨�
+
+                var fcount = allApproves.Where(p => p.ApproveDate != null && p.IsAgree != null
+                && !Convert.ToBoolean(p.IsAgree) && p.SignType == "Er").Count(); //鏌ヨ浜岀骇瀹℃牳涓嶅悓鎰忕殑
+                // 濡傛灉褰撳墠宸茬粡瀹℃牳瀹�
+                if (count == (ycount + fcount))
+                {
+                    //鍏ㄩ儴鍚屾剰
+                    if (ycount == count)
+                    {
+                        //瀹屾垚
+                        var cons = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(ConstructSolutionId);
+                        cons.State = Const.CQMSConstructSolution_Complete;
+                        cons.CompileDate = DateTime.Now;
+                        CQMSConstructSolutionService.UpdateConstructSolution(cons);
+
+                    }
+                    else
+                    {
+                        //鏈変笉鍚屾剰鐨勭洿鎺ユ墦鍥�
+                        var cons = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(
+                        ConstructSolutionId);
+                        var reApprove = new Solution_CQMSConstructSolutionApprove();
+                        reApprove.ConstructSolutionId = constructSolution.ConstructSolutionId;
+                        reApprove.ApproveMan = cons.CompileMan;
+                        reApprove.ApproveType = Const.CQMSConstructSolution_ReCompile;
+                        edtion++;
+                        reApprove.Edition = edtion;
+                        CQMSConstructSolutionApproveService.AddConstructSolutionApprove(reApprove);
+
+                        cons.State = Const.CQMSConstructSolution_ReCompile;
+                        cons.CompileDate = DateTime.Now;
+                        cons.Edition = edtion;
+                        constructSolution.State = Const.CQMSConstructSolution_ReCompile;
+                        CQMSConstructSolutionService.UpdateConstructSolution(cons);
+                        LogService.AddSys_Log(CurrUser, constructSolution.Code, ConstructSolutionId,
+                            Const.CQMSConstructSolutionMenuId, "淇敼鏂藉伐鏂规");
+                    }
+                }
+                else
+                {
+                    //娌℃湁瀹℃牳瀹屽氨璺冲嚭
+                    return;
+                }
+
+            }
+            //if (count == allApproves.Count)//鍏ㄩ儴鍚屾剰
+            //{
+                
+            //}
+
+            ////鏈変笉鍚屾剰鎰忚锛屾墦鍥為噸鏂扮紪鍒�
+            //if (fcount > 0)
+            //{
+                
+            //}
         }
 
         /// <summary>
@@ -422,9 +691,9 @@ namespace FineUIPro.Web.CQMS.Solution
                 if (!AttachFileService.Getfile(HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId))
                     err += "璇蜂笂浼犻檮浠�,";
                 var list = new List<Tree>();
-                list.Add(trOne);
-                list.Add(trThree);
-                list.Add(trFive);
+                //list.Add(trOne);
+                //list.Add(trThree);
+                //list.Add(trFive);
                 var res = false;
                 foreach (var item in list)
                     if (nodesCheckd(item))
@@ -593,69 +862,114 @@ namespace FineUIPro.Web.CQMS.Solution
         private void countersign(string constructSolutionId)
         {
             var solution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(ConstructSolutionId);
+            //涓�绾у鏍镐汉鍛�
+            foreach (var item in drpzyUserIds.Values)
+            {
+                var approve = new Solution_CQMSConstructSolutionApprove();
+                approve.ConstructSolutionId = constructSolutionId;
+                approve.ApproveMan = item;
+                approve.ApproveType = Const.CQMSConstructSolution_Audit;
+                approve.SignType = "Yi";
+                var edtion = Convert.ToInt32(txtEdition.Text);
+                //if (solution != null) edtion++;
+                approve.Edition = edtion;
+                approve.Order = 2;
+                //delSolutionApprove(constructSolutionId, item, "Yi");
+                CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
+            }
+            //浜岀骇瀹℃壒浜哄憳
+            foreach (var item in drpaqUserIds.Values)
+            {
+                var approve = new Solution_CQMSConstructSolutionApprove();
+                approve.ConstructSolutionId = constructSolutionId;
+                approve.ApproveMan = item;
+                approve.ApproveType = Const.CQMSConstructSolution_Audit1;
+                approve.SignType = "Er";
+                var edtion = Convert.ToInt32(txtEdition.Text);
+                //  if (solution != null) edtion++;
+                approve.Edition = edtion;
+                approve.Order = 3;
+                //delSolutionApprove(constructSolutionId, item, "Er");
+                CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
+            }
+            //foreach (var item in drpsgUserIds.Values)
+            //{
+            //    var approve = new Solution_CQMSConstructSolutionApprove();
+            //    approve.ConstructSolutionId = constructSolutionId;
+            //    approve.ApproveMan = item;
+            //    approve.ApproveType = Const.CQMSConstructSolution_Audit;
+            //    approve.SignType = "SG";
+            //    var edtion = Convert.ToInt32(txtEdition.Text);
+            //    //if (solution != null) edtion++;
+            //    approve.Edition = edtion;
+            //    approve.Order = 3;
+            //    delSolutionApprove(constructSolutionId, item, "SG");
+            //    CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
+            //}
 
-            if (trOne.Nodes[0].Nodes.Count > 0)
-                foreach (var tn in trOne.Nodes[0].Nodes)
-                    if (tn.Checked)
-                    {
-                        var approve = new Solution_CQMSConstructSolutionApprove();
-                        approve.ConstructSolutionId = constructSolutionId;
-                        approve.ApproveMan = tn.NodeID;
-                        approve.ApproveType = Const.CQMSConstructSolution_Audit;
-                        approve.SignType = "ZY";
-                        var edtion = Convert.ToInt32(txtEdition.Text);
-                        //if (solution != null) edtion++;
-                        approve.Edition = edtion;
-                        delSolutionApprove(constructSolutionId, tn.NodeID, "ZY");
-                        CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
-                        //APICommonService.SendSubscribeMessage(approve.ApproveMan, "鏂藉伐鏂规寰呭姙鐞�", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
-                    }
-                    else
-                    {
-                        delSolutionApprove(constructSolutionId, tn.NodeID, "ZY");
-                    }
 
-            if (trThree.Nodes[0].Nodes.Count > 0)
-                foreach (var tn in trThree.Nodes[0].Nodes)
-                    if (tn.Checked)
-                    {
-                        var approve = new Solution_CQMSConstructSolutionApprove();
-                        approve.ConstructSolutionId = constructSolutionId;
-                        approve.ApproveMan = tn.NodeID;
-                        approve.ApproveType = Const.CQMSConstructSolution_Audit;
-                        approve.SignType = "AQ";
-                        var edtion = Convert.ToInt32(txtEdition.Text);
-                        //  if (solution != null) edtion++;
-                        approve.Edition = edtion;
-                        delSolutionApprove(constructSolutionId, tn.NodeID, "AQ");
-                        CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
-                        //APICommonService.SendSubscribeMessage(approve.ApproveMan, "鏂藉伐鏂规寰呭姙鐞�", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
-                    }
-                    else
-                    {
-                        delSolutionApprove(constructSolutionId, tn.NodeID, "AQ");
-                    }
+            //if (trOne.Nodes[0].Nodes.Count > 0)
+            //    foreach (var tn in trOne.Nodes[0].Nodes)
+            //        if (tn.Checked)
+            //        {
+            //            var approve = new Solution_CQMSConstructSolutionApprove();
+            //            approve.ConstructSolutionId = constructSolutionId;
+            //            approve.ApproveMan = tn.NodeID;
+            //            approve.ApproveType = Const.CQMSConstructSolution_Audit;
+            //            approve.SignType = "ZY";
+            //            var edtion = Convert.ToInt32(txtEdition.Text);
+            //            //if (solution != null) edtion++;
+            //            approve.Edition = edtion;
+            //            delSolutionApprove(constructSolutionId, tn.NodeID, "ZY");
+            //            CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
+            //            //APICommonService.SendSubscribeMessage(approve.ApproveMan, "鏂藉伐鏂规寰呭姙鐞�", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+            //        }
+            //        else
+            //        {
+            //            delSolutionApprove(constructSolutionId, tn.NodeID, "ZY");
+            //        }
 
-            if (trFive.Nodes[0].Nodes.Count > 0)
-                foreach (var tn in trFive.Nodes[0].Nodes)
-                    if (tn.Checked)
-                    {
-                        var approve = new Solution_CQMSConstructSolutionApprove();
-                        approve.ConstructSolutionId = constructSolutionId;
-                        approve.ApproveMan = tn.NodeID;
-                        approve.ApproveType = Const.CQMSConstructSolution_Audit;
-                        approve.SignType = "SG";
-                        var edtion = Convert.ToInt32(txtEdition.Text);
-                      //  if (solution != null) edtion++;
-                        approve.Edition = edtion;
-                        delSolutionApprove(constructSolutionId, tn.NodeID, "SG");
-                        CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
-                        // APICommonService.SendSubscribeMessage(approve.ApproveMan, "鏂藉伐鏂规寰呭姙鐞�", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
-                    }
-                    else
-                    {
-                        delSolutionApprove(constructSolutionId, tn.NodeID, "SG");
-                    }
+            //if (trThree.Nodes[0].Nodes.Count > 0)
+            //    foreach (var tn in trThree.Nodes[0].Nodes)
+            //        if (tn.Checked)
+            //        {
+            //            var approve = new Solution_CQMSConstructSolutionApprove();
+            //            approve.ConstructSolutionId = constructSolutionId;
+            //            approve.ApproveMan = tn.NodeID;
+            //            approve.ApproveType = Const.CQMSConstructSolution_Audit;
+            //            approve.SignType = "AQ";
+            //            var edtion = Convert.ToInt32(txtEdition.Text);
+            //            //  if (solution != null) edtion++;
+            //            approve.Edition = edtion;
+            //            delSolutionApprove(constructSolutionId, tn.NodeID, "AQ");
+            //            CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
+            //            //APICommonService.SendSubscribeMessage(approve.ApproveMan, "鏂藉伐鏂规寰呭姙鐞�", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+            //        }
+            //        else
+            //        {
+            //            delSolutionApprove(constructSolutionId, tn.NodeID, "AQ");
+            //        }
+
+            //if (trFive.Nodes[0].Nodes.Count > 0)
+            //    foreach (var tn in trFive.Nodes[0].Nodes)
+            //        if (tn.Checked)
+            //        {
+            //            var approve = new Solution_CQMSConstructSolutionApprove();
+            //            approve.ConstructSolutionId = constructSolutionId;
+            //            approve.ApproveMan = tn.NodeID;
+            //            approve.ApproveType = Const.CQMSConstructSolution_Audit;
+            //            approve.SignType = "SG";
+            //            var edtion = Convert.ToInt32(txtEdition.Text);
+            //          //  if (solution != null) edtion++;
+            //            approve.Edition = edtion;
+            //            delSolutionApprove(constructSolutionId, tn.NodeID, "SG");
+            //            CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve);
+            //            // APICommonService.SendSubscribeMessage(approve.ApproveMan, "鏂藉伐鏂规寰呭姙鐞�", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
+            //        }
+            //        else
+            //        {
+            //            delSolutionApprove(constructSolutionId, tn.NodeID, "SG");
+            //        }
         }
 
         //protected void imgBtnFile_Click(object sender, EventArgs e)
@@ -750,26 +1064,63 @@ namespace FineUIPro.Web.CQMS.Solution
                 return;
             }
             var err = string.Empty;
-            if (!AttachFileService.Getfile(HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId))
-                err += "璇蜂笂浼犻檮浠�,";
-            var list = new List<Tree>();
-            list.Add(trOne);
-            list.Add(trThree);
-            list.Add(trFive);
-            var res = false;
-            foreach (var item in list)
-                if (nodesCheckd(item))
-                {
-                    res = true;
-                    break;
-                }
+            //if (!AttachFileService.Getfile(HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId))
+            //    err += "璇蜂笂浼犻檮浠�,";
+            //var list = new List<Tree>();
+            //list.Add(trOne);
+            //list.Add(trThree);
+            //list.Add(trFive);
+            //var res = false;
+            //foreach (var item in list)
+            //    if (nodesCheckd(item))
+            //    {
+            //        res = true;
+            //        break;
+            //    }
+
+            //if (!res) err += "璇烽�夋嫨鎬诲寘浼氱浜哄憳,";
+
+            if (drpzyUserIds.Values.Length<2)
+            {
+                err += "涓�绾у鏍镐汉鍛樺繀椤婚�夋嫨鏂藉伐宸ョ▼甯堝拰HSE宸ョ▼甯堬紝褰撳墠灏忎簬2浜�,";
+            }
+
+            if (drpaqUserIds.Values.Length < 3)
+            {
+                err += "涓�浜岀骇瀹℃壒浜哄憳蹇呴』閫夋嫨鏂藉伐缁忕悊銆丠SE缁忕悊銆佽川閲忕粡鐞嗭紝褰撳墠灏忎簬3浜�,";
+            }
+
+            //if (string.IsNullOrEmpty(drpzyUserIds.Value))
+            //{
+            //    err += "璇烽�夋嫨鎬诲寘浼氱涓撲笟宸ョ▼甯�,";
+            //}
+            //if (string.IsNullOrEmpty(drpaqUserIds.Value))
+            //{
+            //    err += "璇烽�夋嫨鎬诲寘浼氱HSE缁�,";
+            //}
+            //if (string.IsNullOrEmpty(drpsgUserIds.Value))
+            //{
+            //    err += "璇烽�夋嫨鎬诲寘浼氱鏂藉伐缁忕悊,";
+            //}
 
-            if (!res) err += "璇烽�夋嫨鎬诲寘浼氱浜哄憳,";
             if (!string.IsNullOrWhiteSpace(err))
             {
                 err = err.Substring(0, err.LastIndexOf(","));
                 err += "!";
             }
+            if (!string.IsNullOrEmpty(ConstructSolutionId))
+            {
+                var constructSolution =
+                    CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(ConstructSolutionId);
+                if (constructSolution.State == Const.CQMSConstructSolution_Audit && Convert.ToBoolean(rblIsAgree.SelectedValue)==false)
+                {
+                    if (complianceObligationsCs.Count==0)
+                    {
+                        err += "涓嶅悓鎰忕殑鎯呭喌涓嬭娣诲姞淇敼鎰忚,";
+                    }
+                }
+            }
+
 
             if (!string.IsNullOrWhiteSpace(err))
             {
@@ -777,7 +1128,9 @@ namespace FineUIPro.Web.CQMS.Solution
                 return;
             }
 
-            Save("submit");
+            
+
+                Save("submit");
             CQMSConstructSolutionApproveService.PushMessageToNextMan(ConstructSolutionId);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             Alert.ShowInTop("鎻愪氦鎴愬姛!", MessageBoxIcon.Success);
@@ -861,7 +1214,7 @@ namespace FineUIPro.Web.CQMS.Solution
 
                         approve.Edition = Convert.ToInt32(edtion);
                         approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
-                        approve.ApproveIdea = txtOptions.Text.Trim();
+                        //approve.ApproveIdea = txtOptions.Text.Trim();
                         CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve);
                     }
                     else
@@ -974,7 +1327,7 @@ namespace FineUIPro.Web.CQMS.Solution
                 if (userIds.Contains(tn.NodeID))
                 {
                     tn.Checked = true;
-                    txtCopyMan.Text += tn.Text;
+                    //txtCopyMan.Text += tn.Text;
                 }
             }
         }
@@ -988,8 +1341,8 @@ namespace FineUIPro.Web.CQMS.Solution
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
             rootNode.EnableCheckEvent = true;
-            trOne.Nodes.Add(rootNode);
-            trOne.EnableCheckBox = true;
+            //trOne.Nodes.Add(rootNode);
+            //trOne.EnableCheckBox = true;
             using (var db = new SGGLDB(Funs.ConnString))
             {
                 var userList = from x in db.Sys_User
@@ -1039,8 +1392,8 @@ namespace FineUIPro.Web.CQMS.Solution
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
             rootNode.EnableCheckEvent = true;
-            trThree.Nodes.Add(rootNode);
-            trThree.EnableCheckBox = true;
+            //trThree.Nodes.Add(rootNode);
+            //trThree.EnableCheckBox = true;
             using (var db = new SGGLDB(Funs.ConnString))
             {
                 var userList = from x in db.Sys_User
@@ -1070,8 +1423,8 @@ namespace FineUIPro.Web.CQMS.Solution
             rootNode.NodeID = "0";
             rootNode.Expanded = true;
             rootNode.EnableCheckEvent = true;
-            trFive.Nodes.Add(rootNode);
-            trFive.EnableCheckBox = true;
+            //trFive.Nodes.Add(rootNode);
+            //trFive.EnableCheckBox = true;
             using (var db = new SGGLDB(Funs.ConnString))
             {
                 var userList = from x in db.Sys_User
@@ -1101,10 +1454,10 @@ namespace FineUIPro.Web.CQMS.Solution
 
         protected void trOne_NodeCheck(object sender, TreeCheckEventArgs e)
         {
-            if (e.Checked)
-                trOne.CheckAllNodes(e.Node.Nodes);
-            else
-                trOne.UncheckAllNodes(e.Node.Nodes);
+            //if (e.Checked)
+            //    trOne.CheckAllNodes(e.Node.Nodes);
+            //else
+            //    trOne.UncheckAllNodes(e.Node.Nodes);
         }
 
         protected void trTwo_NodeCheck(object sender, TreeCheckEventArgs e)
@@ -1121,10 +1474,10 @@ namespace FineUIPro.Web.CQMS.Solution
 
         protected void trThree_NodeCheck(object sender, TreeCheckEventArgs e)
         {
-            if (e.Checked)
-                trThree.CheckAllNodes(e.Node.Nodes);
-            else
-                trThree.UncheckAllNodes(e.Node.Nodes);
+            //if (e.Checked)
+            //    trThree.CheckAllNodes(e.Node.Nodes);
+            //else
+            //    trThree.UncheckAllNodes(e.Node.Nodes);
         }
 
         protected void trFour_NodeCheck(object sender, TreeCheckEventArgs e)
@@ -1141,10 +1494,10 @@ namespace FineUIPro.Web.CQMS.Solution
 
         protected void trFive_NodeCheck(object sender, TreeCheckEventArgs e)
         {
-            if (e.Checked)
-                trFive.CheckAllNodes(e.Node.Nodes);
-            else
-                trFive.UncheckAllNodes(e.Node.Nodes);
+            //if (e.Checked)
+            //    trFive.CheckAllNodes(e.Node.Nodes);
+            //else
+            //    trFive.UncheckAllNodes(e.Node.Nodes);
         }
 
         protected void trSixe_NodeCheck(object sender, TreeCheckEventArgs e)
@@ -1160,5 +1513,512 @@ namespace FineUIPro.Web.CQMS.Solution
         }
 
         #endregion
+
+        #region 鍔犺浇涓�绾у鏍镐汉鍛�
+        private void GetCheckManBindGrid1()
+        {
+            var tb = GetCheckManSource1();
+            // 1.璁剧疆鎬婚」鏁帮紙鐗瑰埆娉ㄦ剰锛氭暟鎹簱鍒嗛〉涓�瀹氳璁剧疆鎬昏褰曟暟RecordCount锛�
+            Grid1.RecordCount = tb.Rows.Count;
+
+            // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            // 3.缁戝畾鍒癎rid
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 涓�绾у鏍镐汉鍛橈紝 鏂藉伐宸ョ▼甯堝拰HSE宸ョ▼甯�
+        /// </summary>
+        /// <returns></returns>
+        private DataTable GetCheckManSource1()
+        {
+            string sortField = Grid1.SortField;
+            string sortDirection = Grid1.SortDirection;
+
+            var userList = (from x in Funs.DB.Sys_User
+                            join y in Funs.DB.Project_ProjectUnit
+                                on x.UnitId equals y.UnitId
+                            join p in Funs.DB.Project_ProjectUser
+                                on x.UserId equals p.UserId
+                            where (p.RoleId.Contains(Const.ZBCNEngineer)|| p.RoleId.Contains(Const.HSSEEngineer)
+                                   || p.RoleId.Contains(Const.SGEngineer))
+                                  && y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId &&
+                                  y.ProjectId == CurrUser.LoginProjectId
+                            select x);
+
+            DataTable table2 = LINQToDataTable(userList);
+            DataView view2 = table2.DefaultView;
+            view2.Sort = String.Format("{0} {1}", sortField, sortDirection);
+
+            string searchKeyword = ttbSearch1.Text.Trim();
+            if (!String.IsNullOrEmpty(searchKeyword) && ttbSearch1.ShowTrigger1)
+            {
+                view2.RowFilter = String.Format(" UserName LIKE '%{0}%'", searchKeyword);
+            }
+
+            return view2.ToTable();
+        }
+
+        protected void ttbSearch_Trigger1Click1(object sender, EventArgs e)
+        {
+            ttbSearch1.ShowTrigger1 = true;
+            GetCheckManBindGrid1();
+        }
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            GetCheckManBindGrid1();
+        }
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            GetCheckManBindGrid1();
+        }
+        protected void ttbSearch_Trigger2Click1(object sender, EventArgs e)
+        {
+            ttbSearch1.ShowTrigger1 = true;
+            GetCheckManBindGrid1();
+        }
+
+        #endregion
+
+        #region 鍔犺浇浜岀骇瀹℃壒浜哄憳
+        private void GetCheckManBindGrid2()
+        {
+            var tb = GetCheckManSource2();
+            // 1.璁剧疆鎬婚」鏁帮紙鐗瑰埆娉ㄦ剰锛氭暟鎹簱鍒嗛〉涓�瀹氳璁剧疆鎬昏褰曟暟RecordCount锛�
+            Grid2.RecordCount = tb.Rows.Count;
+
+            // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁
+            var table = this.GetPagedDataTable(Grid2, tb);
+
+            // 3.缁戝畾鍒癎rid
+            Grid2.DataSource = table;
+            Grid2.DataBind();
+        }
+
+        /// <summary>
+        /// 浜岀骇瀹℃壒浜哄憳鏄剧ず鏂藉伐缁忕悊銆丠SE缁忕悊銆佽川閲忕粡鐞�
+        /// </summary>
+        /// <returns></returns>
+        private DataTable GetCheckManSource2()
+        {
+            string sortField = Grid2.SortField;
+            string sortDirection = Grid2.SortDirection;
+
+            var userList = (from x in Funs.DB.Sys_User
+                            join y in Funs.DB.Project_ProjectUnit
+                                on x.UnitId equals y.UnitId
+                            join p in Funs.DB.Project_ProjectUser
+                                on x.UserId equals p.UserId
+                            where (p.RoleId.Contains(Const.HSSEManager) || p.RoleId.Contains(Const.ConstructionManager)
+                            || p.RoleId.Contains(Const.QAManager))
+                                  && y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId &&
+                                  y.ProjectId == CurrUser.LoginProjectId
+                            orderby x.UserCode
+                            select x);
+
+            DataTable table2 = LINQToDataTable(userList);
+            DataView view2 = table2.DefaultView;
+            view2.Sort = String.Format("{0} {1}", sortField, sortDirection);
+
+            string searchKeyword = ttbSearch1.Text.Trim();
+            if (!String.IsNullOrEmpty(searchKeyword) && ttbSearch1.ShowTrigger1)
+            {
+                view2.RowFilter = String.Format(" UserName LIKE '%{0}%'", searchKeyword);
+            }
+
+            return view2.ToTable();
+        }
+
+        protected void ttbSearch_Trigger1Click2(object sender, EventArgs e)
+        {
+            ttbSearch2.ShowTrigger1 = true;
+            GetCheckManBindGrid2();
+        }
+        protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid2.PageIndex = e.NewPageIndex;
+            GetCheckManBindGrid2();
+        }
+        protected void Grid2_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid2.SortDirection = e.SortDirection;
+            Grid2.SortField = e.SortField;
+            GetCheckManBindGrid2();
+        }
+        protected void ttbSearch_Trigger2Click2(object sender, EventArgs e)
+        {
+            ttbSearch2.ShowTrigger1 = true;
+            GetCheckManBindGrid2();
+        }
+        #endregion
+
+        #region 鍔犺浇鏂藉伐缁忕悊  涓嶇敤
+        //private void GetCheckManBindGrid3()
+        //{
+        //    var tb = GetCheckManSource3();
+        //    // 1.璁剧疆鎬婚」鏁帮紙鐗瑰埆娉ㄦ剰锛氭暟鎹簱鍒嗛〉涓�瀹氳璁剧疆鎬昏褰曟暟RecordCount锛�
+        //    Grid3.RecordCount = tb.Rows.Count;
+
+        //    // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁
+        //    var table = this.GetPagedDataTable(Grid3, tb);
+
+        //    // 3.缁戝畾鍒癎rid
+        //    Grid3.DataSource = table;
+        //    Grid3.DataBind();
+        //}
+
+        //private DataTable GetCheckManSource3()
+        //{
+        //    string sortField = Grid3.SortField;
+        //    string sortDirection = Grid3.SortDirection;
+
+        //    var userList = (from x in Funs.DB.Sys_User
+        //                    join y in Funs.DB.Project_ProjectUnit
+        //                        on x.UnitId equals y.UnitId
+        //                    join p in Funs.DB.Project_ProjectUser
+        //                        on x.UserId equals p.UserId
+        //                    where (p.RoleId.Contains(Const.ConstructionManager) ||
+        //                           p.RoleId.Contains(Const.ConstructionAssistantManager))
+        //                          && y.UnitType == Const.ProjectUnitType_1 && p.ProjectId == CurrUser.LoginProjectId &&
+        //                          y.ProjectId == CurrUser.LoginProjectId
+        //                    orderby x.UserCode
+        //                    select x);
+
+        //    DataTable table2 = LINQToDataTable(userList);
+        //    DataView view2 = table2.DefaultView;
+        //    view2.Sort = String.Format("{0} {1}", sortField, sortDirection);
+
+        //    string searchKeyword = ttbSearch1.Text.Trim();
+        //    if (!String.IsNullOrEmpty(searchKeyword) && ttbSearch1.ShowTrigger1)
+        //    {
+        //        view2.RowFilter = String.Format(" UserName LIKE '%{0}%'", searchKeyword);
+        //    }
+
+        //    return view2.ToTable();
+        //}
+
+        //protected void ttbSearch_Trigger1Click3(object sender, EventArgs e)
+        //{
+        //    ttbSearch3.ShowTrigger1 = true;
+        //    GetCheckManBindGrid3();
+        //}
+        //protected void Grid3_PageIndexChange(object sender, GridPageEventArgs e)
+        //{
+        //    Grid3.PageIndex = e.NewPageIndex;
+        //    GetCheckManBindGrid3();
+        //}
+        //protected void Grid3_Sort(object sender, GridSortEventArgs e)
+        //{
+        //    Grid3.SortDirection = e.SortDirection;
+        //    Grid3.SortField = e.SortField;
+        //    GetCheckManBindGrid3();
+        //}
+        //protected void ttbSearch_Trigger2Click3(object sender, EventArgs e)
+        //{
+        //    ttbSearch3.ShowTrigger1 = true;
+        //    GetCheckManBindGrid3();
+        //}
+        #endregion
+
+        #region 鍔犺浇鎶勯�佷汉鍛�
+        private void GetCheckManBindGrid4()
+        {
+            var tb = GetCheckManSource4();
+            // 1.璁剧疆鎬婚」鏁帮紙鐗瑰埆娉ㄦ剰锛氭暟鎹簱鍒嗛〉涓�瀹氳璁剧疆鎬昏褰曟暟RecordCount锛�
+            Grid4.RecordCount = tb.Rows.Count;
+
+            // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁
+            var table = this.GetPagedDataTable(Grid4, tb);
+
+            // 3.缁戝畾鍒癎rid
+            Grid4.DataSource = table;
+            Grid4.DataBind();
+        }
+
+        private DataTable GetCheckManSource4()
+        {
+            string sortField = Grid4.SortField;
+            string sortDirection = Grid4.SortDirection;
+
+            var userList = (from x in Funs.DB.Sys_User
+                            join y in Funs.DB.Project_ProjectUnit
+                                on x.UnitId equals y.UnitId
+                            join p in Funs.DB.Project_ProjectUser
+                                on x.UserId equals p.UserId
+                            where p.ProjectId == CurrUser.LoginProjectId &&
+                                  y.ProjectId == CurrUser.LoginProjectId
+                            orderby x.UserCode
+                            select x);
+
+            DataTable table2 = LINQToDataTable(userList);
+            DataView view2 = table2.DefaultView;
+            view2.Sort = String.Format("{0} {1}", sortField, sortDirection);
+
+            string searchKeyword = ttbSearch4.Text.Trim();
+            if (!String.IsNullOrEmpty(searchKeyword) && ttbSearch4.ShowTrigger1)
+            {
+                view2.RowFilter = String.Format(" UserName LIKE '%{0}%'", searchKeyword);
+            }
+
+            return view2.ToTable();
+        }
+
+        protected void ttbSearch_Trigger1Click4(object sender, EventArgs e)
+        {
+            ttbSearch4.ShowTrigger1 = true;
+            GetCheckManBindGrid4();
+        }
+        protected void Grid4_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid4.PageIndex = e.NewPageIndex;
+            GetCheckManBindGrid4();
+        }
+        protected void Grid4_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid4.SortDirection = e.SortDirection;
+            Grid4.SortField = e.SortField;
+            GetCheckManBindGrid4();
+        }
+        protected void ttbSearch_Trigger2Click4(object sender, EventArgs e)
+        {
+            ttbSearch4.ShowTrigger1 = true;
+            GetCheckManBindGrid4();
+        }
+        #endregion
+
+        #region  linq缁撴灉杞崲datatable
+        /// <summary>
+        /// linq缁撴灉杞崲datatable
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="varlist"></param>
+        /// <returns></returns>
+        public DataTable LINQToDataTable<T>(IEnumerable<T> varlist)
+
+        {
+            DataTable dtReturn = new DataTable();
+            // column names 
+            PropertyInfo[] oProps = null;
+
+
+
+            if (varlist == null) return dtReturn;
+
+            foreach (T rec in varlist)
+            {
+                // Use reflection to get property names, to create table, Only first time, others 
+                 if (oProps == null)
+                {
+                    oProps = ((Type)rec.GetType()).GetProperties();
+                    foreach (PropertyInfo pi in oProps)
+                    {
+                        Type colType = pi.PropertyType;
+
+                        if ((colType.IsGenericType) && (colType.GetGenericTypeDefinition()
+                        == typeof(Nullable<>)))
+                        {
+                            colType = colType.GetGenericArguments()[0];
+                        }
+
+                        dtReturn.Columns.Add(new DataColumn(pi.Name, colType));
+                    }
+                }
+
+                DataRow dr = dtReturn.NewRow();
+
+                foreach (PropertyInfo pi in oProps)
+                {
+                    dr[pi.Name] = pi.GetValue(rec, null) == null ? DBNull.Value : pi.GetValue
+                    (rec, null);
+                }
+
+                dtReturn.Rows.Add(dr);
+            }
+            return dtReturn;
+        }
+        #endregion
+
+        #region 瀹℃壒濉啓琛ㄦ牸
+        /// <summary>
+        /// 瀹℃壒浜轰繚瀛樼涓�娆�
+        /// </summary>
+        private void OperateComplianceObligationsCSort()
+        {
+            BLL.ComplianceObligationsCService.DeleteSolution_CQMSConstructSolutionApprove_Item(ConstructSolutionId,CurrUser.UserId);
+            jerqueSaveComplianceObligationsCList();
+            foreach (Model.Solution_CQMSConstructSolutionApprove_Item coc in complianceObligationsCs)
+            {
+                coc.ConstructSolutionId = ConstructSolutionId;
+                BLL.ComplianceObligationsCService.AddSolution_CQMSConstructSolutionApprove_Item(coc);
+            }
+        }
+
+        /// <summary>
+        /// 濉姤浜轰繚瀛橈紙淇敼锛�
+        /// </summary>
+        private void TbrOperateComplianceObligationsCSort()
+        {
+            jerqueSaveComplianceObligationsCListTbr();
+            foreach (Model.Solution_CQMSConstructSolutionApprove_Item coc in complianceObligationsCs)
+            {
+                coc.ConstructSolutionId = ConstructSolutionId;
+                BLL.ComplianceObligationsCService.UpdateSolution_CQMSConstructSolutionApprove_Item(coc);
+            }
+        }
+
+        /// <summary>
+        /// 瀹℃壒浜猴紙淇敼锛�
+        /// </summary>
+        private void SprOperateComplianceObligationsCSort()
+        {
+            jerqueSaveComplianceObligationsCListSpr();
+            foreach (Model.Solution_CQMSConstructSolutionApprove_Item coc in complianceObligationsCs)
+            {
+                coc.ConstructSolutionId = ConstructSolutionId;
+                BLL.ComplianceObligationsCService.UpdateSolution_CQMSConstructSolutionApprove_ItemNew(coc);
+            }
+        }
+
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            jerqueSaveComplianceObligationsCList();
+            Model.Solution_CQMSConstructSolutionApprove_Item complianceObligationsC = new Model.Solution_CQMSConstructSolutionApprove_Item
+            {
+                Id = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolutionApprove_Item))
+            };
+            complianceObligationsCs.Add(complianceObligationsC);
+            this.gvOperateComplianceObligations.DataSource = complianceObligationsCs;
+            this.gvOperateComplianceObligations.DataBind();
+        }
+
+        private void jerqueSaveComplianceObligationsCList()
+        {
+            complianceObligationsCs.Clear();
+            JArray mergedData = gvOperateComplianceObligations.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+               var hazardSort = new Model.Solution_CQMSConstructSolutionApprove_Item
+                {
+                   Id = this.gvOperateComplianceObligations.Rows[i].DataKeys[0].ToString(),
+                   SortId= i+1,
+                   Chapter = values.Value<string>("Chapter").ToString(),
+                   Amendment = values.Value<string>("Amendment").ToString(),
+                   Proposer = CurrUser.UserId,
+                   ProposerName= CurrUser.UserName,
+                   Modification = values.Value<string>("Modification").ToString(),
+                   ReviewerOpinion = values.Value<string>("ReviewerOpinion").ToString(),
+                   IsAccept = values.Value<string>("IsAccept").ToString(),
+               };
+                complianceObligationsCs.Add(hazardSort);
+            }
+        }
+
+        private void jerqueSaveComplianceObligationsCListTbr()
+        {
+            complianceObligationsCs.Clear();
+            JArray mergedData = gvOperateComplianceObligations.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                var hazardSort = new Model.Solution_CQMSConstructSolutionApprove_Item
+                {
+                    Id = this.gvOperateComplianceObligations.Rows[i].DataKeys[0].ToString(),
+                    Modification = values.Value<string>("Modification").ToString(),
+                   
+                };
+                complianceObligationsCs.Add(hazardSort);
+            }
+        }
+
+        private void jerqueSaveComplianceObligationsCListSpr()
+        {
+            complianceObligationsCs.Clear();
+            JArray mergedData = gvOperateComplianceObligations.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                var hazardSort = new Model.Solution_CQMSConstructSolutionApprove_Item
+                {
+                    Id = this.gvOperateComplianceObligations.Rows[i].DataKeys[0].ToString(),
+                    ReviewerOpinion= values.Value<string>("ReviewerOpinion").ToString(),
+                    IsAccept = values.Value<string>("IsAccept").ToString(),
+
+                };
+                complianceObligationsCs.Add(hazardSort);
+            }
+        }
+
+        protected void gvOperateComplianceObligations_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            jerqueSaveComplianceObligationsCList();
+            string rowID = this.gvOperateComplianceObligations.DataKeys[e.RowIndex][0].ToString();
+            if (e.CommandName == "Delete")
+            {
+                foreach (var item in complianceObligationsCs)
+                {
+                    if (item.Id == rowID)
+                    {
+                        complianceObligationsCs.Remove(item);
+                        break;
+                    }
+                }
+                gvOperateComplianceObligations.DataSource = complianceObligationsCs;
+                gvOperateComplianceObligations.DataBind();
+                ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 涓嶅悓鎰忕殑鎯呭喌涓嬫樉绀�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void radChange(object sender, EventArgs e) {
+                //涓嶅悓鎰忕殑鎯呭喌涓�
+            if (rblIsAgree.SelectedValue == "false")
+            {
+                if (isSendTrue)
+                { 
+                    
+                }
+                else {
+                    //鏄剧ず
+                    options.Hidden = false;
+                    options1.Hidden = false;
+                    //绗竴娆�
+                    gvOperateComplianceObligations.AllColumns[4].Hidden = true;
+                    gvOperateComplianceObligations.AllColumns[5].Hidden = true;
+                    gvOperateComplianceObligations.AllColumns[6].Hidden = true;
+                    gvOperateComplianceObligations.AllColumns[7].Hidden = true;
+                }
+                   
+            }
+            else {
+                if (isSendTrue)
+                {
+
+                }
+                else {
+                    //鍚屾剰鐨勬儏鍐典笅
+                    options.Hidden = true;
+                    options1.Hidden = true;
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs
index 179c4546..61364cb6 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs
@@ -168,103 +168,85 @@ namespace FineUIPro.Web.CQMS.Solution
         protected global::FineUIPro.DatePicker txtCompileDate;
 
         /// <summary>
-        /// TabStrip1 鎺т欢銆�
+        /// drpzyUserIds 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TabStrip TabStrip1;
+        protected global::FineUIPro.DropDownBox drpzyUserIds;
 
         /// <summary>
-        /// SimpleForm2 鎺т欢銆�
+        /// Grid1 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.SimpleForm SimpleForm2;
+        protected global::FineUIPro.Grid Grid1;
 
         /// <summary>
-        /// txtDocContent 鎺т欢銆�
+        /// ttbSearch1 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.HtmlEditor txtDocContent;
+        protected global::FineUIPro.TwinTriggerBox ttbSearch1;
 
         /// <summary>
-        /// txtCopyMan 鎺т欢銆�
+        /// drpaqUserIds 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtCopyMan;
+        protected global::FineUIPro.DropDownBox drpaqUserIds;
 
         /// <summary>
-        /// Panel2 鎺т欢銆�
+        /// Grid2 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.Panel Panel2;
+        protected global::FineUIPro.Grid Grid2;
 
         /// <summary>
-        /// Panel1 鎺т欢銆�
+        /// ttbSearch2 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.Panel Panel1;
+        protected global::FineUIPro.TwinTriggerBox ttbSearch2;
 
         /// <summary>
-        /// trOne 鎺т欢銆�
+        /// drpCsUsers 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.Tree trOne;
+        protected global::FineUIPro.DropDownBox drpCsUsers;
 
         /// <summary>
-        /// Panel4 鎺т欢銆�
+        /// Grid4 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.Panel Panel4;
+        protected global::FineUIPro.Grid Grid4;
 
         /// <summary>
-        /// trThree 鎺т欢銆�
+        /// ttbSearch4 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.Tree trThree;
-
-        /// <summary>
-        /// Panel6 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Panel Panel6;
-
-        /// <summary>
-        /// trFive 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Tree trFive;
+        protected global::FineUIPro.TwinTriggerBox ttbSearch4;
 
         /// <summary>
         /// agree 鎺т欢銆�
@@ -294,13 +276,76 @@ namespace FineUIPro.Web.CQMS.Solution
         protected global::FineUIPro.FormRow options;
 
         /// <summary>
-        /// txtOptions 鎺т欢銆�
+        /// btnNew 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextArea txtOptions;
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// options1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.FormRow options1;
+
+        /// <summary>
+        /// gvOperateComplianceObligations 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid gvOperateComplianceObligations;
+
+        /// <summary>
+        /// TextBox7 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox7;
+
+        /// <summary>
+        /// TextBox1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox1;
+
+        /// <summary>
+        /// TextBox2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+
+        /// <summary>
+        /// TextBox3 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox3;
+
+        /// <summary>
+        /// drpIsAccept 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpIsAccept;
 
         /// <summary>
         /// optio 鎺т欢銆�
@@ -320,6 +365,33 @@ namespace FineUIPro.Web.CQMS.Solution
         /// </remarks>
         protected global::FineUIPro.Button btnapprove;
 
+        /// <summary>
+        /// TabStrip1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// SimpleForm2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm2;
+
+        /// <summary>
+        /// txtDocContent 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HtmlEditor txtDocContent;
+
         /// <summary>
         /// plApprove2 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx
new file mode 100644
index 00000000..c09845a4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx
@@ -0,0 +1,103 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DivisionDivideAndCrop.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.DivisionDivideAndCrop" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎銆佽鍓�</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                    RegionPercent="20%" Title="鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋�" TitleToolTip="鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋�" ShowBorder="true" ShowHeader="true"
+                    BodyPadding="10px">
+                    <Items>
+                        <f:Tree ID="trUnitWork" EnableCollapse="true" ShowHeader="true" OnlyLeafCheck="true" OnNodeExpand="trUnitWork_NodeExpand" AutoLeafIdentification="true"
+                            runat="server" OnNodeCommand="trUnitWork_NodeCommand">
+                            <Listeners>
+                                 <f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
+                            </Listeners>
+                        </f:Tree>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="涓棿闈㈡澘" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Items>
+                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true" EnableColumnLines="true"
+                            runat="server" BoxFlex="1" DataKeyNames="DivisionId,ParentId,DivisionLevel,Status" EnableTree="true" TreeColumn="BranchEngineeringCode" ExpandAllTreeNodes="true" 
+                            DataIDField="DivisionId" AllowPaging="false"  DataParentIDField="ParentId" AllowCellEditing="false" ClicksToEdit="1" EnableCheckBoxSelect="true" KeepCurrentSelection="true"
+                            ForceFit="true" ShowSelectedCell="true" >
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSave" ToolTip="淇濆瓨" Icon="SystemSave" runat="server" Text="淇濆瓨" Hidden="true"
+                                            OnClick="btnSave_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnImport" ToolTip="瀵煎叆" Text="瀵煎叆" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <%--<f:RowNumberField HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center" />--%>
+                                <f:RenderField ColumnID="BranchEngineeringCode" Width="120px" DataField="BranchEngineeringCode" HeaderText="鍒嗛儴宸ョ▼缂栧彿" HeaderTextAlign="Center" >
+                                </f:RenderField>
+                                <f:RenderField ColumnID="BranchEngineeringName"  Width="150px" DataField="BranchEngineeringName" HeaderText="鍒嗛儴宸ョ▼鍚嶇О" HeaderTextAlign="Center" >
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SubBranchEngineeringName" Width="150px" DataField="SubBranchEngineeringName" HeaderText="瀛愬垎閮ㄥ伐绋嬪悕绉�" HeaderTextAlign="Center" >
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProEngineeringName" ExpandUnusedSpace="true" Width="150px" DataField="ProEngineeringName" HeaderText="鍒嗛」宸ョ▼鍚嶇О" HeaderTextAlign="Center" >
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProEngineeringCode"  Width="100px" DataField="ProEngineeringCode" HeaderText="鍒嗛」宸ョ▼缂栧彿" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProEngineeringNum"  Width="100px" DataField="ProEngineeringNum" HeaderText="鍒嗛儴鍒嗛」鐮�" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="DivisionLevel"  Width="100px" DataField="DivisionLevel" HeaderText="绾у埆" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="50px" ColumnID="Sort" DataField="Sort" HeaderText="鎺掑簭" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+    </form>
+    <f:Window ID="Window1" Title="寮瑰嚭绐椾綋" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Top" EnableResize="false" runat="server" IsModal="true"
+        Width="700px" Height="560px">
+    </f:Window> 
+    <f:Window ID="Window2" Title="淇敼鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋�" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Top" EnableResize="false" runat="server" IsModal="true"
+        Width="700px" Height="300px" OnClose="Window2_Close">
+    </f:Window> 
+    <f:Menu ID="Menu1" runat="server">
+        <Items>
+            <f:MenuButton ID="btnCopy" EnablePostBack="true" runat="server" Text="鎷疯礉" Icon="DatabaseCopy"
+                OnClick="btnCopy_Click" Hidden="true">
+            </f:MenuButton>
+            <f:MenuButton ID="btnEdit" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil"
+                OnClick="btnEdit_Click" Hidden="true">
+            </f:MenuButton>
+        </Items>
+    </f:Menu>
+    <script type="text/javascript">
+      var treeID = '<%= trUnitWork.ClientID %>';
+        var menuID = '<%= Menu1.ClientID %>';
+        // 淇濆瓨褰撳墠鑿滃崟瀵瑰簲鐨勬爲鑺傜偣ID
+        var currentNodeId;
+
+        // 杩斿洖false锛屾潵闃绘娴忚鍣ㄥ彸閿彍鍗�
+        function onTreeNodeContextMenu(event, nodeId) {
+            currentNodeId = nodeId;
+            F(menuID).show();
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.cs
new file mode 100644
index 00000000..e678f8a5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.cs
@@ -0,0 +1,398 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class DivisionDivideAndCrop : PageBase
+    {
+        #region 瀹氫箟鍙橀噺
+        /// <summary>
+        /// 琚�夋嫨椤瑰垪琛�
+        /// </summary>
+        public List<string> SelectedList
+        {
+            get
+            {
+                return (List<string>)ViewState["SelectedList"];
+            }
+            set
+            {
+                ViewState["SelectedList"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 鏈閫夋嫨椤瑰垪琛�
+        /// </summary>
+        public List<string> NoSelectedList
+        {
+            get
+            {
+                return (List<string>)ViewState["NoSelectedList"];
+            }
+            set
+            {
+                ViewState["NoSelectedList"] = value;
+            }
+        }
+        #endregion
+
+        #region 鍔犺浇
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.SelectedList = new List<string>();
+                this.NoSelectedList = new List<string>();
+                GetButtonPower();
+                InitTreeMenu();
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region  鍔犺浇鏍�
+        /// <summary>
+        /// 鍔犺浇鏍�
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.trUnitWork.Nodes.Clear();
+            this.trUnitWork.ShowBorder = false;
+            this.trUnitWork.ShowHeader = false;
+            this.trUnitWork.EnableIcons = true;
+            this.trUnitWork.AutoScroll = true;
+            this.trUnitWork.EnableSingleClickExpand = true;
+            List<Model.WBS_UnitWork> supUnitWorkList = BLL.UnitWorkService.GetUnitWorkLists(this.CurrUser.LoginProjectId);
+            if (supUnitWorkList.Count() > 0)
+            {
+                foreach (var item in supUnitWorkList)
+                {
+                    TreeNode node = new TreeNode();
+                    node.Text = item.UnitWorkName;
+                    node.NodeID = item.UnitWorkId;
+                    node.CommandName = "supUnitWork";
+                    node.EnableClickEvent = true;
+                    node.EnableExpandEvent = true;
+                    this.trUnitWork.Nodes.Add(node);
+                    TreeNode emptyNode = new TreeNode();
+                    emptyNode.Text = "";
+                    emptyNode.NodeID = "";
+                    node.Nodes.Add(emptyNode);
+                }
+            }
+        }
+        #endregion
+
+        #region  灞曞紑鏍�
+        /// <summary>
+        /// 灞曞紑鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trUnitWork_NodeExpand(object sender, TreeNodeEventArgs e)
+        {
+            e.Node.Nodes.Clear();
+            if (e.Node.CommandName == "supUnitWork")  //灞曞紑鍗曚綅宸ョ▼鑺傜偣
+            {
+                var unitWorks = from x in Funs.DB.WBS_UnitWork
+                                where x.SuperUnitWork == e.Node.NodeID
+                                orderby x.UnitWorkCode
+                                select x;
+                foreach (var unitWork in unitWorks)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = unitWork.UnitWorkName;
+                    newNode.NodeID = unitWork.UnitWorkId;
+                    newNode.CommandName = "unitWork";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    e.Node.Nodes.Add(newNode);
+                    var installation3s = from x in Funs.DB.WBS_UnitWork where x.SuperUnitWork == unitWork.UnitWorkId orderby x.UnitWorkCode select x;
+                    if (installation3s.Count() > 0)
+                    {
+                        TreeNode emptyNode = new TreeNode();
+                        emptyNode.Text = "";
+                        emptyNode.NodeID = "";
+                        newNode.Nodes.Add(emptyNode);
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 鑺傜偣閫夋嫨浜嬩欢
+        /// <summary>
+        /// tv鑺傜偣閫変腑浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trUnitWork_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            for (int i = 0; i < this.Grid1.Rows.Count; i++)
+            {
+                if (this.Grid1.SelectedRowIDArray.Contains(this.Grid1.Rows[i].RowID))
+                {
+                    SelectedList.Add(this.Grid1.Rows[i].RowID);
+                }
+                else
+                {
+                    NoSelectedList.Add(this.Grid1.Rows[i].RowID);
+                }
+            }
+            BindGrid();
+        }
+        #endregion
+
+        #region 鏁版嵁缁戝畾鍜屼簨浠�
+        /// <summary>
+        /// 鏁版嵁缁戝畾
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"select * from(select a.DivisionId,a.ProjectId,a.ParentId,a.DivisionLevel,a.BranchEngineeringCode,a.BranchEngineeringName,a.SubBranchEngineeringName,a.ProEngineeringCode,a.ProEngineeringName,a.ProEngineeringNum,a.Remark,a.AddUser,a.OperateTime,a.Sort,a.Status from Division_SubProjects as a where isnull(a.ProjectId,'')='' ";
+            string strSql1 = @"select a.DivisionId,a.ProjectId,a.ParentId,a.DivisionLevel,a.BranchEngineeringCode,a.BranchEngineeringName,a.SubBranchEngineeringName,a.ProEngineeringCode,a.ProEngineeringName,a.ProEngineeringNum,a.Remark,a.AddUser,a.OperateTime,a.Sort,a.Status from Division_SubProjects as a inner join Base_Project as b on a.ProjectId=b.ProjectId where a.ProjectId=@ProjectId ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            SqlParameter[] parameter = listStr.ToArray();
+            var zxsql = strSql + " union all " + strSql1 + " ) as t order by t.BranchEngineeringCode,t.Sort,t.DivisionLevel,t.ProEngineeringNum asc";
+            DataTable tb = SQLHelper.GetDataTableRunText(zxsql, parameter);
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+
+            var selectIds = (from x in Funs.DB.WBS_DivisionDivide where x.UnitWorkId == this.trUnitWork.SelectedNodeID select x.DivisionId).ToList();
+            if (selectIds.Count() > 0)
+            {
+                this.Grid1.SelectedRowIDArray = selectIds.ToArray();
+            }
+        }
+        #endregion
+
+        #region 淇濆瓨
+        /// <summary>
+        /// 淇濆瓨鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.trUnitWork.SelectedNodeID))
+            {
+                SelectedList.Clear();
+                NoSelectedList.Clear();
+                for (int i = 0; i < this.Grid1.Rows.Count; i++)
+                {
+                    if (this.Grid1.SelectedRowIDArray.Contains(this.Grid1.Rows[i].RowID))
+                    {
+                        SelectedList.Add(this.Grid1.Rows[i].RowID);
+                    }
+                    else
+                    {
+                        NoSelectedList.Add(this.Grid1.Rows[i].RowID);
+                    }
+                }
+                foreach (var item in SelectedList.Distinct())
+                {
+                    Model.WBS_DivisionDivide divisionDivide = BLL.DivisionDivideService.GetDivisionDivideByDivisionId(this.trUnitWork.SelectedNodeID, item);
+                    if (divisionDivide == null)
+                    {
+                        Model.WBS_DivisionDivide newdivisiondivide = new Model.WBS_DivisionDivide();
+                        newdivisiondivide.DivisionDivideId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionDivide));
+                        newdivisiondivide.ProjectId = this.CurrUser.LoginProjectId;
+                        newdivisiondivide.UnitWorkId = this.trUnitWork.SelectedNodeID;
+                        newdivisiondivide.DivisionId = item;
+                        BLL.DivisionDivideService.AddDivisionDivide(newdivisiondivide);
+                    }
+                }
+                NoSelectedList = NoSelectedList.Distinct().ToList();
+                var q = NoSelectedList.Distinct().ToList();
+                foreach (var item in q)
+                {
+                    foreach (var i in SelectedList.Distinct())
+                    {
+                        if (item == i)
+                        {
+                            NoSelectedList.Remove(item);
+                        }
+                    }
+                }
+                foreach (var item in NoSelectedList)
+                {
+                    Model.WBS_DivisionDivide divisionDivide = BLL.DivisionDivideService.GetDivisionDivideByDivisionId(this.trUnitWork.SelectedNodeID,item);
+                    if (divisionDivide != null)
+                    {
+                        BLL.DivisionDivideService.DeleteDivisionDivideByDivisionId(item);
+                    }
+                }
+                ShowNotify("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
+            }
+            else
+            {
+                Alert.ShowInTop("璇峰厛閫夋嫨鍗曚綅宸ョ▼/瀛愬崟浣嶅伐绋嬶紒", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 瀵煎叆
+        /// <summary>
+        /// 瀵煎叆
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DivisionDivideAndCropDataIn.aspx", "瀵煎叆 - ")));
+        }
+        #endregion        
+
+        #region 鎷疯礉
+        /// <summary>
+        /// 鎷疯礉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnCopy_Click(object sender, EventArgs e)
+        {
+            bool isOk = false;
+            if (!string.IsNullOrEmpty(this.trUnitWork.SelectedNodeID))
+            {
+                var unitwork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(this.trUnitWork.SelectedNodeID);
+                if (unitwork != null)
+                {
+                    Model.WBS_UnitWork newSupUnitWork = new Model.WBS_UnitWork();
+                    newSupUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork));
+                    newSupUnitWork.UnitWorkCode = unitwork.UnitWorkCode;
+                    newSupUnitWork.UnitWorkName = unitwork.UnitWorkName;
+                    newSupUnitWork.ProjectId = this.CurrUser.LoginProjectId;
+                    newSupUnitWork.SuperUnitWork = unitwork.SuperUnitWork;
+                    BLL.UnitWorkService.AddUnitWork(newSupUnitWork);
+                    isOk = true;
+
+                    var divisionDivides = BLL.DivisionDivideService.GetDivisionDivideByUnitWorkId(this.trUnitWork.SelectedNodeID);
+                    if (divisionDivides != null)
+                    {
+                        foreach (var item in divisionDivides)
+                        {
+                            Model.WBS_DivisionDivide newDivisionDivide = new Model.WBS_DivisionDivide();
+                            newDivisionDivide.DivisionDivideId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionDivide));
+                            newDivisionDivide.ProjectId = this.CurrUser.LoginProjectId;
+                            newDivisionDivide.UnitWorkId = newSupUnitWork.UnitWorkId;
+                            newDivisionDivide.DivisionId = item.DivisionId;
+                            BLL.DivisionDivideService.AddDivisionDivide(newDivisionDivide);
+                            isOk = true;
+                        }
+                    }
+
+                    var unitworkList = BLL.UnitWorkService.GetUnitWorksBySupUnitWork(this.trUnitWork.SelectedNodeID);
+                    if (unitworkList.Count() > 0)
+                    {
+                        foreach (var item in unitworkList)
+                        {
+                            Model.WBS_UnitWork newUnitWork = new Model.WBS_UnitWork();
+                            newUnitWork.UnitWorkId = SQLHelper.GetNewID(typeof(Model.WBS_UnitWork));
+                            newUnitWork.UnitWorkCode = item.UnitWorkCode;
+                            newUnitWork.UnitWorkName = item.UnitWorkName;
+                            newUnitWork.ProjectId = this.CurrUser.LoginProjectId;
+                            newUnitWork.SuperUnitWork = newSupUnitWork.UnitWorkId;
+                            BLL.UnitWorkService.AddUnitWork(newUnitWork);
+                            isOk = true;
+
+                            var divisionDivideLists = BLL.DivisionDivideService.GetDivisionDivideByUnitWorkId(item.UnitWorkId);
+                            if (divisionDivideLists != null)
+                            {
+                                foreach (var divis in divisionDivideLists)
+                                {
+                                    Model.WBS_DivisionDivide newDivisionDivide = new Model.WBS_DivisionDivide();
+                                    newDivisionDivide.DivisionDivideId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionDivide));
+                                    newDivisionDivide.ProjectId = this.CurrUser.LoginProjectId;
+                                    newDivisionDivide.UnitWorkId = newUnitWork.UnitWorkId;
+                                    newDivisionDivide.DivisionId = divis.DivisionId;
+                                    BLL.DivisionDivideService.AddDivisionDivide(newDivisionDivide);
+                                    isOk = true;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            if (isOk)
+            {
+                ShowNotify("鎷疯礉鎴愬姛锛�", MessageBoxIcon.Success);
+            }
+            else
+            {
+                ShowNotify("鎷疯礉澶辫触锛�", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 淇敼
+        /// <summary>
+        /// 淇敼
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.trUnitWork.SelectedNodeID))
+            {
+                var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(this.trUnitWork.SelectedNodeID);
+                if (unitWork != null)
+                {
+                    PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../../ProjectData/UnitWorkEdit.aspx?Id={0}&&SuperId={1}", this.trUnitWork.SelectedNode.NodeID, unitWork.SuperUnitWork, "缂栬緫 - ")));
+                }                
+            }
+        }
+        #endregion
+
+        #region 鍏抽棴寮瑰嚭绐椾綋
+        /// <summary>
+        /// 鍏抽棴寮瑰嚭绐椾綋
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window2_Close(object sender, WindowCloseEventArgs e)
+        {
+            InitTreeMenu();
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DivisionDivideAndCropMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                    this.btnImport.Hidden = false;
+                    this.btnCopy.Hidden = false;
+                    this.btnEdit.Hidden = false;
+                }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.designer.cs
new file mode 100644
index 00000000..3fc33fc4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.designer.cs
@@ -0,0 +1,150 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionDivideAndCrop {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// panelLeftRegion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+        
+        /// <summary>
+        /// trUnitWork 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Tree trUnitWork;
+        
+        /// <summary>
+        /// panelCenterRegion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar4 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+        
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// btnImport 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// Menu1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnCopy 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnCopy;
+        
+        /// <summary>
+        /// btnEdit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnEdit;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx
new file mode 100644
index 00000000..f86e0c45
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx
@@ -0,0 +1,68 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DivisionDivideAndCropDataIn.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.DivisionDivideAndCropDataIn" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎銆佽鍓�</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="瀹℃牳" ValidateForms="SimpleForm1"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="瀵煎叆" ValidateForms="SimpleForm1"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="涓嬭浇妯℃澘" OnClick="btnDownLoad_Click">
+                        </f:Button>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="閫夋嫨瑕佸鍏ョ殑鏂囦欢" Label="閫夋嫨瑕佸鍏ョ殑鏂囦欢"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎銆佽鍓�" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="閿欒琛屽彿">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="閿欒鍒�">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="閿欒绫诲瀷">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx.cs
new file mode 100644
index 00000000..1da9a68e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx.cs
@@ -0,0 +1,523 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class DivisionDivideAndCropDataIn : PageBase
+    {
+        #region 瀹氫箟鍙橀噺
+        /// <summary>
+        /// 涓婁紶棰勮鐨勮櫄鎷熻矾寰�
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 閿欒闆嗗悎
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+        #endregion
+
+        #region 鍔犺浇
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.hdCheckResult.Text = string.Empty;
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+            }
+        }
+        #endregion
+
+        #region 瀹℃牳
+        /// <summary>
+        /// 瀹℃牳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("璇锋偍閫夋嫨Excel鏂囦欢锛�", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    ShowNotify("鍙彲浠ラ�夋嫨Excel鏂囦欢锛�", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 璇籈xcel鎻愬彇鏁版嵁
+        /// <summary>
+        /// 浠嶦xcel鎻愬彇鏁版嵁--銆婦ataset
+        /// </summary>
+        /// <param name="filename">Excel鏂囦欢璺緞鍚�</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0], 11);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
+            }
+        }
+        #endregion
+
+        #region 灏咲ataset鐨勬暟鎹鍏ユ暟鎹簱
+        /// <summary>
+        /// 灏咲ataset鐨勬暟鎹鍏ユ暟鎹簱
+        /// </summary>
+        /// <param name="pds">鏁版嵁闆�</param>
+        /// <param name="Cols">鏁版嵁闆嗚鏁�</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds, int Cols)
+        {
+            string result = string.Empty;
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("瀵煎叆Excel鏍煎紡閿欒锛丒xcel鍙湁" + ic.ToString().Trim() + "鍒�", MessageBoxIcon.Warning);
+                return false;
+            }
+
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var supUnitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == "0" || x.SuperUnitWork == null) select x;//鍗曚綅宸ョ▼
+                var childUnitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId==this.CurrUser.LoginProjectId && (x.SuperUnitWork != null && x.SuperUnitWork != "0") select x;//瀛愬崟浣嶅伐绋�
+                var branchEngineerings = from x in Funs.DB.Division_SubProjects where x.ProjectId == this.CurrUser.LoginProjectId select x; //鍒嗛儴銆佸垎椤�
+
+                for (int i = 1; i < ir; i++)
+                {
+                    string row1 = pds.Rows[i][1].ToString().Trim();
+                    if (!string.IsNullOrEmpty(row1))
+                    {
+                        var supUnitWork = supUnitWorks.Where(y => y.UnitWorkName == row1).FirstOrDefault();//鍗曚綅宸ョ▼鍚嶇О
+                        if (supUnitWork != null)
+                        {
+                            string row0 = pds.Rows[i][0].ToString();
+                            if (!string.IsNullOrEmpty(row0))
+                            {
+                                var supUnitWorkCode = supUnitWorks.Where(x => x.UnitWorkCode == row0).FirstOrDefault();//鍗曚綅宸ョ▼缂栫爜
+                                if (supUnitWorkCode == null)
+                                {
+                                    result += (i + 2).ToString() + "," + "鍗曚綅宸ョ▼缂栫爜" + "," + "[" + row0 + "]涓嶅瓨鍦紒" + "|";
+                                }
+                            }
+                            else
+                            {
+                                result += (i + 2).ToString() + "," + "鍗曚綅宸ョ▼缂栫爜" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                            }
+
+                            string row2 = pds.Rows[i][2].ToString();
+                            if (!string.IsNullOrEmpty(row2))
+                            {
+                                var childUnitWorkCode = childUnitWorks.Where(x => x.UnitWorkCode == row2 && x.SuperUnitWork == supUnitWork.UnitWorkId).FirstOrDefault();
+                                if (childUnitWorkCode == null)
+                                {
+                                    result += (i + 2).ToString() + "," + "瀛愬崟浣嶅伐绋嬬紪鐮�" + "," + "[" + row2 + "]涓嶅瓨鍦紒" + "|";
+                                }
+                            }
+                            string row3 = pds.Rows[i][3].ToString();
+                            if (!string.IsNullOrEmpty(row3))
+                            {
+                                var childUnitWorkName = childUnitWorks.Where(x => x.UnitWorkName == row3 && x.SuperUnitWork == supUnitWork.UnitWorkId).FirstOrDefault();
+                                if (childUnitWorkName == null)
+                                {
+                                    result += (i + 2).ToString() + "," + "瀛愬崟浣嶅伐绋嬪悕绉�" + "," + "[" + row3 + "]涓嶅瓨鍦紒" + "|";
+                                }
+                            }
+
+                            string row4 = pds.Rows[i][4].ToString();
+                            if (!string.IsNullOrEmpty(row4))
+                            {
+                                branchEngineerings = branchEngineerings.Where(x => x.BranchEngineeringCode == row4);
+                                if (branchEngineerings != null)
+                                {
+                                    string row5 = pds.Rows[i][5].ToString();
+                                    if (!string.IsNullOrEmpty(row5))
+                                    {
+                                        branchEngineerings = branchEngineerings.Where(x => x.BranchEngineeringName == row5);
+                                        if (branchEngineerings.ToList().Count == 0)
+                                        {
+                                            result += (i + 2).ToString() + "," + "鍒嗛儴宸ョ▼鍚嶇О" + "," + "[" + row5 + "]涓嶅瓨鍦紒" + "|";
+                                        }
+                                    }
+                                    string row6 = pds.Rows[i][6].ToString();
+                                    if (!string.IsNullOrEmpty(row6))
+                                    {
+                                        branchEngineerings = branchEngineerings.Where(x => x.SubBranchEngineeringName == row6);
+                                        if (branchEngineerings.ToList().Count == 0)
+                                        {
+                                            result += (i + 2).ToString() + "," + "瀛愬垎閮ㄥ伐绋嬪悕绉�" + "," + "[" + row6 + "]涓嶅瓨鍦紒" + "|";
+                                        }
+                                    }
+                                    string row7 = pds.Rows[i][7].ToString();
+                                    if (!string.IsNullOrEmpty(row7))
+                                    {
+                                        branchEngineerings = branchEngineerings.Where(x => x.ProEngineeringCode == row7);
+                                        if (branchEngineerings.ToList().Count == 0)
+                                        {
+                                            result += (i + 2).ToString() + "," + "鍒嗛」宸ョ▼缂栧彿" + "," + "[" + row7 + "]涓嶅瓨鍦紒" + "|";
+                                        }
+                                    }
+                                    else
+                                    {
+                                        result += (i + 2).ToString() + "," + "鍒嗛」宸ョ▼缂栧彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                                    }
+                                    string row8 = pds.Rows[i][8].ToString();
+                                    if (!string.IsNullOrEmpty(row8))
+                                    {
+
+                                        branchEngineerings = branchEngineerings.Where(x => x.ProEngineeringName == row8);
+                                        if (branchEngineerings.ToList().Count == 0)
+                                        {
+                                            result += (i + 2).ToString() + "," + "鍒嗛」宸ョ▼鍚嶇О" + "," + "[" + row8 + "]涓嶅瓨鍦紒" + "|";
+                                        }
+                                    }
+                                    if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
+                                    {
+                                        branchEngineerings = branchEngineerings.Where(x => x.ProEngineeringNum == pds.Rows[i][9].ToString());
+                                        if (branchEngineerings.ToList().Count == 0)
+                                        {
+                                            result += (i + 2).ToString() + "," + "鍒嗛儴鍒嗛」鐮�" + "," + "[" + pds.Rows[i][9].ToString() + "]涓嶅瓨鍦紒" + "|";
+                                        }
+                                    }
+                                    else
+                                    {
+                                        result += (i + 2).ToString() + "," + "鍒嗛儴鍒嗛」鐮�" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                                    }
+                                    if (!string.IsNullOrEmpty(pds.Rows[i][10].ToString()))
+                                    {
+                                        try
+                                        {
+                                            branchEngineerings = branchEngineerings.Where(x => x.DivisionLevel == Convert.ToInt32(pds.Rows[i][10].ToString()));
+                                            if (branchEngineerings.ToList().Count == 0)
+                                            {
+                                                result += (i + 2).ToString() + "," + "绾у埆" + "," + "[" + pds.Rows[i][10].ToString() + "]涓嶅瓨鍦紒" + "|";
+                                            }
+                                        }
+                                        catch (Exception)
+                                        {
+                                            result += (i + 2).ToString() + "," + "绾у埆" + "," + "[" + pds.Rows[i][10].ToString() + "]閿欒锛�" + "|";
+                                        }
+                                        
+                                    }
+                                    else
+                                    {
+                                        result += (i + 2).ToString() + "," + "绾у埆" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                                    }
+                                }
+                                else
+                                {
+                                    result += (i + 2).ToString() + "," + "鍒嗛儴宸ョ▼缂栧彿" + "," + "[" + row4 + "]涓嶅瓨鍦紒" + "|";
+                                }
+                            }
+                            else
+                            {
+                                result += (i + 2).ToString() + "," + "鍒嗛儴宸ョ▼缂栧彿" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                            }
+                        }
+                        else
+                        {
+                            result += (i + 2).ToString() + "," + "鍗曚綅宸ョ▼鍚嶇О" + "," + "[" + row1 + "]涓嶅瓨鍦紒" + "|";
+                        }
+                    }
+                    else
+                    {
+                        result += (i + 2).ToString() + "," + "鍗曚綅宸ョ▼鍚嶇О" + "," + "姝ら」涓哄繀濉」锛�" + "|";
+                    }
+                }
+                if (!string.IsNullOrEmpty(result))
+                {
+                    result = result.Substring(0, result.LastIndexOf("|"));
+                }
+                errorInfos.Clear();
+                if (!string.IsNullOrEmpty(result))
+                {
+                    string results = result;
+                    List<string> errorInfoList = results.Split('|').ToList();
+                    foreach (var item in errorInfoList)
+                    {
+                        string[] errors = item.Split(',');
+                        Model.ErrorInfo errorInfo = new Model.ErrorInfo();
+                        errorInfo.Row = errors[0];
+                        errorInfo.Column = errors[1];
+                        errorInfo.Reason = errors[2];
+                        errorInfos.Add(errorInfo);
+                    }
+                    if (errorInfos.Count > 0)
+                    {
+                        this.gvErrorInfo.DataSource = errorInfos;
+                        this.gvErrorInfo.DataBind();
+                    }
+                }
+                else
+                {
+                    ShowNotify("瀹℃牳瀹屾垚,璇风偣鍑诲鍏ワ紒", MessageBoxIcon.Success);
+                }
+            }
+            else
+            {
+                ShowNotify("瀵煎叆鏁版嵁涓虹┖锛�", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 瀵煎叆
+        /// <summary>
+        /// 瀵煎叆
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("瀵煎叆鎴愬姛锛�", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("璇峰厛灏嗛敊璇暟鎹慨姝ｏ紝鍐嶉噸鏂板鍏ユ彁浜わ紒", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("璇峰厛瀹℃牳瑕佸鍏ョ殑鏂囦欢锛�", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel鎻愬彇鏁版嵁
+        /// <summary>
+        /// 浠嶦xcel鎻愬彇鏁版嵁--銆婦ataset
+        /// </summary>
+        /// <param name="filename">Excel鏂囦欢璺緞鍚�</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0], 11);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 灏咲ataset鐨勬暟鎹鍏ユ暟鎹簱
+        /// <summary>
+        /// 灏咲ataset鐨勬暟鎹鍏ユ暟鎹簱
+        /// </summary>
+        /// <param name="pds">鏁版嵁闆�</param>
+        /// <param name="Cols">鏁版嵁闆嗗垪鏁�</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds, int Cols)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("瀵煎叆Excel鏍煎紡閿欒锛丒xcel鍙湁" + ic.ToString().Trim() + "鍒�", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                var oldDivisionDivides = from x in Funs.DB.WBS_DivisionDivide where x.ProjectId == this.CurrUser.LoginProjectId select x;
+
+                var supUnitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == "0" || x.SuperUnitWork == null) select x;//鍗曚綅宸ョ▼
+                //var childUnitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork != null && x.SuperUnitWork != "0") select x;//瀛愬崟浣嶅伐绋�
+                var branchEngineerings = from x in Funs.DB.Division_SubProjects where x.ProjectId == this.CurrUser.LoginProjectId select x; //鍒嗛儴銆佸垎椤�
+
+                for (int i = 1; i < ir; i++)
+                {
+                    string row1 = pds.Rows[i][1].ToString().Trim();
+                    string row4 = pds.Rows[i][4].ToString().Trim();
+                    string row7 = pds.Rows[i][7].ToString().Trim();
+                    string row9 = pds.Rows[i][9].ToString().Trim();
+
+                    var unitwork = supUnitWorks.Where(x => x.UnitWorkName == row1).FirstOrDefault();
+                    var division = branchEngineerings.Where(x => x.BranchEngineeringCode == row4 && x.ProEngineeringCode == row7 && x.ProEngineeringNum == row9).FirstOrDefault();
+                    if (unitwork != null && division != null)
+                    {
+                        Model.WBS_DivisionDivide divisionDivide = new Model.WBS_DivisionDivide();
+                        divisionDivide = oldDivisionDivides.FirstOrDefault(x => x.UnitWorkId == unitwork.UnitWorkId && x.DivisionId == division.DivisionId);
+                        if (divisionDivide == null)
+                        {
+                            Model.WBS_DivisionDivide newDivisionDivide = new Model.WBS_DivisionDivide();
+                            newDivisionDivide.DivisionDivideId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionDivide));
+                            newDivisionDivide.ProjectId = this.CurrUser.LoginProjectId;
+                            newDivisionDivide.UnitWorkId = unitwork.UnitWorkId;
+                            newDivisionDivide.DivisionId = division.DivisionId;
+                            BLL.DivisionDivideService.AddDivisionDivide(newDivisionDivide);
+                        }
+                    }
+                    else
+                    {
+                        result += (i + 2).ToString() + "," + "鍒嗛儴鍒嗛」宸ョ▼" + "," + "[" + row4 + "]涓嶅瓨鍦紒" + "|";
+                    }
+                }
+            }
+            else
+            {
+                ShowNotify("瀵煎叆鏁版嵁涓虹┖锛�", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 涓嬭浇妯℃澘
+        /// <summary>
+        /// 涓嬭浇妯℃澘鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("纭畾涓嬭浇瀵煎叆妯℃澘鍚楋紵", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 涓嬭浇瀵煎叆妯℃澘
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + Const.DivisionDivideTempUrl;
+                string filePath = Const.DivisionDivideTempUrl;
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx.designer.cs
new file mode 100644
index 00000000..eb57317e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCropDataIn.aspx.designer.cs
@@ -0,0 +1,123 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionDivideAndCropDataIn {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// hdFileName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+        
+        /// <summary>
+        /// btnAudit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+        
+        /// <summary>
+        /// btnImport 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+        
+        /// <summary>
+        /// btnDownLoad 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+        
+        /// <summary>
+        /// hdCheckResult 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+        
+        /// <summary>
+        /// fuAttachUrl 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+        
+        /// <summary>
+        /// gvErrorInfo 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+        
+        /// <summary>
+        /// lblPageIndex 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx
new file mode 100644
index 00000000..5be33799
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx
@@ -0,0 +1,69 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DivisionDivideList.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.DivisionDivideList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎琛�</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" AutoScroll="true" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="false" Title="鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎琛�"
+                    runat="server" EnableCollapse="true" DataKeyNames="DivisionDivideId" EnableColumnLines="true" BoxFlex="1"
+                    DataIDField="DivisionDivideId" AllowPaging="false" AllowCellEditing="false" ExpandAllTreeNodes="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" runat="server">
+                            <Items>
+                                <f:DropDownList ID="drpUnitWork" runat="server" Label="鍗曚綅宸ョ▼鍚嶇О" LabelWidth="120px" LabelAlign="Right" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpUnitWork_SelectedIndexChanged"></f:DropDownList>
+                                <f:DropDownList ID="drpBranchEngineering" runat="server" Label="鍒嗛儴宸ョ▼鍚嶇О" LabelWidth="120px" LabelAlign="Right" EnableEdit="true"></f:DropDownList>
+                                <f:Button ID="btnSearch" runat="server" Text="鏌ヨ" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center" Width="70px" />
+                        <f:RenderField ColumnID="SupUnitWorkCode" DataField="SupUnitWorkCode" Width="110px" HeaderText="鍗曚綅宸ョ▼缂栫爜" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SupUnitWorkName" DataField="SupUnitWorkName" Width="150px" HeaderText="鍗曚綅宸ョ▼鍚嶇О" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ChildUnitWorkCode" DataField="ChildUnitWorkCode" Width="120px" HeaderText="瀛愬崟浣嶅伐绋嬬紪鐮�" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ChildUnitWorkName" DataField="ChildUnitWorkName" Width="150px" HeaderText="瀛愬崟浣嶅伐绋嬪悕绉�" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="BranchEngineeringCode" DataField="BranchEngineeringCode" Width="110px" HeaderText="鍒嗛儴宸ョ▼缂栧彿" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="BranchEngineeringName" DataField="BranchEngineeringName" Width="150px" HeaderText="鍒嗛儴宸ョ▼鍚嶇О" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SubBranchEngineeringName" DataField="SubBranchEngineeringName" Width="130px" HeaderText="瀛愬垎閮ㄥ伐绋嬪悕绉�" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringCode" DataField="ProEngineeringCode" Width="110px" HeaderText="鍒嗛」宸ョ▼缂栧彿" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringName" DataField="ProEngineeringName" Width="150px" HeaderText="鍒嗛」宸ョ▼鍚嶇О" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringNum" DataField="ProEngineeringNum" Width="100px" HeaderText="鍒嗛儴鍒嗛」鐮�" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DivisionLevel" DataField="DivisionLevel" Width="50px" HeaderText="绾у埆" HeaderTextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                    <%--<Listeners>
+                        <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                    </Listeners>--%>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+    <%--<script type="text/javascript">
+        function onGridDataLoad(event) {
+            this.mergeColumns(['SupUnitWorkCode', 'SupUnitWorkName', 'ChildUnitWorkCode', 'ChildUnitWorkName']);
+        }
+    </script>--%>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs
new file mode 100644
index 00000000..416f991a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs
@@ -0,0 +1,240 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class DivisionDivideList : PageBase
+    {
+        #region 鍔犺浇
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
+
+                //var subProjectLists = from x in Funs.DB.Division_SubProjects where x.ProjectId==this.CurrUser.LoginProjectId && x.ParentId==null select x;
+                //this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
+                //this.drpBranchEngineering.DataValueField = "DivisionId";
+                //this.drpBranchEngineering.DataSource = subProjectLists;
+                //this.drpBranchEngineering.DataBind();
+                Funs.FineUIPleaseSelect(this.drpBranchEngineering);
+
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT * FROM View_WBS_DivisionDivide WHERE ProjectId = @projectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            if (this.drpUnitWork.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND (UnitWorkId =@unitWorkId or SuperUnitWork=@unitWorkId) ";
+                listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWork.SelectedValue));
+            }
+            if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND (DivisionId = @divisionId or ParentId=@divisionId) ";
+                listStr.Add(new SqlParameter("@divisionId", this.drpBranchEngineering.SelectedValue));
+            }
+            strSql += " ORDER BY SupUnitWorkCode,ChildUnitWorkCode,Sort,DivisionLevel ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            //var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 鏌ヨ
+        /// <summary>
+        /// 鏌ヨ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 瀵煎嚭鎸夐挳
+        /// 瀵煎嚭鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            string rootPath = Server.MapPath("~/");
+            string initTemplatePath = Const.DivisionDivideTempUrl;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            uploadfilepath = rootPath + initTemplatePath;
+
+            var lists = (from x in Funs.DB.View_WBS_DivisionDivide
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         select x);
+            if (this.drpUnitWork.SelectedValue != BLL.Const._Null)
+            {
+                lists = lists.Where(x => x.UnitWorkId == this.drpUnitWork.SelectedValue || x.SuperUnitWork == this.drpUnitWork.SelectedValue);
+            }
+            if (this.drpBranchEngineering.SelectedValue != BLL.Const._Null)
+            {
+                lists = lists.Where(x => x.DivisionId == this.drpBranchEngineering.SelectedValue || x.ParentId == this.drpBranchEngineering.SelectedValue);
+            }
+            lists = lists.OrderBy(x => x.SupUnitWorkCode).ThenBy(x => x.ChildUnitWorkCode).ThenBy(x => x.Sort).ThenBy(x => x.DivisionLevel);
+
+            if (lists != null)
+            {
+                string projectName = BLL.ProjectService.GetShortNameByProjectId(this.CurrUser.LoginProjectId);
+                newUrl = uploadfilepath.Replace("鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎瀵煎叆妯℃澘", projectName + "鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎琛�");
+                File.Copy(uploadfilepath, newUrl);
+                // 绗竴姝ワ細璇诲彇鏂囦欢娴�
+                NPOI.SS.UserModel.IWorkbook workbook;
+                using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))
+                {
+                    //workbook = new NPOI.XSSF.UserModel.XSSFWorkbook(stream);
+                    workbook = new NPOI.HSSF.UserModel.HSSFWorkbook(stream);
+                }
+                // 鍒涘缓鍗曞厓鏍兼牱寮�
+                NPOI.SS.UserModel.ICellStyle cellStyle = workbook.CreateCellStyle();
+                cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                cellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                cellStyle.VerticalAlignment = NPOI.SS.UserModel.VerticalAlignment.Center;
+                cellStyle.WrapText = true;//鑷姩鎹㈣
+                var font = workbook.CreateFont();
+                font.FontHeightInPoints = 11;
+                cellStyle.SetFont(font);
+                // 绗簩姝ワ細鍒涘缓鏂版暟鎹
+                NPOI.SS.UserModel.ISheet sheet = workbook.GetSheetAt(0);
+                NPOI.SS.UserModel.IRow row = sheet.GetRow(0);
+                NPOI.SS.UserModel.ICell cell;
+                int i = 2;
+                foreach (var item in lists)
+                {
+                    // 绗簩姝ワ細鍒涘缓鏂版暟鎹
+                    row = sheet.CreateRow(i);
+                    // 娣诲姞鏁版嵁
+                    cell = row.CreateCell(0);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.SupUnitWorkCode);//鍗曚綅宸ョ▼缂栫爜
+
+                    cell = row.CreateCell(1);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.SupUnitWorkName);//鍗曚綅宸ョ▼鍚嶇О
+
+                    cell = row.CreateCell(2);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.ChildUnitWorkCode);//瀛愬崟浣嶅伐绋嬬紪鐮�
+
+                    cell = row.CreateCell(3);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.ChildUnitWorkName);//瀛愬崟浣嶅伐绋嬪悕绉�
+
+                    cell = row.CreateCell(4);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.BranchEngineeringCode);//鍒嗛儴宸ョ▼缂栧彿
+
+                    cell = row.CreateCell(5);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.BranchEngineeringName);//鍒嗛儴宸ョ▼鍚嶇О
+
+                    cell = row.CreateCell(6);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.SubBranchEngineeringName);//瀛愬垎閮ㄥ伐绋嬪悕绉�
+
+                    cell = row.CreateCell(7);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.ProEngineeringCode);//鍒嗛」宸ョ▼缂栧彿
+
+                    cell = row.CreateCell(8);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.ProEngineeringName);//鍒嗛」宸ョ▼鍚嶇О
+
+                    cell = row.CreateCell(9);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.ProEngineeringNum);//鍒嗛儴鍒嗛」鐮�
+
+                    cell = row.CreateCell(10);
+                    cell.CellStyle = cellStyle;
+                    cell.SetCellValue(item.DivisionLevel.HasValue ? item.DivisionLevel.ToString() : "");//绾у埆
+
+                    i++;
+                }
+                // 绗笁姝ワ細鍐欏叆鏂囦欢娴�
+                using (FileStream stream = new FileStream(newUrl, FileMode.Create, FileAccess.Write))
+                {
+                    workbook.Write(stream);
+                    workbook.Close();
+                }
+                string fileName = Path.GetFileName(newUrl);
+                FileInfo info = new FileInfo(newUrl);
+                long fileSize = info.Length;
+                Response.Clear();
+                Response.ContentType = "application/x-zip-compressed";
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.AddHeader("Content-Length", fileSize.ToString());
+                Response.TransmitFile(newUrl, 0, fileSize);
+                Response.Flush();
+                Response.Close();
+                File.Delete(newUrl);
+            }
+            else
+            {
+                Alert.ShowInTop("褰撳墠鏃犺褰曪紝鏃犳硶瀵煎嚭锛�", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 鍗曚綅宸ョ▼涓嬫媺閫夋嫨
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnitWork_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.drpBranchEngineering.Items.Clear();
+            if (this.drpUnitWork.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpUnitWork.SelectedValue))
+            {
+                var q = (from x in Funs.DB.View_WBS_DivisionDivide
+                         where x.ProjectId == this.CurrUser.LoginProjectId
+                         && x.UnitWorkId == this.drpUnitWork.SelectedValue
+                         && x.ParentId==null
+                         select new
+                         {
+                             x.DivisionId,
+                             x.BranchEngineeringName
+                         }).Distinct().ToList();
+                this.drpBranchEngineering.DataTextField = "BranchEngineeringName";
+                this.drpBranchEngineering.DataValueField = "DivisionId";
+                this.drpBranchEngineering.DataSource = q;
+                this.drpBranchEngineering.DataBind();
+                Funs.FineUIPleaseSelect(this.drpBranchEngineering);
+                this.drpBranchEngineering.SelectedIndex = 0;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.designer.cs
new file mode 100644
index 00000000..41c0e431
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.designer.cs
@@ -0,0 +1,105 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionDivideList {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// drpUnitWork 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitWork;
+        
+        /// <summary>
+        /// drpBranchEngineering 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpBranchEngineering;
+        
+        /// <summary>
+        /// btnSearch 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
+        /// <summary>
+        /// ToolbarFill1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
index b4aa1f10..625106c4 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
@@ -24,7 +24,7 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" runat="server">
                             <Items>
-                                <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="鎼滅储" EnablePostBack="true" runat="server" OnClick="btnSearch_Click"></f:Button>
+                                <%--<f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="鎼滅储" EnablePostBack="true" runat="server" OnClick="btnSearch_Click"></f:Button>--%>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnAdd" Icon="Add" ToolTip="鏂板" Text="鏂板" runat="server" OnClick="btnAdd_Click"></f:Button>
                                 <f:Button ID="btnParentAdd" Icon="Add" ToolTip="鏂板瀛愮骇鍒�" Text="鏂板瀛愮骇鍒�" runat="server" OnClick="btnParentAdd_Click"></f:Button>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.cs
index ff2e5723..9466a4a0 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.cs
@@ -74,10 +74,10 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// <summary>
         /// 鎼滅储
         /// </summary>
-        protected void btnSearch_Click(object sender, EventArgs e)
-        {
-            DataBrid();
-        }
+        //protected void btnSearch_Click(object sender, EventArgs e)
+        //{
+        //    DataBrid();
+        //}
 
         /// <summary>
         /// 鍒犻櫎
@@ -100,7 +100,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         }
 
         /// <summary>
-        /// 鏂板
+        /// 鏂板鍒嗛儴宸ョ▼
         /// </summary>
         protected void btnAdd_Click(object sender, EventArgs e)
         {
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.designer.cs
index 500d3aa7..f6b955a8 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.designer.cs
@@ -7,13 +7,11 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.WBS.Control
-{
-
-
-    public partial class DivisionSubProjects
-    {
-
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionSubProjects {
+        
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 鎺т欢銆�
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// Panel1 鎺т欢銆�
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-
+        
         /// <summary>
         /// Grid1 鎺т欢銆�
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-
+        
         /// <summary>
         /// Toolbar1 鎺т欢銆�
         /// </summary>
@@ -58,16 +56,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
-        /// <summary>
-        /// btnSearch 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Button btnSearch;
-
+        
         /// <summary>
         /// btnAdd 鎺т欢銆�
         /// </summary>
@@ -76,7 +65,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnAdd;
-
+        
         /// <summary>
         /// btnParentAdd 鎺т欢銆�
         /// </summary>
@@ -85,7 +74,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnParentAdd;
-
+        
         /// <summary>
         /// btnEdit 鎺т欢銆�
         /// </summary>
@@ -94,7 +83,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnEdit;
-
+        
         /// <summary>
         /// btnDelete 鎺т欢銆�
         /// </summary>
@@ -103,7 +92,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnDelete;
-
+        
         /// <summary>
         /// Window1 鎺т欢銆�
         /// </summary>
@@ -112,7 +101,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-
+        
         /// <summary>
         /// Menu1 鎺т欢銆�
         /// </summary>
@@ -121,7 +110,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-
+        
         /// <summary>
         /// btnMenuModify 鎺т欢銆�
         /// </summary>
@@ -130,7 +119,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuModify;
-
+        
         /// <summary>
         /// btnMenuParentAdd 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
index 9bdae739..c8328d35 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
@@ -71,7 +71,7 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:NumberBox runat="server" Label="鎺掑簭" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="150"></f:NumberBox>
+                                            <f:NumberBox runat="server" Label="鎺掑簭" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="200px"></f:NumberBox>
                                         </Items>
                                     </f:FormRow>
                                 </Rows>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx
new file mode 100644
index 00000000..6c0fa7c8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx
@@ -0,0 +1,82 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DivisionSubProjectsNew.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.DivisionSubProjectsNew" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>鍒嗛儴鍒嗛」宸ョ▼鏁版嵁搴�</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" AutoScroll="true" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="鍒嗛儴鍒嗛」宸ョ▼鏁版嵁搴�" EnableColumnLines="true"
+                    runat="server" BoxFlex="1" EnableCollapse="true" DataKeyNames="DivisionId,ParentId,DivisionLevel,Status" EnableTree="true"
+                    TreeColumn="BranchEngineeringCode" DataIDField="DivisionId" AllowPaging="false" DataParentIDField="ParentId"
+                    AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand" EnableRowSelectEvent="true" OnRowSelect="Grid1_RowSelect" ExpandAllTreeNodes="true" EnableMultiSelect="false">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" runat="server">
+                            <Items>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnAdd" Icon="Add" ToolTip="鏂板鍒嗛儴宸ョ▼" Text="鏂板鍒嗛儴宸ョ▼" runat="server" OnClick="btnAdd_Click" Hidden="true"></f:Button>
+                                <f:Button ID="btnParentAdd" Icon="Add" ToolTip="鏂板鍒嗛」宸ョ▼" Text="鏂板鍒嗛」宸ョ▼" runat="server" OnClick="btnParentAdd_Click" Hidden="true"></f:Button>
+                                <f:Button ID="btnEdit" Icon="BulletEdit" ToolTip="缂栬緫" Text="缂栬緫" runat="server" OnClick="btnEdit_Click" Hidden="true"></f:Button>
+                                <f:Button ID="btnDelete" Text="鍒犻櫎" Icon="Delete" OnClick="btnDelete_Click" ConfirmText="鍒犻櫎褰撳墠閫変腑鏁版嵁鍜屾墍鏈夊瓙鑺傜偣鏁版嵁锛�" runat="server" Hidden="true"></f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField />
+                        <f:RenderField ColumnID="BranchEngineeringCode" Width="150px" DataField="BranchEngineeringCode" HeaderText="鍒嗛儴宸ョ▼缂栧彿" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="BranchEngineeringName" Width="200px" DataField="BranchEngineeringName" HeaderText="鍒嗛儴宸ョ▼鍚嶇О" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SubBranchEngineeringName" Width="200px" DataField="SubBranchEngineeringName" HeaderText="瀛愬垎閮ㄥ伐绋嬪悕绉�" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringName" Width="200px" DataField="ProEngineeringName" HeaderText="鍒嗛」宸ョ▼鍚嶇О" HeaderTextAlign="Center" ExpandUnusedSpace="true">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringCode" Width="150px" DataField="ProEngineeringCode" HeaderText="鍒嗛」宸ョ▼缂栧彿" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringNum" Width="150px" DataField="ProEngineeringNum" HeaderText="鍒嗛儴鍒嗛」鐮�" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DivisionLevel" Width="90px" DataField="DivisionLevel" HeaderText="绾у埆" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="Sort" DataField="Sort" HeaderText="鎺掑簭" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <%--<f:RenderField Width="120px" ColumnID="OperateTime" DataField="OperateTime" HeaderText="鎿嶄綔鏃ユ湡" FieldType="Date"
+                            Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center">
+                        </f:RenderField>--%>
+                        <%--<f:LinkButtonField Width="100px" ConfirmText="鍒犻櫎褰撳墠閫変腑鏁版嵁锛�" ColumnID="Delete" ToolTip="鍒犻櫎" HeaderText="鍒犻櫎" ConfirmTarget="Top"
+                            CommandName="Delete" Icon="Delete" HeaderTextAlign="Center" TextAlign="Center"/>--%>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Hidden="true" EnableIFrame="true" EnableMaximize="true" Title="缂栬緫"
+            Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close" CloseAction="HidePostBack"
+            Width="700px" Height="490px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuParentAdd" EnablePostBack="true" runat="server" Text="鏂板瀛愬垎閮ㄥ伐绋�" Icon="Add"
+                    OnClick="btnMenuParentAdd_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 杩斿洖false锛屾潵闃绘娴忚鍣ㄥ彸閿彍鍗�
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx.cs
new file mode 100644
index 00000000..77345482
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx.cs
@@ -0,0 +1,232 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class DivisionSubProjectsNew : PageBase
+    {
+        #region 鍔犺浇椤甸潰
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 鏁版嵁缁戝畾
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"select * from(select a.DivisionId,a.ProjectId,a.ParentId,a.DivisionLevel,a.BranchEngineeringCode,a.BranchEngineeringName,a.SubBranchEngineeringName,a.ProEngineeringCode,a.ProEngineeringName,a.ProEngineeringNum,a.Remark,a.AddUser,a.OperateTime,a.Sort,a.Status from Division_SubProjects as a where isnull(a.ProjectId,'')='' ";
+            string strSql1 = @"select a.DivisionId,a.ProjectId,a.ParentId,a.DivisionLevel,a.BranchEngineeringCode,a.BranchEngineeringName,a.SubBranchEngineeringName,a.ProEngineeringCode,a.ProEngineeringName,a.ProEngineeringNum,a.Remark,a.AddUser,a.OperateTime,a.Sort,a.Status from Division_SubProjects as a inner join Base_Project as b on a.ProjectId=b.ProjectId where a.ProjectId=@ProjectId ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            SqlParameter[] parameter = listStr.ToArray();
+            var zxsql = strSql + " union all " + strSql1 + " ) as t order by t.BranchEngineeringCode,t.Sort,t.DivisionLevel,t.ProEngineeringNum asc";
+            DataTable tb = SQLHelper.GetDataTableRunText(zxsql, parameter);
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 鍒犻櫎
+        /// <summary>
+        /// 琛岀偣鍑� 浜嬩欢
+        /// </summary>
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            if (e.CommandName == "Delete")
+            {
+                string rowID = e.RowID;
+                if (!string.IsNullOrEmpty(rowID))
+                {
+                    BLL.SubProjectsService.DeleteSubProjectsById(rowID);
+                    BindGrid();
+                    ShowNotify("鍒犻櫎鎴愬姛!", MessageBoxIcon.Success);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("鑷冲皯閫夋嫨涓�鏉℃暟鎹紒", MessageBoxIcon.Warning);
+                return;
+            }
+            foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+            {
+                string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                if (!string.IsNullOrEmpty(rowID))
+                {
+                    BLL.SubProjectsService.DeleteSubProjectsById(rowID);
+                }
+            }
+            BindGrid();
+            ShowNotify("鍒犻櫎鎴愬姛!", MessageBoxIcon.Success);
+        }
+        #endregion
+
+        #region 鏂板
+        /// <summary>
+        /// 鏂板鍒嗛儴宸ョ▼
+        /// </summary>
+        protected void btnAdd_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DivisionSubProjectsNewEdit.aspx?type=1", "鏂板 - ")));
+        }
+
+        /// <summary>
+        /// 鏂板鍒嗛」宸ョ▼
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnParentAdd_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("璇烽�夋嫨涓�鏉℃暟鎹�!", MessageBoxIcon.Warning);
+                return;
+            }
+            var sub = BLL.SubProjectsService.GetSubProjectsById(this.Grid1.SelectedRowID);
+            if (sub!=null)
+            {
+                if (!string.IsNullOrEmpty(sub.ProEngineeringName))
+                {
+                    Alert.ShowInTop("鍒嗛」宸ョ▼涓嬩笉鑳芥柊澧烇紒", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DivisionSubProjectsNewEdit.aspx?ParentId={0}&&type=2", this.Grid1.SelectedRowID, "鏂板鍒嗛」宸ョ▼ - ")));
+        }
+        #endregion
+
+        #region 缂栬緫
+        /// <summary>
+        /// 缂栬緫
+        /// </summary>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("璇烽�夋嫨涓�鏉℃暟鎹�!", MessageBoxIcon.Warning);
+                return;
+            }
+            var rowId = this.Grid1.SelectedRowID;
+            var division = BLL.SubProjectsService.GetSubProjectsById(rowId);
+            if (division != null)
+            {
+                string type = string.Empty;
+                if (!string.IsNullOrEmpty(division.SubBranchEngineeringName))
+                {
+                    type = "1";//瀛愬垎閮ㄥ伐绋�
+                }
+                else if (!string.IsNullOrEmpty(division.ProEngineeringName))
+                {
+                    type = "2";//鍒嗛」宸ョ▼
+                }
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DivisionSubProjectsNewEdit.aspx?DivisionId={0}&ParentId={1}&type={2}", rowId, division.ParentId, type, "鏂板鍒嗛」宸ョ▼ - ")));
+            }
+        }
+        #endregion
+
+        #region 鍏抽棴寮瑰嚭绐楀彛
+        /// <summary>
+        /// 鍏抽棴
+        /// </summary>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 鍙冲嚮鏂板瀛愬崟浣嶅伐绋�
+        /// <summary>
+        /// 鍙冲嚮鏂板瀛愬崟浣嶅伐绋�
+        /// </summary>
+        protected void btnMenuParentAdd_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("璇烽�夋嫨涓�鏉℃暟鎹�!", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DivisionSubProjectsNewEdit.aspx?ParentId={0}&&type=1", this.Grid1.SelectedRowID, "鏂板瀛愬垎閮ㄥ伐绋� - ")));
+        }
+        #endregion
+
+        #region 琛岄�夋嫨浜嬩欢
+        /// <summary>
+        /// 琛岄�夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowSelect(object sender, GridRowSelectEventArgs e)
+        {
+            string rowid = e.RowID.ToString();
+            if (!string.IsNullOrEmpty(rowid))
+            {
+                var sub = BLL.SubProjectsService.GetSubProjectsById(rowid);
+                if (sub != null)
+                {
+                    if (!string.IsNullOrEmpty(sub.ParentId))
+                    {
+                        this.btnMenuParentAdd.Hidden = true;
+                    }
+                    else
+                    {
+                        this.btnMenuParentAdd.Hidden = false;
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DivisionSubProjectsMenuId);
+            if (buttonList.Count > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnAdd.Hidden = false;
+                    this.btnMenuParentAdd.Hidden = false;
+                    this.btnParentAdd.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnDelete.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx.designer.cs
new file mode 100644
index 00000000..d8300afb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNew.aspx.designer.cs
@@ -0,0 +1,123 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionSubProjectsNew {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// btnAdd 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAdd;
+        
+        /// <summary>
+        /// btnParentAdd 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnParentAdd;
+        
+        /// <summary>
+        /// btnEdit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnEdit;
+        
+        /// <summary>
+        /// btnDelete 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Menu1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuParentAdd 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuParentAdd;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx
new file mode 100644
index 00000000..5ae4fc58
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx
@@ -0,0 +1,81 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DivisionSubProjectsNewEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.DivisionSubProjectsNewEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>缂栬緫鍒嗛儴鍒嗛」宸ョ▼</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtBranchEngineeringCode" runat="server" Label="鍒嗛儴宸ョ▼缂栧彿" LabelWidth="140px" Required="true" ShowRedStar="true" FocusOnPageLoad="true"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtBranchEngineeringName" runat="server" Label="鍒嗛儴宸ョ▼鍚嶇О" LabelWidth="140px" Required="true" ShowRedStar="true"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow ID="childBra" runat="server" Hidden="true">
+                    <Items>
+                        <f:TextBox ID="txtSubBranchEngineeringName" runat="server" Label="瀛愬垎閮ㄥ伐绋嬪悕绉�" LabelWidth="140px"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Hidden="true">
+                            <Items>
+                                <f:Form ID="Form2" runat="server" ShowBorder="false" ShowHeader="false">
+                                    <Items>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:TextBox ID="txtProEngineeringName" runat="server" Label="鍒嗛」宸ョ▼鍚嶇О" LabelWidth="140px"></f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:TextBox ID="txtProEngineeringCode" runat="server" Label="鍒嗛」宸ョ▼缂栧彿" LabelWidth="140px" AutoPostBack="true" OnTextChanged="txtProEngineeringCode_TextChanged"></f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                        <f:FormRow>
+                                            <Items>
+                                                <f:TextBox ID="txtProEngineeringNum" runat="server" Label="鍒嗛儴鍒嗛」鐮�" LabelWidth="140px"></f:TextBox>
+                                            </Items>
+                                        </f:FormRow>
+                                    </Items>
+                                </f:Form>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox runat="server" Label="鎺掑簭" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="140px"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea runat="server" ID="txtRemark" Label="澶囨敞" LabelAlign="Right" LabelWidth="140px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="淇濆瓨鏁版嵁" ValidateForms="SimpleForm1"
+                            OnClick="btnSave_Click" Hidden="true">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.cs
new file mode 100644
index 00000000..75832afa
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.cs
@@ -0,0 +1,344 @@
+锘縰sing BLL;
+using System;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class DivisionSubProjectsNewEdit :PageBase
+    {
+        #region 瀹氫箟鍙橀噺
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        public string DivisionId
+        {
+            get
+            {
+                return (string)ViewState["DivisionId"];
+            }
+            set
+            {
+                ViewState["DivisionId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 涓婄骇Id
+        /// </summary>
+        public string ParentId
+        {
+            get
+            {
+                return (string)ViewState["ParentId"];
+            }
+            set
+            {
+                ViewState["ParentId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 1-鍒嗛儴锛�2-鍒嗛」
+        /// </summary>
+        public string Type
+        {
+            get
+            {
+                return (string)ViewState["Type"];
+            }
+            set
+            {
+                ViewState["Type"] = value;
+            }
+        }
+        #endregion
+
+        #region 鍔犺浇椤甸潰
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                this.Type = Request.Params["type"];
+                this.DivisionId = Request.Params["DivisionId"];
+                this.ParentId = Request.Params["ParentId"];
+                if (!string.IsNullOrEmpty(this.ParentId))
+                {
+                    Model.Division_SubProjects subProjects = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
+                    if (subProjects != null)
+                    {
+                        this.txtBranchEngineeringCode.Text = subProjects.BranchEngineeringCode;
+                        this.txtBranchEngineeringName.Text = subProjects.BranchEngineeringName;
+
+                        if (this.Type == "1")//瀛愬垎閮ㄥ伐绋�
+                        {
+                            this.txtSubBranchEngineeringName.Required = true;
+                            this.txtSubBranchEngineeringName.ShowRedStar = true;
+
+                            if (!string.IsNullOrEmpty(this.DivisionId))
+                            {
+                                var divis = BLL.SubProjectsService.GetSubProjectsById(this.DivisionId);
+                                if (divis != null)
+                                {
+                                    this.txtSubBranchEngineeringName.Text = divis.SubBranchEngineeringName;
+                                    this.txtSort.Text = divis.Sort.HasValue ? divis.Sort.ToString() : "";
+                                    this.txtRemark.Text = divis.Remark;
+                                }
+                            }
+                            else
+                            {
+                                //鑷姩鑾峰彇鎺掑簭鍙�
+                                int sort = BLL.SubProjectsService.GetSubProjectsByProjectId(this.CurrUser.LoginProjectId);
+                                if (sort > 0)
+                                {
+                                    this.txtSort.Text = (sort + 1).ToString();
+                                }
+                            }
+                        }
+                        else if (this.Type == "2")//鍒嗛」宸ョ▼
+                        {
+                            this.txtSubBranchEngineeringName.Required = true;
+                            this.txtSubBranchEngineeringName.ShowRedStar = true;
+                            this.txtProEngineeringName.Required = true;
+                            this.txtProEngineeringName.ShowRedStar = true;
+                            this.txtProEngineeringCode.Required = true;
+                            this.txtProEngineeringCode.ShowRedStar = true;
+                            this.txtProEngineeringNum.Required = true;
+                            this.txtProEngineeringNum.ShowRedStar = true;
+
+                            var sub = BLL.SubProjectsService.GetSubProjectsById(subProjects.ParentId);
+                            if (sub != null)
+                            {
+                                this.txtBranchEngineeringName.Text = sub.BranchEngineeringName;
+                            }
+                            this.txtSubBranchEngineeringName.Text = subProjects.SubBranchEngineeringName;
+                            if (!string.IsNullOrEmpty(this.DivisionId))
+                            {
+                                var divis = BLL.SubProjectsService.GetSubProjectsById(this.DivisionId);
+                                if (divis != null)
+                                {
+                                    this.txtProEngineeringName.Text = divis.ProEngineeringName;
+                                    this.txtProEngineeringCode.Text = divis.ProEngineeringCode;
+                                    this.txtProEngineeringNum.Text = divis.ProEngineeringNum;
+                                    this.txtSort.Text = divis.Sort.HasValue ? divis.Sort.ToString() : "";
+                                    this.txtRemark.Text = divis.Remark;
+                                }
+                            }
+                            else
+                            {
+                                //鑷姩鑾峰彇鎺掑簭鍙�
+                                int sort = BLL.SubProjectsService.GetSubProjectsByProjectId(this.CurrUser.LoginProjectId);
+                                if (sort > 0)
+                                {
+                                    this.txtSort.Text = (sort + 1).ToString();
+                                }
+                            }
+                        }
+                    }
+                }
+                else //鍒嗛儴宸ョ▼
+                {
+                    if (!string.IsNullOrEmpty(this.DivisionId))
+                    {
+                        Model.Division_SubProjects subProjects = BLL.SubProjectsService.GetSubProjectsById(this.DivisionId);
+                        if (subProjects != null)
+                        {
+                            this.txtBranchEngineeringCode.Text = subProjects.BranchEngineeringCode;
+                            this.txtBranchEngineeringName.Text = subProjects.BranchEngineeringName;
+                            this.txtRemark.Text = subProjects.Remark;
+                            this.txtSort.Text = subProjects.Sort.HasValue ? subProjects.Sort.ToString() : "";
+                        }
+                    }
+                    else
+                    {
+                        //鑷姩鑾峰彇鎺掑簭鍙�
+                        int sort = BLL.SubProjectsService.GetSubProjectsByProjectId(this.CurrUser.LoginProjectId);
+                        if (sort > 0)
+                        {
+                            this.txtSort.Text = (sort + 1).ToString();
+                        }
+                        else
+                        {
+                            this.txtSort.Text = "1";
+                        }
+                    }
+                }
+                if (!string.IsNullOrEmpty(this.ParentId))
+                {
+                    this.txtBranchEngineeringCode.Readonly = true;
+                    this.txtBranchEngineeringName.Readonly = true;
+                    if (this.Type == "1")//瀛愬垎閮ㄥ伐绋�
+                    {
+                        this.Panel1.Hidden = true;
+                        this.childBra.Hidden = false;
+                    }
+                    else if (this.Type == "2")//鍒嗛」宸ョ▼
+                    {
+                        var pare = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
+                        if (pare != null)
+                        {
+                            if (!string.IsNullOrEmpty(pare.ParentId))
+                            {
+                                this.childBra.Hidden = false;
+                                this.txtSubBranchEngineeringName.Readonly = true;
+                            }
+                            else
+                            {
+                                this.childBra.Hidden = true;
+                            }
+                        }
+                        this.Panel1.Hidden = false;
+                    }
+                }
+                else
+                {
+                    this.Panel1.Hidden = true;
+                }
+            }
+        }
+        #endregion
+
+        #region 淇濆瓨
+        /// <summary>
+        /// 淇濆瓨鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Model.Division_SubProjects newSubProjects = new Model.Division_SubProjects();
+            newSubProjects.ProjectId = this.CurrUser.LoginProjectId;
+            newSubProjects.BranchEngineeringCode = this.txtBranchEngineeringCode.Text.Trim();           
+            newSubProjects.Remark = this.txtRemark.Text.Trim();
+            newSubProjects.AddUser = this.CurrUser.UserId;
+            newSubProjects.OperateTime = DateTime.Now;
+            newSubProjects.Sort = Funs.GetNewInt(this.txtSort.Text.Trim());
+            if (!string.IsNullOrEmpty(this.ParentId))
+            {
+                newSubProjects.ParentId = this.ParentId;
+                if (this.Type == "1")//瀛愬垎閮ㄥ伐绋�
+                {
+                    newSubProjects.SubBranchEngineeringName = this.txtSubBranchEngineeringName.Text.Trim();
+                    if (!string.IsNullOrEmpty(this.DivisionId))
+                    {
+                        var div = BLL.SubProjectsService.GetSubProjectsById(this.DivisionId);
+                        if(div!=null)
+                        {
+                            newSubProjects.DivisionLevel = div.DivisionLevel;
+                        }
+                        newSubProjects.DivisionId = this.DivisionId;
+                        BLL.SubProjectsService.UpdateSubProjects(newSubProjects);
+                    }
+                    else
+                    {
+                        //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
+                        //if (sub.DivisionLevel == 1)
+                        //{
+                            newSubProjects.DivisionLevel = 2;
+                        //}
+                        newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim();
+                        newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
+                        this.DivisionId = newSubProjects.DivisionId;
+                        BLL.SubProjectsService.AddSubProjects(newSubProjects);
+                    }
+                }
+                else if (this.Type == "2")//鍒嗛」宸ョ▼
+                {
+                    newSubProjects.ProEngineeringName = this.txtProEngineeringName.Text.Trim();
+                    newSubProjects.ProEngineeringCode = this.txtProEngineeringCode.Text.Trim();
+                    newSubProjects.ProEngineeringNum = this.txtProEngineeringNum.Text.Trim();
+
+                    if (!string.IsNullOrEmpty(this.DivisionId))
+                    {
+                        var div = BLL.SubProjectsService.GetSubProjectsById(this.DivisionId);
+                        if (div != null)
+                        {
+                            newSubProjects.DivisionLevel = div.DivisionLevel;
+                        }
+                        newSubProjects.DivisionId = this.DivisionId;
+                        BLL.SubProjectsService.UpdateSubProjects(newSubProjects);
+                    }
+                    else
+                    {
+                        //var sub = BLL.SubProjectsService.GetSubProjectsById(this.ParentId);
+                        //if (sub.DivisionLevel == 1)
+                        //{
+                        //    newSubProjects.DivisionLevel = 2;
+                        //}
+                        //else if (sub.DivisionLevel==2)
+                        //{
+                            newSubProjects.DivisionLevel = 3;
+                        //}
+                        newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
+                        this.DivisionId = newSubProjects.DivisionId;
+                        BLL.SubProjectsService.AddSubProjects(newSubProjects);
+                    }                   
+                }
+            }
+            else //鍒嗛儴宸ョ▼
+            {
+                newSubProjects.BranchEngineeringName = this.txtBranchEngineeringName.Text.Trim();
+                newSubProjects.DivisionLevel = 1;
+                newSubProjects.ProEngineeringCode = "00";
+                newSubProjects.ProEngineeringNum = newSubProjects.BranchEngineeringCode + "00";
+                if (!string.IsNullOrEmpty(this.DivisionId))
+                {
+                    newSubProjects.DivisionId = this.DivisionId;
+                    BLL.SubProjectsService.UpdateSubProjects(newSubProjects);
+                }
+                else
+                {
+                    newSubProjects.DivisionId = SQLHelper.GetNewID(typeof(Model.Division_SubProjects));
+                    this.DivisionId = newSubProjects.DivisionId;
+                    BLL.SubProjectsService.AddSubProjects(newSubProjects);
+                }
+            }            
+            ShowNotify("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        #endregion
+
+        #region 鍒嗛」宸ョ▼缂栧彿瑙﹀彂浜嬩欢
+        /// <summary>
+        /// 鍒嗛」宸ョ▼缂栧彿瑙﹀彂浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void txtProEngineeringCode_TextChanged(object sender, EventArgs e)
+        {
+            this.txtProEngineeringNum.Text = string.Empty;
+            if (!string.IsNullOrEmpty(this.txtBranchEngineeringCode.Text.Trim())&&!string.IsNullOrEmpty(this.txtProEngineeringCode.Text.Trim()))
+            {
+                this.txtProEngineeringNum.Text = this.txtBranchEngineeringCode.Text.Trim() + this.txtProEngineeringCode.Text.Trim();
+            }
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DivisionSubProjectsMenuId);
+            if (buttonList.Count > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.designer.cs
new file mode 100644
index 00000000..b5981711
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsNewEdit.aspx.designer.cs
@@ -0,0 +1,159 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionSubProjectsNewEdit {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// txtBranchEngineeringCode 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBranchEngineeringCode;
+        
+        /// <summary>
+        /// txtBranchEngineeringName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBranchEngineeringName;
+        
+        /// <summary>
+        /// childBra 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.FormRow childBra;
+        
+        /// <summary>
+        /// txtSubBranchEngineeringName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubBranchEngineeringName;
+        
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Form2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// txtProEngineeringName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProEngineeringName;
+        
+        /// <summary>
+        /// txtProEngineeringCode 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProEngineeringCode;
+        
+        /// <summary>
+        /// txtProEngineeringNum 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProEngineeringNum;
+        
+        /// <summary>
+        /// txtSort 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtSort;
+        
+        /// <summary>
+        /// txtRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+        
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx
index 471f4cd7..07750bb8 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx
@@ -99,7 +99,7 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:NumberBox runat="server" Label="鎺掑簭" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="150"></f:NumberBox>
+                                            <f:NumberBox runat="server" Label="鎺掑簭" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="200px"></f:NumberBox>
                                         </Items>
                                     </f:FormRow>
 
@@ -107,7 +107,7 @@
                                         <Items>
                                             <f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
                                                 <Items>
-                                                    <f:Label runat="server" Text="闄勪欢锛�" CssStyle="padding-left:25px" Width="150px" CssClass="marginr" ShowLabel="false"></f:Label>
+                                                    <f:Label runat="server" Label="闄勪欢" CssStyle="padding-left:25px" CssClass="marginr" LabelWidth="180px"></f:Label>
                                                     <f:Button ID="BtnFile" Text="闄勪欢" ToolTip="闄勪欢" Icon="TableCell" runat="server"
                                                         OnClick="BtnFile_Click">
                                                     </f:Button>
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
index 70b9c3a5..3a1d757b 100644
--- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx
@@ -16,7 +16,7 @@
             ShowHeader="true" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="鏁欒偛鍩硅" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="TrainingId" DataIDField="TrainingId" AllowSorting="true"
+                    runat="server" BoxFlex="1" DataKeyNames="TrainingId,Ttype" DataIDField="TrainingId" AllowSorting="true"
                     SortField="ProjectCode,TrainStartDate" SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
                     IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
                      EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" 
@@ -30,9 +30,9 @@
                                 <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
                                 <f:RadioButtonList runat="server" ID="rbType" Width="600px" Label="绫诲瀷" LabelWidth="50px"
                                     AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoColumnWidth="true">
-                                    <f:RadioItem Text="涓夌骇鏁欒偛鍩硅" Value="1" Selected="true" />
-                                    <f:RadioItem Text="涓撻」鍩硅" Value="2" />
-                                      <f:RadioItem Text="鐗圭浣滀笟鍩硅" Value="3" />
+                                    <f:RadioItem Text="鍏ュ満" Value="dfb6a37e-4412-4ba9-ad59-3bc505bc21f7" Selected="true" />
+                                    <f:RadioItem Text="鍏朵粬" Value="c1a513bb-a547-45b0-944d-b0dd88f06f82" />
+                                      <f:RadioItem Text="涓撻」" Value="0e7fdf78-eaa0-4d00-a60b-490040bbea18" />
                                 </f:RadioButtonList>
                                 <f:DatePicker ID="txtStartTime" runat="server" Label="鏃堕棿" LabelAlign="Right"
                                     AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px">
@@ -62,6 +62,10 @@
                            <f:RenderField Width="100px" ColumnID="TrainTitle" DataField="TrainTitle" 
                                FieldType="String" HeaderText="鍚嶇О" HeaderTextAlign="Center"
                             TextAlign="Left">
+                        </f:RenderField>
+                           <f:RenderField Width="100px" ColumnID="Ttype" DataField="Ttype" 
+                               FieldType="String" HeaderText="鏉ユ簮" HeaderTextAlign="Center"
+                            TextAlign="Left">
                         </f:RenderField>
                         <f:RenderField Width="110px" ColumnID="TrainStartDate" DataField="TrainStartDate"
                                FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
diff --git a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
index 222d31da..f40ecda1 100644
--- a/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs
@@ -34,38 +34,167 @@ namespace FineUIPro.Web.DataShow
         {
             string strSql = string.Empty;
             List<SqlParameter> listStr = new List<SqlParameter>();
+            List<SqlParameter> listStrSum = new List<SqlParameter>();
+            //strSql = @"select TrainRecord.TrainTypeId,TrainRecord.TrainingId,
+            //            TrainRecord.TrainTitle,
+            //            Project.ProjectId,
+            //            Project.ProjectCode,
+            //            Project.ProjectName,
+            //            TrainRecord.TrainStartDate,
+            //            TrainRecord.TrainEndDate,
+            //            TrainRecord.TrainPersonNum,
+            //            UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+            //            from EduTrain_TrainRecord AS TrainRecord 
+            //            LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
+            //            LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
+            //            WHERE 1=1 ";
 
-            strSql = @"select TrainRecord.TrainingId,TrainRecord.TrainTitle,TrainType.TrainTypeName,Project.ProjectId,Project.ProjectCode,Project.ProjectName
-            ,TrainRecord.TrainStartDate,TrainRecord.TrainEndDate,TrainRecord.TrainPersonNum,TrainRecord.UnitIds
-            ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
-             from EduTrain_TrainRecord AS TrainRecord 
-             LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
-              LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
-             WHERE 1=1 ";
+            //strSql += " AND TrainRecord.TrainTypeId =@TrainType";
+            //listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));
 
-            strSql += " AND TrainType.TrainType =@TrainType";
-            listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));
+            //褰撳墠椤垫暟
+            int pageIndex = Grid1.PageIndex + 1;
+            //姣忛〉鏄剧ず鏉℃暟
+            int pageSize = Grid1.PageSize;
+            strSql = @"select*from(
+                                select ROW_NUMBER() OVER(Order by ProjectCode desc) AS RowNumber,
+                                * from (
+                                select 
+                                '鏈郴缁�' as Ttype,
+                                TrainRecord.TrainTypeId,
+                                TrainRecord.TrainingId,
+                                TrainRecord.TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainRecord.TrainStartDate,
+                                TrainRecord.TrainEndDate,
+                                TrainRecord.TrainPersonNum,
+                                UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+                                from EduTrain_TrainRecord AS TrainRecord 
+                                LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
+                                LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
+
+                                UNION ALL
+
+                                select 
+                                '鍗氭櫉' as Ttype,
+                                TrainType as TrainTypeId,
+                                Id as TrainingId,
+                                RecordName as TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainStartDate,
+                                TrainEndDate,
+                                PersonCount as TrainPersonNum,
+                                TrainDepart as UnitName
+                                From Bo_Sheng_Train F
+                                LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
+                                )f WHERE 1=1 ";
+
+            #region 鎬绘暟
+            var strSqlSum = @"select Count(*)as allCount from(
+                                select ROW_NUMBER() OVER(Order by ProjectCode desc) AS RowNumber,
+                                * from (
+                                select 
+                                '1' as Ttype,
+                                TrainRecord.TrainTypeId,
+                                TrainRecord.TrainingId,
+                                TrainRecord.TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainRecord.TrainStartDate,
+                                TrainRecord.TrainEndDate,
+                                TrainRecord.TrainPersonNum,
+                                UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +TrainRecord.UnitIds + ',')>0 FOR XML PATH('')), 1, 1,'')
+                                from EduTrain_TrainRecord AS TrainRecord 
+                                LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
+                                LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
+
+                                UNION ALL
+
+                                select 
+                                '鍗氭櫉' as Ttype,
+                                TrainType as TrainTypeId,
+                                Id as TrainingId,
+                                RecordName as TrainTitle,
+                                Project.ProjectId,
+                                Project.ProjectCode,
+                                Project.ProjectName,
+                                TrainStartDate,
+                                TrainEndDate,
+                                PersonCount as TrainPersonNum,
+                                TrainDepart as UnitName
+                                From Bo_Sheng_Train F
+                                LEFT JOIN Base_Project AS Project ON F.ProjectId=Project.ProjectId 
+                                )f WHERE 1=1";
+            
+            #endregion
             if (this.drpProject.SelectedValue != Const._Null)
             {
-                strSql += " AND TrainRecord.ProjectId = @ProjectId";
+                strSql += " AND ProjectId = @ProjectId";
                 listStr.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
+
+                strSqlSum += " AND ProjectId = @ProjectId";
+                listStrSum.Add(new SqlParameter("@ProjectId", this.drpProject.SelectedValue));
             }
             if (!string.IsNullOrEmpty(this.txtStartTime.Text))
             {
-                strSql += " AND TrainRecord.TrainEndDate >=@StartTime";
+                strSql += " AND TrainStartDate >=@StartTime";
                 listStr.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
+
+                strSqlSum += " AND TrainStartDate >=@StartTime";
+                listStrSum.Add(new SqlParameter("@StartTime", this.txtStartTime.Text));
             }
             if (!string.IsNullOrEmpty(this.txtEndTime.Text))
             {
-                strSql += " AND TrainRecord.TrainEndDate <=@EndTime";
+                strSql += " AND TrainStartDate <=@EndTime";
                 listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
+
+                strSqlSum += " AND TrainStartDate <=@EndTime";
+                listStrSum.Add(new SqlParameter("@EndTime", this.txtStartTime.Text));
             }
+            if (!string.IsNullOrEmpty(this.rbType.SelectedValue))
+            {
+                strSql += " And ( TrainTypeId='" + rbType.SelectedValue + "' or ";
+
+                strSqlSum+= " And ( TrainTypeId='" + rbType.SelectedValue + "' or ";
+                if (rbType.SelectedValue == "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7")
+                {
+                    strSql += " TrainTypeId like '%鍏ュ満%' ) ";
+
+                    strSqlSum += " TrainTypeId like '%鍏ュ満%' ) ";
+                }
+                else if (rbType.SelectedValue == "c1a513bb-a547-45b0-944d-b0dd88f06f82")
+                {
+                    strSql += " TrainTypeId like '%鍏朵粬%' ) ";
+                    strSqlSum += " TrainTypeId like '%鍏朵粬%' ) ";
+                }
+                else {
+                    strSql += " TrainTypeId like '%涓撻」%' ) ";
+                    strSqlSum += " TrainTypeId like '%涓撻」%' ) ";
+                }
+            }
+
+            strSql += " ) b where b.RowNumber BETWEEN(@pageIndex-1)*@pageSize + 1 and @pageIndex*@pageSize order by RowNumber asc";
+            strSqlSum+= " ) b ";
+
+            listStr.Add(new SqlParameter("@pageIndex", pageIndex));
+            listStr.Add(new SqlParameter("@pageSize", pageSize));
+
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
-            Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
+            #region 鎬绘暟
+            DataTable tbSum = SQLHelper.GetDataTableRunText(strSqlSum, listStrSum.ToArray());
+            Grid1.RecordCount = Convert.ToInt32(tbSum.Rows[0]["allcount"].ToString());
+            #endregion
+
+
+            Grid1.DataSource = tb;
             Grid1.DataBind();
         }
         #endregion
@@ -78,6 +207,7 @@ namespace FineUIPro.Web.DataShow
         /// <param name="e"></param>
         protected void TextBox_TextChanged(object sender, EventArgs e)
         {
+            Grid1.PageIndex = 0;
             this.BindGrid();
         }
         #endregion
@@ -147,8 +277,11 @@ namespace FineUIPro.Web.DataShow
                 Alert.ShowInTop("璇疯嚦灏戦�夋嫨涓�鏉¤褰曪紒", MessageBoxIcon.Warning);
                 return;
             }
-
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/EduTrain/TrainRecordView.aspx?TrainingId={0}", Grid1.SelectedRowID, "鏌ョ湅 - ")));
+            var tType= Grid1.SelectedRow.DataKeys[1].ToString();
+            if (tType!="鍗氭櫉")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../HSSE/EduTrain/TrainRecordView.aspx?TrainingId={0}", Grid1.SelectedRowID, "鏌ョ湅 - ")));
+            }
         }
         #endregion
 
diff --git a/SGGL/FineUIPro.Web/DocManage/DocManage.aspx.cs b/SGGL/FineUIPro.Web/DocManage/DocManage.aspx.cs
index 2aa68430..99586708 100644
--- a/SGGL/FineUIPro.Web/DocManage/DocManage.aspx.cs
+++ b/SGGL/FineUIPro.Web/DocManage/DocManage.aspx.cs
@@ -60,10 +60,26 @@ namespace FineUIPro.Web.DocManage
             }
         }
 
+        /// <summary>
+        /// 绫诲瀷
+        /// </summary>
+        public string classify
+        {
+            get
+            {
+                return (string)ViewState["classify"];
+            }
+            set
+            {
+                ViewState["classify"] = value;
+            }
+        }
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
+                classify = Request.Params["classify"];
                 UnitService.GetUnit(drpSendUnit, CurrUser.LoginProjectId, true);
                 UnitService.GetUnit(drpReceivUnit, CurrUser.LoginProjectId, true);
                 UserService.InitUserDropDownList(drpCompileMan, CurrUser.LoginProjectId, true);
@@ -74,6 +90,10 @@ namespace FineUIPro.Web.DocManage
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 btnNew.OnClientClick = Window1.GetShowReference("DocManageEdit.aspx") + "return false;";
                 GetButtonPower();
+                if (classify != "0")
+                {
+                    btnNew.Hidden = true;
+                }
                 BindData();
 
             }
@@ -141,6 +161,29 @@ namespace FineUIPro.Web.DocManage
                 strSql += " AND doc.AcceptMan like @AcceptMan";
                 listStr.Add(new SqlParameter("@AcceptMan", "%" + drpAcceptMan.SelectedValue + "%"));
             }
+            var uid = CurrUser.UserId;
+            //鎴戝垱寤虹殑
+            if (classify == "0")
+            {
+                strSql += " AND doc.CompileMan ='" + uid + "' ";
+            }
+            //寰呮垜澶勭悊
+            else if (classify == "1")
+            {
+                strSql += " AND (doc.State ='1' and doc.AcceptMan like'%" + uid + "%'  )";
+            }
+            //鎴戝凡澶勭悊
+            else if (classify == "2")
+            {
+                strSql += " AND (doc.State ='2' and doc.AcceptMan like'%" + uid + "%'  )";
+            }
+            //鎴戝弬涓庣殑
+            else if (classify == "3")
+            {
+                strSql += " AND doc.CopyMan like'%" + uid + "%' ";
+            }
+
+
 
 
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx
index c9063f06..9ea9bb66 100644
--- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx
+++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx
@@ -162,7 +162,7 @@
                                         <Items>
                                             <f:RadioButtonList runat="server" ID="drpHandleType" Label="鍔炵悊姝ラ" LabelWidth="120px" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged" AutoColumnWidth="true">
                                                 <f:RadioItem Text="璇峰洖澶嶅拰澶勭悊" Value="1" Selected="true" />
-                                                <f:RadioItem Text="璇风煡鎮変簡瑙�" Value="2" />
+                                                <f:RadioItem Text="宸茬煡鎮変簡瑙�" Value="2" />
                                             </f:RadioButtonList>
                                             <f:DatePicker ID="txtFinishTime" runat="server" Label="瑕佹眰瀹屾垚鏃堕棿" LabelWidth="120px"  LabelAlign="Right"
                                                 EnableEdit="true">
diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx
index 370cf330..4ede017e 100644
--- a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx
+++ b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx
@@ -94,6 +94,11 @@
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox runat="server" ID="txtCopyMan" Label="鎶勯�佷汉鍛�"  Readonly="True" Enabled="False"/>
+                                        </Items>
+                                    </f:FormRow>
                                     <f:FormRow>
                                         <Items>
                                             <f:HtmlEditor runat="server" Label=" " ID="txtDocContent" ShowLabel="false"
diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs
index c82a8565..cda95574 100644
--- a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs
+++ b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.cs
@@ -45,6 +45,16 @@ namespace FineUIPro.Web.DocManage
             }
         }
 
+        private string GetUserNames(string Ids)
+        {
+            string[] arr = Ids.Split(',');
+            var data = Funs.DB.Sys_User.Where(t => arr.Contains(t.UserId)).Select(t => t.UserName).ToList();
+            if (data.Count > 0)
+                return string.Join(",", data);
+            return null;
+
+        }
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
@@ -82,6 +92,14 @@ namespace FineUIPro.Web.DocManage
                     {
                         State = Const.Doc_State_0;
                     }
+
+                    if (!string.IsNullOrEmpty(doc.CopyMan))
+                    {
+                        txtCopyMan.Text = GetUserNames(doc.CopyMan);
+                    }
+
+
+
                     BindGrid();
                     if (!string.IsNullOrEmpty(Type) && Type == "notice")
                     {
diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs
index 5a1cc6a6..e4f30f05 100644
--- a/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/DocManage/DocManageView.aspx.designer.cs
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.DocManage
         /// </remarks>
         protected global::FineUIPro.TextBox txtFinishTime;
 
+        /// <summary>
+        /// txtCopyMan 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCopyMan;
+
         /// <summary>
         /// txtDocContent 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
deleted file mode 100644
index d5ff0428..00000000
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ /dev/null
@@ -1,282 +0,0 @@
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:SqlException
-閿欒淇℃伅:鏃犳硶缁戝畾鐢卞涓儴鍒嗙粍鎴愮殑鏍囪瘑绗� "D.UnitWorkId"銆�
-閿欒鍫嗘爤:
-   鍦� 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.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
-   鍦� System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
-   鍦� System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
-   鍦� System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
-   鍦� BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 浣嶇疆 E:\浜旂幆\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:琛屽彿 311
-   鍦� FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.BindGrid() 浣嶇疆 E:\浜旂幆\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:琛屽彿 83
-   鍦� FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.btnSearch_Click(Object sender, EventArgs e) 浣嶇疆 E:\浜旂幆\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:琛屽彿 135
-   鍦� FineUIPro.Button.OnClick(EventArgs e)
-   鍦� (Button , EventArgs )
-   鍦� FineUIPro.Button.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)
-鍑洪敊鏃堕棿:09/02/2024 10:32:29
-鍑洪敊鏂囦欢:http://localhost:8579/CQMS/ProcessControl/InspectionNotice.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:09/02/2024 10:32:29
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:SqlException
-閿欒淇℃伅:鍒楀悕 'NextNum' 鏃犳晥銆�
-閿欒鍫嗘爤:
-   鍦� 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()
-   鍦� System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
-   鍦� System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
-   鍦� FineUIPro.Web.common.mainProject2.GetJD() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:琛屽彿 720
-   鍦� FineUIPro.Web.common.mainProject2.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\mainProject2.aspx.cs:琛屽彿 113
-   鍦� 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)
-鍑洪敊鏃堕棿:06/25/2024 17:08:52
-鍑洪敊鏂囦欢:http://localhost:8579/common/mainProject2.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:06/25/2024 17:08:52
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:SqlException
-閿欒淇℃伅:鍙傛暟鍖栨煡璇� '(@ProjectId nvarchar(4000))SELECT NEWID() AS ID, CardNo,PersonNa' 闇�瑕佸弬鏁� '@ProjectId'锛屼絾鏈彁渚涜鍙傛暟銆�
-閿欒鍫嗘爤:
-   鍦� 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.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
-   鍦� System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
-   鍦� System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
-   鍦� System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
-   鍦� BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:琛屽彿 311
-   鍦� FineUIPro.Web.HSSE.EduTrain.TrainFind.BindGrid() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:琛屽彿 116
-   鍦� FineUIPro.Web.HSSE.EduTrain.TrainFind.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\HSSE\EduTrain\TrainFind.aspx.cs:琛屽彿 59
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:09/03/2024 15:38:17
-鍑洪敊鏂囦欢:http://localhost:8579/HSSE/EduTrain/TrainFind.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:09/03/2024 15:38:17
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:FormatException
-閿欒淇℃伅:杈撳叆瀛楃涓茬殑鏍煎紡涓嶆纭��
-閿欒鍫嗘爤:
-   鍦� System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
-   鍦� System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
-   鍦� System.String.System.IConvertible.ToInt32(IFormatProvider provider)
-   鍦� System.Convert.ToInt32(Object value)
-   鍦� FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
-   鍦� (GridColumn , GridRow )
-   鍦� FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
-   鍦� (GridRow )
-   鍦� FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
-   鍦� (Grid , Int32 , Object )
-   鍦� FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
-   鍦� (Grid , IEnumerable , Boolean )
-   鍦� FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   鍦� (Grid , Boolean )
-   鍦� FineUIPro.Grid.DataBind()
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 34
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.btnSearch_Click(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 39
-   鍦� FineUIPro.Button.OnClick(EventArgs e)
-   鍦� (Button , EventArgs )
-   鍦� FineUIPro.Button.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)
-鍑洪敊鏃堕棿:09/03/2024 15:53:12
-鍑洪敊鏂囦欢:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:09/03/2024 15:53:12
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:FormatException
-閿欒淇℃伅:杈撳叆瀛楃涓茬殑鏍煎紡涓嶆纭��
-閿欒鍫嗘爤:
-   鍦� System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
-   鍦� System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
-   鍦� System.String.System.IConvertible.ToInt32(IFormatProvider provider)
-   鍦� System.Convert.ToInt32(Object value)
-   鍦� FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
-   鍦� (GridColumn , GridRow )
-   鍦� FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
-   鍦� (GridRow )
-   鍦� FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
-   鍦� (Grid , Int32 , Object )
-   鍦� FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
-   鍦� (Grid , IEnumerable , Boolean )
-   鍦� FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   鍦� (Grid , Boolean )
-   鍦� FineUIPro.Grid.DataBind()
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 34
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 22
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:09/03/2024 15:53:47
-鍑洪敊鏂囦欢:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:09/03/2024 15:53:47
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:FormatException
-閿欒淇℃伅:杈撳叆瀛楃涓茬殑鏍煎紡涓嶆纭��
-閿欒鍫嗘爤:
-   鍦� System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
-   鍦� System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
-   鍦� System.String.System.IConvertible.ToInt32(IFormatProvider provider)
-   鍦� System.Convert.ToInt32(Object value)
-   鍦� FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
-   鍦� (GridColumn , GridRow )
-   鍦� FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
-   鍦� (GridRow )
-   鍦� FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
-   鍦� (Grid , Int32 , Object )
-   鍦� FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
-   鍦� (Grid , IEnumerable , Boolean )
-   鍦� FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   鍦� (Grid , Boolean )
-   鍦� FineUIPro.Grid.DataBind()
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 34
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 22
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:09/03/2024 15:54:12
-鍑洪敊鏂囦欢:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:09/03/2024 15:54:12
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:FormatException
-閿欒淇℃伅:杈撳叆瀛楃涓茬殑鏍煎紡涓嶆纭��
-閿欒鍫嗘爤:
-   鍦� System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
-   鍦� System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
-   鍦� System.String.System.IConvertible.ToInt32(IFormatProvider provider)
-   鍦� System.Convert.ToInt32(Object value)
-   鍦� FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
-   鍦� (GridColumn , GridRow )
-   鍦� FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
-   鍦� (GridRow )
-   鍦� FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
-   鍦� (Grid , Int32 , Object )
-   鍦� FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
-   鍦� (Grid , IEnumerable , Boolean )
-   鍦� FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   鍦� (Grid , Boolean )
-   鍦� FineUIPro.Grid.DataBind()
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 34
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 22
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:09/03/2024 15:54:41
-鍑洪敊鏂囦欢:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:09/03/2024 15:54:41
-
-
-閿欒淇℃伅寮�濮�=====>
-閿欒绫诲瀷:FormatException
-閿欒淇℃伅:杈撳叆瀛楃涓茬殑鏍煎紡涓嶆纭��
-閿欒鍫嗘爤:
-   鍦� System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal)
-   鍦� System.Number.ParseInt32(String s, NumberStyles style, NumberFormatInfo info)
-   鍦� System.String.System.IConvertible.ToInt32(IFormatProvider provider)
-   鍦� System.Convert.ToInt32(Object value)
-   鍦� FineUIPro.RenderField.DSVurKNBLhHEBGjRDehgsQmnHqGTA(GridRow )
-   鍦� (GridColumn , GridRow )
-   鍦� FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
-   鍦� (GridRow )
-   鍦� FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
-   鍦� (Grid , Int32 , Object )
-   鍦� FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
-   鍦� (Grid , IEnumerable , Boolean )
-   鍦� FineUIPro.Grid.DataBind(Boolean keepCurrentData)
-   鍦� (Grid , Boolean )
-   鍦� FineUIPro.Grid.DataBind()
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.GridBind() 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 34
-   鍦� FineUIPro.Web.BoSheng.BoPersonTrainRecord.Page_Load(Object sender, EventArgs e) 浣嶇疆 D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\BoSheng\BoPersonTrainRecord.aspx.cs:琛屽彿 22
-   鍦� System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
-   鍦� System.EventHandler.Invoke(Object sender, EventArgs e)
-   鍦� System.Web.UI.Control.OnLoad(EventArgs e)
-   鍦� System.Web.UI.Control.LoadRecursive()
-   鍦� System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-鍑洪敊鏃堕棿:09/03/2024 15:55:36
-鍑洪敊鏂囦欢:http://localhost:8579/BoSheng/BoPersonTrainRecord.aspx
-IP鍦板潃:::1
-鎿嶄綔浜哄憳:JT
-
-鍑洪敊鏃堕棿:09/03/2024 15:55:36
-
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation瀵煎叆妯℃澘.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation瀵煎叆妯℃澘.xls
index ffd0af3e..f4490857 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation瀵煎叆妯℃澘.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation瀵煎叆妯℃澘.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation瀵煎叆妯℃澘锛堟棫锛�.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation瀵煎叆妯℃澘锛堟棫锛�.xls
new file mode 100644
index 00000000..45cf4ca9
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation瀵煎叆妯℃澘锛堟棫锛�.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping瀵煎叆妯℃澘.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping瀵煎叆妯℃澘.xls
index 5d30839f..48132ef0 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping瀵煎叆妯℃澘.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping瀵煎叆妯℃澘.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment瀵煎叆妯℃澘.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment瀵煎叆妯℃澘.xls
index 53bc3cda..50260a8f 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment瀵煎叆妯℃澘.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment瀵煎叆妯℃澘.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎瀵煎叆妯℃澘.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎瀵煎叆妯℃澘.xls
new file mode 100644
index 00000000..a1d0bb5d
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎瀵煎叆妯℃澘.xls differ
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/鏈哄叿鎶ラ獙瀵煎叆妯℃澘.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/鏈哄叿鎶ラ獙瀵煎叆妯℃澘.xls
index 3ba4c985..c61e5f4a 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/鏈哄叿鎶ラ獙瀵煎叆妯℃澘.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/鏈哄叿鎶ラ獙瀵煎叆妯℃澘.xls differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index fec7f569..7209e7e3 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FineUIPro.Web</RootNamespace>
     <AssemblyName>FineUIPro.Web</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <SccProjectName>
     </SccProjectName>
@@ -65,7 +65,7 @@
   <ItemGroup>
     <Reference Include="Apache.NMS, Version=1.8.0.0, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\DepCode\reference-bll\Reference BLL\Apache.NMS.dll</HintPath>
+      <HintPath>bin\Apache.NMS.dll</HintPath>
     </Reference>
     <Reference Include="Apache.NMS.ActiveMQ, Version=1.7.2.4108, Culture=neutral, PublicKeyToken=82756feee3957618, processorArchitecture=MSIL">
       <HintPath>..\packages\Apache.NMS.ActiveMQ.1.7.2\lib\net40\Apache.NMS.ActiveMQ.dll</HintPath>
@@ -100,11 +100,12 @@
       <HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.QualityTools.Testing.Fakes">
+      <HintPath>..\FineUIPro\Reference BLL\Microsoft.QualityTools.Testing.Fakes.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
@@ -207,6 +208,7 @@
     <Content Include="AttachFile\lib\popcorn.subtitle.js" />
     <Content Include="AttachFile\Look.aspx" />
     <Content Include="AttachFile\OnlineEditing.aspx" />
+    <Content Include="AttachFile\OnlineEditingPrivate.aspx" />
     <Content Include="AttachFile\player.aspx" />
     <Content Include="AttachFile\res\webuploader\Uploader.swf" />
     <Content Include="AttachFile\res\webuploader\webuploader.nolog.js" />
@@ -603,8 +605,13 @@
     <Content Include="CQMS\WBS\ControlItemInitSet.aspx" />
     <Content Include="CQMS\WBS\ControlItemProjectEdit.aspx" />
     <Content Include="CQMS\WBS\ControlPoint.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideAndCropDataIn.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideList.aspx" />
     <Content Include="CQMS\WBS\Control\DivisionSubProjects.aspx" />
     <Content Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionSubProjectsNew.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionSubProjectsNewEdit.aspx" />
     <Content Include="CQMS\WBS\Control\PointCropping.aspx" />
     <Content Include="CQMS\WBS\Control\PointCroppingEdit.aspx" />
     <Content Include="CQMS\WBS\EditBreakdown.aspx" />
@@ -1388,7 +1395,6 @@
     <Content Include="Images\SUBimages\CHENGDA.gif" />
     <Content Include="Images\SUBimages\CNCEC.png" />
     <Content Include="Images\SUBimages\CNCEC16.gif" />
-    <Content Include="Images\SUBimages\CWCEC.gif" />
     <Content Include="Images\SUBimages\ECEC.gif" />
     <Content Include="Images\SUBimages\ENN.gif" />
     <Content Include="Images\SUBimages\FCC.gif" />
@@ -1446,6 +1452,7 @@
     <Content Include="JDGL\CostAnalysis\JDReport.aspx" />
     <Content Include="JDGL\CostAnalysis\PlanAdjust.aspx" />
     <Content Include="JDGL\CostAnalysis\RectificationMeasureSet.aspx" />
+    <Content Include="JDGL\Progress\WbsManager.aspx" />
     <Content Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx" />
     <Content Include="JDGL\WBSCompleteAndReal\WBSReport.aspx" />
     <Content Include="JDGL\WBSPlan\SeeDetailHistory.aspx" />
@@ -1598,6 +1605,7 @@
     <Content Include="ProjectData\ProjectUnitSelect.aspx" />
     <Content Include="ProjectData\ProjectUnitView.aspx" />
     <Content Include="ProjectData\ProjectUser.aspx" />
+    <Content Include="ProjectData\ProjectUserContact.aspx" />
     <Content Include="ProjectData\ProjectUserSave.aspx" />
     <Content Include="ProjectData\ProjectUserSelect.aspx" />
     <Content Include="ProjectData\ProjectUserView.aspx" />
@@ -2156,6 +2164,8 @@
     <Content Include="ZHGL\InformationProject\PictureView.aspx" />
     <Content Include="ZHGL\Information\AccidentCauseReport.aspx" />
     <Content Include="ZHGL\Information\AccidentCauseReportSave.aspx" />
+    <Content Include="ZHGL\Information\ActionWorkLedger.aspx" />
+    <Content Include="ZHGL\Information\ActionWorkLedgerAdd.aspx" />
     <Content Include="ZHGL\Information\AnalyseHiddenDanger.aspx" />
     <Content Include="ZHGL\Information\AnalyseResource.aspx" />
     <Content Include="ZHGL\Information\AnalyseSafeAccident.aspx" />
@@ -2176,6 +2186,8 @@
     <Content Include="ZHGL\Information\ReportSubmit.aspx" />
     <Content Include="ZHGL\Information\SafetyBriefing.aspx" />
     <Content Include="ZHGL\Information\SafetyBriefingEdit.aspx" />
+    <Content Include="ZHGL\Information\SafetyProductionEvaluation.aspx" />
+    <Content Include="ZHGL\Information\SafetyProductionEvaluationAdd.aspx" />
     <Content Include="ZHGL\Information\SafetyQuarterlyReport.aspx" />
     <Content Include="ZHGL\Information\SafetyQuarterlyReportEdit.aspx" />
     <Content Include="ZHGL\Information\WorkSummaryReport.aspx" />
@@ -2280,8 +2292,6 @@
     <Content Include="HSSE\Doc\鐢ㄦ埛鏉冮檺鎬庝箞璁剧疆.doc" />
     <Content Include="HSSE\Doc\闅愭偅鏁存敼鍗曟搷浣滆鏄�.doc" />
     <Content Include="HJGL\WeldingManage\GetWdldingDailyItem.ashx" />
-    <Content Include="File\Word\Person\~%24缁忕悊宸ヤ綔浠诲姟涔�.doc" />
-    <Content Include="File\Word\Person\~WRL0001.tmp" />
     <Content Include="File\Word\Person\瀹夊叏涓撲笟宸ョ▼甯堝伐浣滀换鍔′功.doc" />
     <Content Include="File\Word\Person\瀹夊叏缁忕悊宸ヤ綔浠诲姟涔�.doc" />
     <Content Include="File\Word\Person\鏂藉伐涓撲笟宸ョ▼甯堝伐浣滀换鍔′功.doc" />
@@ -2338,7 +2348,6 @@
     <Content Include="ReportPrint\ReportTabFile\椤圭洰鐜板満鑱屽伐浼や骸浜嬫晠鍘熷洜鍒嗘瀽鎶�.tab" />
     <Content Include="ReportPrint\ReportTabFile\鑱屼笟鍋ュ悍瀹夊叏鍗遍櫓婧愯鲸璇嗕笌璇勪环.tab" />
     <Content Include="ReportPrint\ReportTabFile\鑱屼笟鍋ュ悍瀹夊叏鍗遍櫓婧愯鲸璇嗕笌璇勪环锛堥噸澶у嵄闄╂簮锛�.tab" />
-    <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Personal\RunLog.aspx" />
     <Content Include="Personal\PersonalSet.aspx" />
     <Content Include="Personal\PersonalInfo.aspx" />
@@ -2394,7 +2403,6 @@
     <Content Include="Controls\My97DatePicker\寮�鍙戝寘\skin\whyGreen\datepicker.css" />
     <Content Include="Controls\My97DatePicker\寮�鍙戝寘\skin\whyGreen\img.gif" />
     <Content Include="Downloads\chinaexcelweb.cab" />
-    <Content Include="ErrLog.txt" />
     <Content Include="favicon.ico" />
     <Content Include="App_Themes\Default\Default.css" />
     <Content Include="aspnet_client\FreeTextBox\FTB-FreeTextBox.js" />
@@ -3056,7 +3064,6 @@
     <None Include="Controls\My97DatePicker\寮�鍙戝寘\skin\whyGreen\vssver.scc" />
     <None Include="Controls\My97DatePicker\寮�鍙戝寘\vssver.scc" />
     <None Include="File\Excel\Person\浜哄憳淇℃伅妯＄増.xls" />
-    <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
     <None Include="ReportPrint\ReportTabFile\鍩硅璁板綍.tab" />
     <None Include="ReportPrint\ReportTabFile\瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤.tab" />
     <None Include="ReportPrint\ReportTabFile\搴旀�ユ紨缁冨伐浣滆鍒掑崐骞存姤.tab" />
@@ -6383,6 +6390,13 @@
     <Compile Include="AttachFile\OnlineEditing.aspx.designer.cs">
       <DependentUpon>OnlineEditing.aspx</DependentUpon>
     </Compile>
+    <Compile Include="AttachFile\OnlineEditingPrivate.aspx.cs">
+      <DependentUpon>OnlineEditingPrivate.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="AttachFile\OnlineEditingPrivate.aspx.designer.cs">
+      <DependentUpon>OnlineEditingPrivate.aspx</DependentUpon>
+    </Compile>
     <Compile Include="AttachFile\player.aspx.cs">
       <DependentUpon>player.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8637,6 +8651,27 @@
     <Compile Include="CQMS\WBS\ControlPoint.aspx.designer.cs">
       <DependentUpon>ControlPoint.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx.cs">
+      <DependentUpon>DivisionDivideAndCrop.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx.designer.cs">
+      <DependentUpon>DivisionDivideAndCrop.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCropDataIn.aspx.cs">
+      <DependentUpon>DivisionDivideAndCropDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCropDataIn.aspx.designer.cs">
+      <DependentUpon>DivisionDivideAndCropDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideList.aspx.cs">
+      <DependentUpon>DivisionDivideList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideList.aspx.designer.cs">
+      <DependentUpon>DivisionDivideList.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\WBS\Control\DivisionSubProjects.aspx.cs">
       <DependentUpon>DivisionSubProjects.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8651,6 +8686,20 @@
     <Compile Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx.designer.cs">
       <DependentUpon>DivisionSubProjectsEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNew.aspx.cs">
+      <DependentUpon>DivisionSubProjectsNew.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNew.aspx.designer.cs">
+      <DependentUpon>DivisionSubProjectsNew.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNewEdit.aspx.cs">
+      <DependentUpon>DivisionSubProjectsNewEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionSubProjectsNewEdit.aspx.designer.cs">
+      <DependentUpon>DivisionSubProjectsNewEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\WBS\Control\PointCropping.aspx.cs">
       <DependentUpon>PointCropping.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -14240,6 +14289,13 @@
     <Compile Include="JDGL\CostAnalysis\RectificationMeasureSet.aspx.designer.cs">
       <DependentUpon>RectificationMeasureSet.aspx</DependentUpon>
     </Compile>
+    <Compile Include="JDGL\Progress\WbsManager.aspx.cs">
+      <DependentUpon>WbsManager.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="JDGL\Progress\WbsManager.aspx.designer.cs">
+      <DependentUpon>WbsManager.aspx</DependentUpon>
+    </Compile>
     <Compile Include="JDGL\WBSCompleteAndReal\WBSCompleteAudit.aspx.cs">
       <DependentUpon>WBSCompleteAudit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15304,6 +15360,13 @@
     <Compile Include="ProjectData\ProjectUser.aspx.designer.cs">
       <DependentUpon>ProjectUser.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ProjectData\ProjectUserContact.aspx.cs">
+      <DependentUpon>ProjectUserContact.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ProjectData\ProjectUserContact.aspx.designer.cs">
+      <DependentUpon>ProjectUserContact.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ProjectData\ProjectUserSave.aspx.cs">
       <DependentUpon>ProjectUserSave.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -18552,6 +18615,20 @@
     <Compile Include="ZHGL\Information\AccidentCauseReportSave.aspx.designer.cs">
       <DependentUpon>AccidentCauseReportSave.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedger.aspx.cs">
+      <DependentUpon>ActionWorkLedger.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedger.aspx.designer.cs">
+      <DependentUpon>ActionWorkLedger.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedgerAdd.aspx.cs">
+      <DependentUpon>ActionWorkLedgerAdd.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\ActionWorkLedgerAdd.aspx.designer.cs">
+      <DependentUpon>ActionWorkLedgerAdd.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ZHGL\Information\AnalyseHiddenDanger.aspx.cs">
       <DependentUpon>AnalyseHiddenDanger.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -18692,6 +18769,20 @@
     <Compile Include="ZHGL\Information\SafetyBriefingEdit.aspx.designer.cs">
       <DependentUpon>SafetyBriefingEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluation.aspx.cs">
+      <DependentUpon>SafetyProductionEvaluation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluation.aspx.designer.cs">
+      <DependentUpon>SafetyProductionEvaluation.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluationAdd.aspx.cs">
+      <DependentUpon>SafetyProductionEvaluationAdd.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ZHGL\Information\SafetyProductionEvaluationAdd.aspx.designer.cs">
+      <DependentUpon>SafetyProductionEvaluationAdd.aspx</DependentUpon>
+    </Compile>
     <Compile Include="ZHGL\Information\SafetyQuarterlyReport.aspx.cs">
       <DependentUpon>SafetyQuarterlyReport.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -19169,9 +19260,6 @@
       <DependentUpon>TestRunPerformanceStandardEdit.aspx</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="App_Themes\Web.config" />
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Themes\Default\Images\" />
     <Folder Include="FileUpload\" />
@@ -19179,6 +19267,7 @@
     <Folder Include="Images\charts_1\" />
     <Folder Include="Images\charts_2\" />
     <Folder Include="Images\charts_3\" />
+    <Folder Include="Properties\PublishProfiles\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BLL\BLL.csproj">
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
deleted file mode 100644
index 63722353..00000000
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ /dev/null
@@ -1,39 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
-    <UseIISExpress>true</UseIISExpress>
-    <Use64BitIISExpress>false</Use64BitIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile />
-    <ProjectView>ShowAllFiles</ProjectView>
-    <NameOfLastUsedPublishProfile>D:\鏁版嵁\璇哄繀杈綷浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <StartPageUrl>Login.aspx</StartPageUrl>
-          <StartAction>SpecificPage</StartAction>
-          <AspNetDebugging>True</AspNetDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <NativeDebugging>False</NativeDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <ExternalProgram>
-          </ExternalProgram>
-          <StartExternalURL>
-          </StartExternalURL>
-          <StartCmdLineArguments>
-          </StartCmdLineArguments>
-          <StartWorkingDirectory>
-          </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
-          <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
index 36337fc5..8685edd5 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx
@@ -118,7 +118,7 @@
                             </tr>
                             <tr>
                                 <td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold">
-                                    <asp:Label ID="lblTital" runat="server" Text="椤� 鐩� 瀹� 鍏� 鏈� 鎶�"></asp:Label>
+                                    <asp:Label ID="lblTital" runat="server" Text="椤� 鐩� H S E 鏈� 鎶�"></asp:Label>
                                 </td>
                             </tr>
                         </table>
@@ -517,31 +517,31 @@
                             <f:Panel ID="Panel11" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
                                 <Items>
                                     <f:NumberBox ID="nbFireWorkCount" Label="鍔ㄧ伀浣滀笟璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbBreakGroundCount" Label="鍔ㄥ湡浣滀笟璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbLimitedSpaceCount" Label="鍙楅檺绌洪棿浣滀笟璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbElectricityCount" Label="涓存椂鐢ㄧ數浣滀笟璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
                                 </Items>
                             </f:Panel>
                             <f:Panel ID="Panel12" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
                                 <Items>
                                     <f:NumberBox ID="nbHeightWorkCount" Label="楂樺浣滀笟璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbRadialWork" Label="灏勭嚎浣滀笟璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbLiftingWorkCount" Label="鍚婅浣滀笟璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
 
                                     <f:NumberBox ID="nbNightWork" Label="澶滈棿鏂藉伐璁稿彲鏁伴噺" LabelAlign="Right" LabelWidth="170px" Width="300px"
-                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" />
+                                        NoDecimal="true" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="Zy_TextChanged"/>
                                 </Items>
                             </f:Panel>
                             <f:Panel ID="Panel13" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
@@ -798,6 +798,7 @@
                             <f:Grid ID="gvFiveExpenseC" ShowBorder="true" ShowHeader="false" Title="鏈湀椤圭洰HSE璐圭敤鎶曞叆缁熻" runat="server"
                                 AllowCellEditing="true" ClicksToEdit="1" DataIDField="FiveExpenseId" DataKeyNames="FiveExpenseId"
                                 EnableMultiSelect="false" ShowGridHeader="true" MinHeight="380px" EnableColumnLines="true" EnableSummary="true" SummaryPosition="Flow">
+
                                 <Columns>
                                     <f:RowNumberField EnablePagingNumber="true" HeaderText="搴忓彿" Width="50px" HeaderTextAlign="Center"
                                         TextAlign="Center" />
@@ -817,6 +818,10 @@
                                                     </f:NumberBox>
                                                 </Editor>
                                             </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="PlanCostMonth1" DataField="PlanCostMonth" FieldType="String"
+                                                HeaderText="鏈湀鍘熷鏁版嵁" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
+                                            </f:RenderField>
+
                                             <f:RenderField Width="150px" ColumnID="PlanCostYear" DataField="PlanCostYear" FieldType="String"
                                                 HeaderText="椤圭洰绱" HeaderTextAlign="Center" TextAlign="Left">
                                                 <Editor>
@@ -835,6 +840,11 @@
                                                     </f:NumberBox>
                                                 </Editor>
                                             </f:RenderField>
+
+                                             <f:RenderField Width="150px" ColumnID="ActualCostMonth1" DataField="ActualCostMonth" FieldType="String"
+                                                HeaderText="鏈湀鍘熷鏁版嵁" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
+                                            </f:RenderField>
+
                                             <f:RenderField Width="150px" ColumnID="ActualCostYear" DataField="ActualCostYear" FieldType="String"
                                                 HeaderText="椤圭洰绱" HeaderTextAlign="Center" TextAlign="Left">
                                                 <Editor>
@@ -843,8 +853,12 @@
                                                 </Editor>
                                             </f:RenderField>
                                         </Columns>
+                                      
                                     </f:GroupField>
                                 </Columns>
+                                   <Listeners>
+                                            <f:Listener Event="afteredit" Handler="ongvFiveExpenseC" />
+                                        </Listeners>
                             </f:Grid>
                         </Items>
                     </f:Panel>
@@ -1464,4 +1478,33 @@
             me.updateCellValue(rowId, 'TotalCheckNum', parseInt(totalCheckNum) + (parseInt(yearCheckNum) - parseInt(yearCheckNum1)));
         }
     }
+
+    //5.1 淇敼鏈湀璐圭敤 鏇存敼绱璐圭敤
+    function ongvFiveExpenseC(event, value, params) {
+        var me = this, columnId = params.columnId, rowId = params.rowId;
+       
+        //淇敼鏈湀浜旂幆鏁帮紝绱鍊煎彉鍖�
+        if (columnId === 'PlanCostMonth') {
+            //鍘熷鏈湀
+            var planCostMonth1 = me.getCellValue(rowId, 'PlanCostMonth1');
+            //鏈湀
+            var planCostMonth = me.getCellValue(rowId, 'PlanCostMonth');
+
+            //骞村害
+            var planCostYear = me.getCellValue(rowId, 'PlanCostYear');
+
+            me.updateCellValue(rowId, 'PlanCostMonth1', planCostMonth);
+            me.updateCellValue(rowId, 'PlanCostYear', Number(planCostYear) - Number(planCostMonth1) + Number(planCostMonth));
+        } else if (columnId === 'ActualCostMonth') {
+            //鍘熷鏈湀
+            var actualCostMonth1 = me.getCellValue(rowId, 'ActualCostMonth1');
+            //鏈湀
+            var actualCostMonth = me.getCellValue(rowId, 'ActualCostMonth');
+            //骞村害
+            var actualCostYear = me.getCellValue(rowId, 'ActualCostYear');
+           
+            me.updateCellValue(rowId, 'ActualCostMonth1', actualCostMonth);
+            me.updateCellValue(rowId, 'ActualCostYear', Number(actualCostYear) - Number(actualCostMonth1) + Number(actualCostMonth));
+        }
+    }
 </script>
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
index 07217b0f..a5db550f 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCEdit.aspx.cs
@@ -198,6 +198,15 @@ namespace FineUIPro.Web.HSSE.Manager
                         {
                             this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", model.EndDate);
                         }
+
+                        startTime = Convert.ToDateTime(txtStartDate.Text);
+                        endTime = Convert.ToDateTime(txtEndDate.Text);
+
+                        yearStartTime = Convert.ToDateTime(startTime.ToString("yyyy-01-01"));
+                        if (project.StartDate != null)
+                        {
+                            projectStartTime = Convert.ToDateTime(project.StartDate);
+                        }
                     }
                     AddOrUpdate = "update";
 
@@ -361,6 +370,8 @@ namespace FineUIPro.Web.HSSE.Manager
                     #endregion
 
                     #region 6.1鏈亗浜嬩欢缁熻
+                    try
+                    {
                     var attemptedModel = db.Manager_Attempted.FirstOrDefault(x => x.MonthReportId == MonthReportId);
                     if (attemptedModel != null)
                     {
@@ -370,15 +381,29 @@ namespace FineUIPro.Web.HSSE.Manager
                         nbFbsYearNum.Text = attemptedModel.FbsYearNum.ToString();
                         nbProNum.Text = attemptedModel.ProNum.ToString();
                     }
-                    #endregion
+                    else {
+                        GetAttempted();
+                    }
+                        #endregion
 
-                    #region 6.1 2 鏈湀浼ゅ浜嬫晠缁熻
-                    injuryAccidents = BLL.InjuryAccidentCService.GetInjuryAccidentCByMonthReportId(this.MonthReportId);
-                    if (injuryAccidents.Count > 0)
+                        #region 6.1 2 鏈湀浼ゅ浜嬫晠缁熻
+                        injuryAccidents = BLL.InjuryAccidentCService.GetInjuryAccidentCByMonthReportId(this.MonthReportId);
+                        if (injuryAccidents.Count > 0)
+                        {
+                            this.gvInjuryAccident.DataSource = injuryAccidents;
+                            this.gvInjuryAccident.DataBind();
+                            OutputSummaryData();
+                        }
+                        else {
+                            GetInjuryAccident();
+                            //GetAccidentReportsByAccidentTime
+                        }
+                      
+                    }
+                    catch (Exception)
                     {
-                        this.gvInjuryAccident.DataSource = injuryAccidents;
-                        this.gvInjuryAccident.DataBind();
-                        OutputSummaryData();
+
+                        throw;
                     }
                     #endregion
 
@@ -1762,6 +1787,11 @@ namespace FineUIPro.Web.HSSE.Manager
         }
 
         #region 2 浜哄姏鎶曞叆鎯呭喌
+        public class spckDtp {
+            public string IdentityCard { get; set; }
+            public string UnitId { get; set; }
+        }
+
         /// <summary>
         /// 鏄剧ず鏈堟姤鍛婁汉鍛樻姇鍏ユ儏鍐�
         /// </summary>
@@ -1775,8 +1805,13 @@ namespace FineUIPro.Web.HSSE.Manager
             int totalSumPersonNum = 0;//鎬婚儴
             int totalSumOutPersonNum = 0;//澶栬仒
             int totalHSEPersonNum = 0;
+            var unitlist = db.SitePerson_Person.Where(x => x.ProjectId == ProjectId);
             var spckList = db.SitePerson_Checking.Where(x => x.IntoOutTime >= startTime
-                      && x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1");
+                      && x.IntoOutTime <= endTime && x.ProjectId == ProjectId && x.IntoOut == "1").Select(x=>new spckDtp{
+                         IdentityCard=x.IdentityCard,
+                         UnitId= unitlist.FirstOrDefault(y=>y.IdentityCard==x.IdentityCard).UnitId
+                      });
+            
             if (units.Count() > 0)
             {
                 foreach (Model.Project_ProjectUnit u in units)
@@ -1790,12 +1825,11 @@ namespace FineUIPro.Web.HSSE.Manager
                     };
                     //鏈儴鏈湀浜烘暟锛屾湰骞磋�冨嫟浜烘暟闄ゅ綋鍓嶆湀浠斤紝鍙栧钩鍧囨暟
                     //骞村害
-                    var yearList = spckList.Where(x =>  x.UnitId == u.UnitId).ToList().Select(x => new hseDayItem()
+                    var yearList = spckList.Where(x =>  x.UnitId == u.UnitId).Select(x => new hseDayItem()
                       {
                           IdentityCard = x.IdentityCard,
-                          IntoOutTime = getShortTime(x.IntoOutTime)
-                      }).GroupBy(x => new { x.IdentityCard})
-                      .ToList();
+                          //IntoOutTime = getShortTime(x.IntoOutTime)
+                      }).GroupBy(x => new { x.IdentityCard});
 
                     personSort.SumPersonNum = yearList.Count();
 
@@ -1985,6 +2019,12 @@ namespace FineUIPro.Web.HSSE.Manager
         #endregion
 
         #region HSE鍩硅
+        public class Bosheng {
+            public string TrainType { get; set; }
+
+            public decimal TrainPeriod { get; set; }
+        }
+
         /// <summary>
         /// 鏄剧ず鏈堟姤鍛奌SE鍩硅鎯呭喌
         /// </summary>
@@ -2009,7 +2049,8 @@ namespace FineUIPro.Web.HSSE.Manager
                 trainSort.TrainType = item.TrainTypeName;
                 if (listTrain.Count > 0)
                 {
-                    trainSort.TeachHour = listTrain.Where(x => x.TrainTypeId == item.TrainTypeId).Sum(x => x.TeachHour);
+                    trainSort.TeachHour = 0;
+                    //trainSort.TeachHour = listTrain.Where(x => x.TrainTypeId == item.TrainTypeId).Sum(x => x.TeachHour);
                     trainSort.PersonNum = listTrain.Where(x => x.TrainTypeId == item.TrainTypeId).Sum(x => x.TrainPersonNum);
                 }
                 else
@@ -2026,7 +2067,21 @@ namespace FineUIPro.Web.HSSE.Manager
                         trainSort.PersonNum += listBosheng.Where(x => x.TrainType.Contains("鍏ュ満")).Sum(x=>x.PersonCount);
                         Func<string, decimal, decimal> funDelegate = CustomCount;
                         decimal numSum = 0;
-                        trainSort.TeachHour += listBosheng.Where(x => x.TrainType.Contains("鍏ュ満")).Sum(x => funDelegate(x.TrainPeriod, numSum));
+                        var listB = listBosheng.Where(x => x.TrainType.Contains("鍏ュ満")).Select(x => new Bosheng
+                        {
+                            TrainType = x.TrainType,
+                            TrainPeriod = Convert.ToDecimal(x.TrainPeriod)
+                        });
+                        var model = listB.Where(x => x.TrainType.Contains("鍏ュ満")).OrderByDescending(x => x.TrainPeriod).FirstOrDefault();
+                        if (model != null)
+                        {
+                            trainSort.TeachHour += model.TrainPeriod;
+                        }
+                        else {
+                            trainSort.TeachHour = 0;
+                        }
+
+                       
                     }
                     else if (item.TrainTypeId == "c1a513bb-a547-45b0-944d-b0dd88f06f82")
                     {
@@ -2034,14 +2089,41 @@ namespace FineUIPro.Web.HSSE.Manager
                         trainSort.PersonNum += listBosheng.Where(x => x.TrainType.Contains("鍏朵粬")).Sum(x => x.PersonCount);
                         Func<string, decimal, decimal> funDelegate = CustomCount;
                         decimal numSum = 0;
-                        trainSort.TeachHour += listBosheng.Where(x => x.TrainType.Contains("鍏朵粬")).Sum(x => funDelegate(x.TrainPeriod, numSum));
+                        var listB = listBosheng.Where(x => x.TrainType.Contains("鍏朵粬")).Select(x => new Bosheng {
+                            TrainType = x.TrainType,
+                            TrainPeriod = Convert.ToDecimal(x.TrainPeriod)
+                        });
+
+                        var model = listB.Where(x => x.TrainType.Contains("鍏朵粬")).OrderByDescending(x => x.TrainPeriod).FirstOrDefault();
+                        if (model != null)
+                        {
+                            trainSort.TeachHour += model.TrainPeriod;
+                        }
+                        else
+                        {
+                            trainSort.TeachHour = 0;
+                        }
                     }
                     else {
                         //涓撻」
                         trainSort.PersonNum += listBosheng.Where(x => x.TrainType.Contains("涓撻」")).Sum(x => x.PersonCount);
-                        Func<string, decimal, decimal> funDelegate = CustomCount;
-                        decimal numSum = 0;
-                        trainSort.TeachHour += listBosheng.Where(x => x.TrainType.Contains("涓撻」")).Sum(x => funDelegate(x.TrainPeriod, numSum));
+                        var listB = listBosheng.Where(x => x.TrainType.Contains("涓撻」")).Select(x => new Bosheng
+                        {
+                            TrainType = x.TrainType,
+                            TrainPeriod = Convert.ToDecimal(x.TrainPeriod)
+                        });
+                        var model = listB.Where(x => x.TrainType.Contains("涓撻」")).OrderByDescending(x => x.TrainPeriod).FirstOrDefault();
+                        if (model != null)
+                        {
+                            trainSort.TeachHour += model.TrainPeriod;
+                        }
+                        else
+                        {
+                            trainSort.TeachHour = 0;
+                        }
+                        //Func<string, decimal, decimal> funDelegate = CustomCount;
+                        //decimal numSum = 0;
+                        //trainSort.TeachHour += listBosheng.Where(x => x.TrainType.Contains("涓撻」")).Max(x => funDelegate(x.TrainPeriod, numSum));
                     }
                 }
 
@@ -3226,6 +3308,34 @@ namespace FineUIPro.Web.HSSE.Manager
         }
         #endregion
 
+        /// <summary>
+        /// 4.4淇敼鏁伴噺鑷姩淇敼鏈湀鍜岀疮璁�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Zy_TextChanged(object sender, EventArgs e) {
+            if (!string.IsNullOrEmpty(nbFireWorkCount.Text)&&!string.IsNullOrEmpty(nbBreakGroundCount.Text)&&
+                !string.IsNullOrEmpty(nbLimitedSpaceCount.Text) && !string.IsNullOrEmpty(nbElectricityCount.Text) &&
+                !string.IsNullOrEmpty(nbHeightWorkCount.Text) && !string.IsNullOrEmpty(nbRadialWork.Text) &&
+                !string.IsNullOrEmpty(nbLiftingWorkCount.Text) && !string.IsNullOrEmpty(nbNightWork.Text) )
+            {
 
+            
+            var number1 = Convert.ToInt32(nbFireWorkCount.Text);
+            var number2 = Convert.ToInt32(nbBreakGroundCount.Text);
+            var number3 = Convert.ToInt32(nbLimitedSpaceCount.Text);
+            var number4 = Convert.ToInt32(nbElectricityCount.Text);
+            var number5 = Convert.ToInt32(nbHeightWorkCount.Text);
+            var number6 = Convert.ToInt32(nbRadialWork.Text);
+            var number7 = Convert.ToInt32(nbLiftingWorkCount.Text);
+            var number8 = Convert.ToInt32(nbNightWork.Text);
+
+            //浣滀笟绱
+            nbProCount.Text = (Convert.ToInt32(nbProCount.Text) - Convert.ToInt32(nbMonthCount.Text)
+                + number1 + number2 + number3 + number4 + number5 + number6 + number7 + number8).ToString();
+            nbYearCount.Text= (Convert.ToInt32(nbYearCount.Text) - Convert.ToInt32(nbMonthCount.Text)
+                + number1 + number2 + number3 + number4 + number5 + number6 + number7 + number8).ToString();
+            nbMonthCount.Text = ( number1 + number2 + number3 + number4 + number5 + number6 + number7 + number8).ToString();
+        }}
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
index 75e3ba0e..a11ae058 100644
--- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonthCNew.aspx.cs
@@ -537,7 +537,7 @@ namespace FineUIPro.Web.HSSE.Manager
                 var urlHz = startDate.ToString("yyyyMMdd") + "-"
                     + endDate.ToString("yyyyMMdd");
 
-                newUrl = uploadfilepath.Replace("椤圭洰瀹夊叏鏈堟姤", pModel.ShortName + "椤圭洰瀹夊叏鏈堟姤锛�" + model.MonthReportCode + "锛�" + urlHz);
+                newUrl = uploadfilepath.Replace("椤圭洰瀹夊叏鏈堟姤", pModel.ShortName + "椤圭洰HSE鏈堟姤锛�" + model.MonthReportCode + "锛�" + urlHz);
 
                 if (File.Exists(newUrl))
                 {
diff --git a/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx b/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx
new file mode 100644
index 00000000..70385dc8
--- /dev/null
+++ b/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx
@@ -0,0 +1,223 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WbsManager.aspx.cs" Inherits="FineUIPro.Web.JDGL.Progress.WbsManager" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>璐圭敤椤硅鍓�</title>
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+
+        .row-grid-disabled .f-grid-cell-inner {
+            opacity: .5;
+            filter: alpha(opacity=50);
+        }
+
+        .f-grid-row.orange, .f-grid-row.orange .ui-icon, .f-grid-row.orange a {
+            background-color: Orange;
+            color: #fff;
+        }
+
+        .f-grid-row.red, .f-grid-row.red .ui-icon, .f-grid-row.red a {
+            background-color: Red;
+            color: #fff;
+        }
+
+        .customlabel span {
+            color: red;
+            font-weight: bold;
+        }
+
+        .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+      <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+    < <f:Panel ID="Panel1" CssClass="blockpanel" Margin="20px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" RegionSplitWidth="3px" EnableCollapse="true"
+                    Width="300px" Title="璐圭敤椤硅鍓缃�" ShowBorder="true" ShowHeader="true" BodyPadding="10px" Layout="Fit">
+                    <Items>
+                        <f:Tree ID="trWBS" Width="290" EnableCollapse="true" ShowHeader="true" OnNodeCommand="trWBS_NodeCommand"
+                            OnNodeExpand="trWBS_NodeExpand"
+                            AutoLeafIdentification="true" runat="server">
+                            <Listeners>
+                                <f:Listener Event="beforenodecontextmenu" Handler="onTreeNodeContextMenu" />
+                            </Listeners>
+                        </f:Tree>
+                        <f:HiddenField runat="server" ID="hdSelectId">
+                        </f:HiddenField>
+                        <f:HiddenField runat="server" ID="hdType">
+                        </f:HiddenField>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="涓棿闈㈡澘" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Items>
+                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true" ForceFit="true"
+                            runat="server" BoxFlex="1" DataKeyNames="CostControlId" AllowSorting="true" EnableColumnLines="true" EnableCheckBoxSelect="true"
+                            SortField="CostControlCode,CostControlName" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" ShowSelectedCell="true"
+                            DataIDField="CostControlId" AllowPaging="true" IsDatabasePaging="true" PageSize="100" OnPageIndexChange="Grid1_PageIndexChange"
+                            OnRowDataBound="Grid1_RowDataBound" AllowFilters="true" OnFilterChange="Grid1_FilterChange">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:Button ID="btnAdd" Icon="Add" runat="server" ToolTip="澧炲姞" Hidden="true"
+                                            OnClick="btnAdd_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="淇濆瓨" Hidden="true" OnClick="btnSave_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RenderField Width="100px" ColumnID="CostControlCode" DataField="CostControlCode" FieldType="String"
+                                    HeaderText="璐圭敤娓呭崟缂栧彿" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="400px" ColumnID="CostControlName" DataField="CostControlName" FieldType="String"
+                                    HeaderText="鍐呭" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="EquipmentMaterialTypeName" DataField="EquipmentMaterialTypeName" FieldType="String"
+                                    HeaderText="璁惧鏉愭枡鍒嗙被" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="70px" ColumnID="Unit" DataField="Unit" FieldType="String"
+                                    HeaderText="鍗曚綅" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <%--<f:RenderField Width="130px" ColumnID="TotalNum" DataField="TotalNum" FieldType="Double"
+                                    HeaderText="鍚堝悓宸ヤ綔閲�" HeaderTextAlign="Center" TextAlign="Left">
+                                    <Editor>
+                                        <f:NumberBox ID="nbTotalNum" NoDecimal="false" NoNegative="true" MinValue="0"
+                                            runat="server">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="RealPrice" DataField="RealPrice" FieldType="Double"
+                                    HeaderText="瀹為檯鍗曚环" HeaderTextAlign="Center" TextAlign="Left">
+                                    <Editor>
+                                        <f:NumberBox ID="nbRealPrice" NoDecimal="false" NoNegative="true" MinValue="0"
+                                            runat="server">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="100px" ColumnID="PlanPrice" DataField="PlanPrice" FieldType="Double"
+                                    HeaderText="棰勭畻鍗曚环" HeaderTextAlign="Center" TextAlign="Left">
+                                    <Editor>
+                                        <f:NumberBox ID="nbPlanPrice" NoDecimal="false" NoNegative="true" MinValue="0"
+                                            runat="server">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>--%>
+                                <f:RenderField Width="70px" ColumnID="CostControlId" DataField="CostControlId" FieldType="String"
+                                    HeaderText="涓婚敭" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>
+                            <PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="100" Value="100" />
+                                    <f:ListItem Text="200" Value="200" />
+                                    <f:ListItem Text="300" Value="300" />
+                                    <f:ListItem Text="400" Value="400" />
+                                </f:DropDownList>
+                            </PageItems>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="缂栬緫" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="800px" Height="350px">
+        </f:Window>
+        <f:Window ID="Window2" Title="鎷疯礉" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="true" runat="server" OnClose="Window2_Close" IsModal="true"
+            Width="800px" Height="450px">
+        </f:Window>
+        <f:Window ID="Window3" Title="缂栬緫" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="true" runat="server" IsModal="true" Width="800px" OnClose="Window3_Close"
+            Height="350px">
+        </f:Window>
+        <f:Window ID="Window4" Title="璁剧疆璁″垝" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="true" runat="server" IsModal="true" Width="800px"
+            Height="550px">
+        </f:Window>
+        
+        <f:Menu ID="Menu2" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Hidden="true" Text="淇敼" Icon="Pencil"
+                    OnClick="btnMenuModify_Click">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="鍒犻櫎" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
+                    OnClick="btnMenuDel_Click">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var treeID = '<%= trWBS.ClientID %>';
+       
+        var menuID2 = '<%= Menu2.ClientID %>';
+        var btn = '<%= btnSave.ClientID %>';
+        // 杩斿洖false锛屾潵闃绘娴忚鍣ㄥ彸閿彍鍗�
+        function onRowContextMenu(event, rowId) {
+            F(menuID2).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        // 淇濆瓨褰撳墠鑿滃崟瀵瑰簲鐨勬爲鑺傜偣ID
+        var currentNodeId;
+
+        // 杩斿洖false锛屾潵闃绘娴忚鍣ㄥ彸閿彍鍗�
+        function onTreeNodeContextMenu(event, nodeId) {
+            currentNodeId = nodeId;
+            F(menuID).show();
+            return false;
+        }
+
+        function show() {
+            F(btn).click();
+        }
+
+        // 璁剧疆鎵�鏈夎彍鍗曢」鐨勭鐢ㄧ姸鎬�
+        function setMenuItemsDisabled(disabled) {
+            var menu = F(menuID);
+            $.each(menu.items, function (index, item) {
+                item.setDisabled(disabled);
+            });
+        }
+
+        // 鏄剧ず鑿滃崟鍚庯紝妫�鏌ユ槸鍚︾鐢ㄨ彍鍗曢」
+        function onMenuShow() {
+            if (currentNodeId) {
+                var tree = F(treeID);
+                var nodeData = tree.getNodeData(currentNodeId);
+                if (nodeData.leaf) {
+                    setMenuItemsDisabled(true);
+                } else {
+                    setMenuItemsDisabled(false);
+                }
+            }
+        }
+
+        function updateDate() {
+            // 鍥炲彂鍒板悗鍙版洿鏂�
+            __doPostBack('', 'UPDATE_Date');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx.cs
new file mode 100644
index 00000000..36d2b9fb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx.cs
@@ -0,0 +1,277 @@
+锘縰sing BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.JDGL.Progress
+{
+    public partial class WbsManager : PageBase
+    {
+        #region 椤甸潰鍔犺浇
+        /// <summary>
+        /// 椤甸潰鍔犺浇
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                InitTreeMenu();
+            }
+        }
+
+        private void InitTreeMenu() { 
+            
+        }
+        #endregion
+
+        #region 鏍戣妭鐐瑰睍寮�
+        /// <summary>
+        /// 鏍戣妭鐐瑰睍寮�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trWBS_NodeExpand(object sender, TreeNodeEventArgs e) { 
+            
+        }
+        #endregion
+
+        #region   Tree鐐瑰嚮浜嬩欢
+        /// <summary>
+        /// Tree鐐瑰嚮浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trWBS_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            
+        }
+        #endregion
+
+        #region  鍏抽棴绐楀彛
+        /// <summary>
+        /// 鍏抽棴绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            ShowNotify("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
+          
+            //getWBSSet();
+        }
+
+        /// <summary>
+        /// 鍏抽棴绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window2_Close(object sender, WindowCloseEventArgs e)
+        {
+            ShowNotify("鎷疯礉鎴愬姛锛�", MessageBoxIcon.Success);
+           
+        }
+
+        /// <summary>
+        /// 鍏抽棴绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window3_Close(object sender, WindowCloseEventArgs e)
+        {
+            ShowNotify("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
+
+           
+        }
+        #endregion
+
+        #region 淇濆瓨浜嬩欢
+        /// <summary>
+        /// 淇濆瓨
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (Grid1.Rows.Count > 0)
+            {
+                JArray mergedData = Grid1.GetMergedData();
+
+                bool isPass = true;
+                if (isPass)
+                {
+                    foreach (var item in this.Grid1.SelectedRowIDArray)
+                    {
+                        Model.WBS_CostControl costControl = BLL.CostControlService.GetCostControlByCostControlId(item);
+
+                    }
+
+                    foreach (JObject mergedRow in mergedData)
+                    {
+                        JObject values = mergedRow.Value<JObject>("values");
+                        string costControlId = values.Value<string>("CostControlId");
+                        //string totalNum = values.Value<string>("TotalNum");
+                        //string realPrice = values.Value<string>("RealPrice");
+                        //string planPrice = values.Value<string>("PlanPrice");
+                        Model.WBS_CostControl costControl = BLL.CostControlService.GetCostControlByCostControlId(costControlId);
+                        if (this.Grid1.SelectedRowIDArray.Contains(costControlId))
+                        {
+                            costControl.IsSelected = true;
+                        }
+                        else
+                        {
+                            costControl.IsSelected = false;
+                        }
+                        BLL.CostControlService.UpdateCostControl(costControl);
+                    }
+                }
+                BindGrid();
+            }
+            Alert.ShowInTop("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
+        }
+        #endregion
+
+        #region 缁戝畾鏁版嵁
+
+        private string upStartDate = string.Empty;
+        private string upEndDate = string.Empty;
+        protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
+        {
+            string id = e.RowID;
+        }
+
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// Grid1鎺掑簭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 鍒嗛〉涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+
+        /// <summary>
+        /// 鍔犺浇Grid
+        /// </summary>
+        private void BindGrid()
+        {
+            
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.WBSSetAuditMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    
+                    this.btnAdd.Hidden = false;
+                    //this.btnMenuDetail.Hidden = false;
+                    //this.btnMenuWeekDetail.Hidden = false;
+                    //this.btnMenuCopy2.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuModify.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
+                //if (buttonList.Contains(BLL.Const.BtnAuditing))
+                //{
+                //    this.btnMenuAudit.Hidden = false;
+                //}
+            }
+        }
+        #endregion
+
+        #region 澧炲姞璐圭敤椤�
+        /// <summary>
+        /// 澧炲姞璐规帶椤�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAdd_Click(object sender, EventArgs e) {
+            if (!string.IsNullOrEmpty(trWBS.SelectedNodeID))
+            {
+                this.hdSelectId.Text = this.trWBS.SelectedNodeID;
+                Model.Wbs_WbsSet wbsSet = BLL.WbsSetService.GetWbsSetByWbsSetId(this.trWBS.SelectedNodeID);
+                if (wbsSet != null)
+                {
+                    var list = BLL.WbsSetService.GetWbsSetsBySuperWbsSetId(this.trWBS.SelectedNodeID);
+                    if (list.Count == 0)
+                    {
+                        string openUrl = String.Format("CostControlEdit.aspx?operating=add&Id={0}", trWBS.SelectedNodeID, "澧炲姞 - ");
+                        PageContext.RegisterStartupScript(Window3.GetShowReference(openUrl));
+                    }
+                    else
+                    {
+                        ShowNotify("璇烽�夋嫨宸ヤ綔椤硅妭鐐硅繘琛屽鍔狅紒", MessageBoxIcon.Warning);
+                    }
+                }
+                else
+                {
+                    ShowNotify("璇烽�夋嫨宸ヤ綔椤硅妭鐐硅繘琛屽鍔狅紒", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("璇烽�夋嫨鏍戣妭鐐癸紒", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx.designer.cs b/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx.designer.cs
new file mode 100644
index 00000000..b27caf94
--- /dev/null
+++ b/SGGL/FineUIPro.Web/JDGL/Progress/WbsManager.aspx.designer.cs
@@ -0,0 +1,215 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.JDGL.Progress
+{
+
+
+    public partial class WbsManager
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// panelLeftRegion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+
+        /// <summary>
+        /// trWBS 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Tree trWBS;
+
+        /// <summary>
+        /// hdSelectId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdSelectId;
+
+        /// <summary>
+        /// hdType 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdType;
+
+        /// <summary>
+        /// panelCenterRegion 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// btnAdd 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAdd;
+
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// ToolbarSeparator1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
+        /// <summary>
+        /// Window3 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+
+        /// <summary>
+        /// Window4 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
+
+        /// <summary>
+        /// Menu2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu2;
+
+        /// <summary>
+        /// btnMenuModify 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
+        /// <summary>
+        /// btnMenuDel 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
index c10017ff..96f63939 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx
@@ -103,18 +103,16 @@
                         </f:RenderField>
                         
                         <f:RenderField Width="150px" ColumnID="User_ReceiveID" DataField="User_ReceiveID" SortField="User_ReceiveID"
-                            FieldType="String" HeaderText="鎺ュ彈浜�" HeaderTextAlign="Center" TextAlign="Left" >
+                            FieldType="String" HeaderText="璺熻釜浜�" HeaderTextAlign="Center" TextAlign="Left" >
                         </f:RenderField>
                            
                           <f:RenderField Width="150px" ColumnID="User_Acceptance" DataField="User_Acceptance" 
-                            FieldType="String" HeaderText="楠屾敹浜�" HeaderTextAlign="Center" TextAlign="Left">
+                            FieldType="String" HeaderText="璐ｄ换浜�" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
                          <f:RenderField Width="150px" ColumnID="username" DataField="username" 
                             FieldType="String" HeaderText="鎻愬嚭浜�" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                            <f:RenderField Width="150px" ColumnID="AttachUrl" DataField="AttachUrl" 
-                            FieldType="String" HeaderText="闄勪欢" HeaderTextAlign="Center" TextAlign="Left">
-                        </f:RenderField>
+                         
 <%--                        <f:TemplateField ColumnID="Certificate" Width="250px" HeaderText="鑱屼笟璧勬牸璇佷功" HeaderTextAlign="Center" TextAlign="Left">
                                     <ItemTemplate>
                                         <asp:Label ID="Label2" runat="server" Text='<%# ConvertCertificateName(Eval("UserId")) %>'></asp:Label>
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs
index f9435c0a..3d2b7a8b 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXList.aspx.cs
@@ -12,6 +12,21 @@ namespace FineUIPro.Web.PZHGL.GJSX
 {
     public partial class GJSXList : PageBase
     {
+        /// <summary>
+        /// 绫诲瀷
+        /// </summary>
+        public string classify
+        {
+            get
+            {
+                return (string)ViewState["classify"];
+            }
+            set
+            {
+                ViewState["classify"] = value;
+            }
+        }
+
         /// <summary>
         /// 鍔犺浇椤甸潰
         /// </summary>
@@ -21,9 +36,14 @@ namespace FineUIPro.Web.PZHGL.GJSX
         {
             if (!IsPostBack)
             {
+                classify = Request.Params["classify"];
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ////鏉冮檺鎸夐挳鏂规硶
                 this.GetButtonPower();
+                if (classify != "0")
+                {
+                    btnNew.Hidden = true;
+                }
                 this.btnNew.OnClientClick = Window1.GetShowReference("GJSXListEdit.aspx?EditType=add") + "return false;";
                 if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
                 {
@@ -42,7 +62,33 @@ namespace FineUIPro.Web.PZHGL.GJSX
         private void BindGrid()
         {
 
-            string strSql = "";
+            string strSql = @"select  
+                            a.GJSXID
+		                    ,a.ProjectId
+		                    ,a.detail
+                            ,a.Userid				
+		                    ,b.username
+		                    ,a.createDate
+		                    ,User_ReceiveID = STUFF((SELECT ',' + p2.UserName  FROM dbo.Sys_User as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.User_ReceiveID + ',') > 0  FOR XML PATH('')), 1, 1,'')   
+		                    , CNProfessionalId = STUFF((SELECT ',' + Base_CNProfessional.ProfessionalName  FROM dbo.Base_CNProfessional     where  PATINDEX('%,' + RTRIM(Base_CNProfessional.CNProfessionalId) + ',%', ',' + a.CNProfessional_ID + ',') > 0  FOR XML PATH('')), 1, 1,'')
+		                    ,Base_Project.ProjectName
+		                    ,Base_Unit.unitname
+		                    ,a.CloseDate
+		                    ,case a.state when  2 then '姝ｅ湪杩涜' when  3 then '寰呭叧闂�' when 0 then '宸插叧闂�'  when  1 then '寮�鏀�' end as state
+		                    ,QuestionTypeName = STUFF((SELECT ',' + Base_QuestionType.QuestionTypeName  FROM dbo.Base_QuestionType     where  PATINDEX('%,' + RTRIM(Base_QuestionType.QuestionTypeID) + ',%', ',' + a.QuestionTypeID + ',') > 0  FOR XML PATH('')), 1, 1,'')
+		                    ,a.IsManypeople
+		                    ,a.CompleteDate
+		                    ,a.AttachUrl
+		                    ,user_Acceptance = STUFF((SELECT ',' + p2.UserName  FROM dbo.Sys_User as p2  where  PATINDEX('%,' + RTRIM(p2.UserId) + ',%', ',' + a.user_Acceptance + ',') > 0  FOR XML PATH('')), 1, 1,'')    
+		                    from GJSX  as a  left join   Sys_User as b   on a.UserId = b.UserId
+
+                            left join[dbo].[Base_Project]  on a.ProjectId = Base_Project.ProjectId
+
+                            left join[dbo].[Base_Unit] on a.UnitId = Base_Unit.UnitId
+
+                            left join[dbo].[Base_QuestionType] on a.QuestionTypeID = Base_QuestionType.QuestionTypeID
+
+                            where a.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
 
             if (!string.IsNullOrEmpty(Request.Params["projectId"]))  ///鏄惁鏂囦欢鏌滄煡鐪嬮〉闈紶椤圭洰鍊�
@@ -53,11 +99,32 @@ namespace FineUIPro.Web.PZHGL.GJSX
             {
                 listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             }
-
-            listStr.Add(new SqlParameter("@sql_where", strSql));
+            var uid = CurrUser.UserId;
+            //listStr.Add(new SqlParameter("@sql_where", strSql));
+            //鎴戝垱寤虹殑
+            if (classify=="0")
+            {
+                strSql += " AND a.Userid='" + uid + "' ";
+            }
+            //寰呮垜澶勭悊
+            else if (classify == "1")
+            {
+                strSql += " AND (a.state ='2' and a.User_Acceptance like'%"+ uid + "%'  ) or (a.state ='3' and (a.Userid like'%" + uid + "%' or a.User_ReceiveID like'%" + uid + "%'  ))";
+            }
+            //鎴戝凡澶勭悊
+            else if (classify == "2")
+            {
+                strSql += " AND (a.state ='0' and (a.Userid like'%" + uid + "%' or a.User_ReceiveID like'%" + uid + "%'  ))";
+            }
+            //鎴戝弬涓庣殑
+            else if (classify == "3")
+            {
+                strSql += " AND a.CsUsers like'%" + uid + "%' ";
+            }
 
             SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunProc("Sp_GJSX_getlist", parameter);
+
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
@@ -221,7 +288,18 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 return;
             }
             string Id = Grid1.SelectedRowID;
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXListEdit.aspx?EditType=Edit&Id={0}", Id, "缂栬緫 - ")));
+            var gjsx = BLL.GJSXService.GetGJSXById(Id);
+            //蹇呴』鏄矗浠讳汉銆佹彁鍑轰汉銆佽窡韪汉鎵嶈兘淇敼
+            if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId)
+                || gjsx.UserID.Contains(this.CurrUser.UserId) ||
+                gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXListEdit.aspx?EditType=Edit&Id={0}", Id, "缂栬緫 - ")));
+            }
+            else {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("GJSXListEdit.aspx?EditType=See&Id={0}", Id),"鏌ョ湅 - "));
+            }
+            
         }
 
         #region 鍒ゆ柇鏄惁鍙垹闄�
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
index 26d6919a..3bbc5a23 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx
@@ -7,6 +7,9 @@
     <title>缂栬緫鍛樺伐</title>
   <%--  <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />--%>
     <link  href="../../res/css/common.css" rel="stylesheet" type="text/css"  />
+    <style>
+       
+    </style>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -49,18 +52,52 @@
 
                                       <f:FormRow>
                                         <Items>
-                                            <f:DropDownList ID="DropUser_Acceptance" runat="server" Label="楠屾敹浜�" MaxLength="50" LabelWidth="110px"  EnableCheckBoxSelect="true" EnableMultiSelect="true">
+                                            <f:DropDownList ID="DropUser_Acceptance" runat="server" Label="璐ｄ换浜�" MaxLength="50" LabelWidth="110px"  
+                                                EnableCheckBoxSelect="true" EnableEdit="true">
                                             </f:DropDownList>
-                                           <f:DatePicker ID="Date_CompleteDate" runat="server" Label="瑕佹眰瀹屾垚鏃ユ湡"
+                                           <f:DatePicker ID="Date_CompleteDate" runat="server" Label="瑕佹眰瀹屾垚鏃ユ湡" ShowRedStar="true"
                                                 LabelWidth="110px">
                                             </f:DatePicker>
-                                            <f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="鎺ュ彈浜�" MaxLength="50" LabelWidth="110px"  EnableCheckBoxSelect="true" EnableMultiSelect="true"
+                                            <f:DropDownList ID="DropUser_ReceiveID" runat="server" Label="璺熻釜浜�" MaxLength="50" LabelWidth="110px" 
+                                                EnableCheckBoxSelect="true"  EnableEdit="true"
                                                  OnSelectedIndexChanged="DropUser_ReceiveID_TextChanged"  AutoPostBack="true">
                                             </f:DropDownList>
                                         </Items>
                                        </f:FormRow>
+                                   <f:FormRow>
+                                        <Items>
+                                              <f:DropDownBox runat="server" ID="drpCsUsers" MultiSelectSeparator="," AutoPostBack="true" LabelWidth="120px" 
+                                                  Label="鎶勯�佷汉鍛�"  EmptyText="璇蜂粠涓嬫媺琛ㄦ牸涓�夋嫨" EnableMultiSelect="true" MatchFieldWidth="false">
+                                                <PopPanel>
+                                                    <f:Grid ID="Grid4" Width="800px" Height="300px" Hidden="true"
+                                                        DataIDField="UserId" DataTextField="UserName" EnableMultiSelect="true" KeepCurrentSelection="true"
+                                                        PageSize="100" ShowBorder="true" ShowHeader="false" 
+                                                        AllowPaging="true" IsDatabasePaging="true" runat="server" EnableCheckBoxSelect="true"
+                                                        DataKeyNames="UserId" OnPageIndexChange="Grid4_PageIndexChange"
+                                                        AllowSorting="true" SortField="UserName" SortDirection="ASC"
+                                                        OnSort="Grid4_Sort">
+                                                        <Columns>
+                                                            <f:RowNumberField />
+                                                            <f:BoundField Width="200px" DataField="UserName" SortField="UserName" DataFormatString="{0}"
+                                                                HeaderText="濮撳悕" />
+                                                        </Columns>
+                                                        <Toolbars>
+                                                            <f:Toolbar runat="server" Position="Top">
+                                                                <Items>
+                                                                    <f:TwinTriggerBox Width="300px" runat="server" EmptyText="鍦ㄥ鍚嶄腑鏌ユ壘" ShowLabel="false" ID="ttbSearch4"
+                                                                        ShowTrigger1="false" OnTrigger1Click="ttbSearch_Trigger1Click4" OnTrigger2Click="ttbSearch_Trigger2Click4"
+                                                                        Trigger1Icon="Clear" Trigger2Icon="Search">
+                                                                    </f:TwinTriggerBox>
+                                                                </Items>
+                                                            </f:Toolbar>
+                                                        </Toolbars>
+                                                    </f:Grid>
+                                                </PopPanel>
+                                        </f:DropDownBox>
+                                        </Items>
+                                    </f:FormRow>
 
-                                        <f:FormRow>
+                                       <%--   <f:FormRow>
                                             <Items>
                          
                                                 <f:RadioButtonList ID="rblState" runat="server" Label="鐘舵��" LabelWidth="110px" Enabled="false">
@@ -68,17 +105,17 @@
                                                     <f:RadioItem Value="2" Text="姝ｅ湪杩涜" />
                                                     <f:RadioItem Value="0" Text="鍏抽棴" />
                                                 </f:RadioButtonList>
-                                            <%--   <f:DatePicker ID="Date_CloseDate" runat="server" Label="鍏抽棴鏃ユ湡"
+                                             <f:DatePicker ID="Date_CloseDate" runat="server" Label="鍏抽棴鏃ユ湡"
                                                     LabelWidth="110px" >
-                                                </f:DatePicker> --%>
+                                                </f:DatePicker> 
 
                                                 <f:RadioButtonList runat="server" ID="lblIsManyPeople" Label="鏄惁闇�瑕佸浜哄鐞�"
                                                  ShowRedStar="true" AutoPostBack="true"  Hidden="true" LabelWidth="200px">
-                                                <f:RadioItem Text="鏄�" Value="1" />
+                                                <f:RadioItem Text="鏄�" Value="1" Selected="true"/>
                                                 <f:RadioItem Text="鍚�" Value="2" />
                                             </f:RadioButtonList>
                                             </Items>
-                                        </f:FormRow>
+                                        </f:FormRow>--%>
                                         <f:FormRow>
                                             <Items>
                                                 <f:TextArea ID="txtDetail" runat="server" Height="100px" Label="浜嬮」鎻忚堪" MaxLength="1000">
@@ -92,24 +129,36 @@
             </f:FormRow>
 
 
-                <f:FormRow ID="Progress_detail">
+                <f:FormRow ID="Progress_detail" Hidden="true">
                 <Items>
                     <f:ContentPanel ID="ContentPanel2" Title="鍏抽敭浜嬮」杩涘睍" ShowBorder="true"
                             BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
                             runat="server">
+                        <Toolbars>
+                            <f:Toolbar ID="Toolbar131" Position="Top" runat="server" ToolbarAlign="Right" CssClass="Toolbar2" Hidden="true">
+                                <Items>
+                                    <f:Button ID="btnNewOtherManagement" Text="鏂板" ToolTip="鏂板" Icon="Add" runat="server" OnClick="btnNew_Click" >
+                                    </f:Button>
+                                </Items>
+                            </f:Toolbar>
+                        </Toolbars>
+
                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                 
                                 <Items>
                                     <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="鍏抽敭浜嬮」杩涘睍" EnableCollapse="false"
-                                        runat="server" BoxFlex="1" DataKeyNames="cuid"  EnableColumnLines="true" IsFluid="true" 
-                                         DataIDField="cuid"   SortField="cuid"  AllowSorting="true"
-                                        SortDirection="desc"      AllowCellEditing="true" ClicksToEdit="2">
+                                        runat="server" BoxFlex="1" DataKeyNames="Cuid"  EnableColumnLines="true" IsFluid="true" 
+                                         DataIDField="Cuid"   SortField="cuid"  AllowSorting="true"
+                                        SortDirection="desc"      AllowCellEditing="true" ClicksToEdit="1" OnRowCommand="gvOperateComplianceObligations_RowCommand">
                                             
                                                 <Columns>
+                                                     <f:LinkButtonField Width="40px" ConfirmText="鍒犻櫎閫変腑琛岋紵" ConfirmTarget="Parent" CommandName="Delete"
+                                                        ToolTip="鍒犻櫎" Icon="Delete" TextAlign="Center" />
+
                                                     <f:RowNumberField EnablePagingNumber="true" HeaderText="搴忓彿" Width="45px" HeaderTextAlign="Center"
                                                         TextAlign="Center" />
-                                                    <f:RenderField    Width="120px" ColumnID="Progress_user" DataField="Progress_user" SortField="Progress_user"
+                                                    <f:RenderField    Width="140px" ColumnID="Progress_user" DataField="Progress_user" SortField="Progress_user"
                                                         FieldType="String" HeaderText="浜嬮」杩涘睍璐熻矗浜�" HeaderTextAlign="Center" TextAlign="Left"  RendererFunction="renderProgress_user" >
                                                          <Editor>
                                                             <f:DropDownList ID="DropProgress_user" Required="true" runat="server">
@@ -131,13 +180,11 @@
                                                             </f:TextBox>
                                                         </Editor>
                                                     </f:RenderField>
-                                                    <f:RenderField Width="200px" ColumnID="FilePath" DataField="FilePath" SortField="FilePath"
-                                                        FieldType="String" HeaderText="涓婁紶闄勪欢" HeaderTextAlign="Center" TextAlign="Left">
-                                                         <Editor>
-                                                            <f:TextBox ID="TextBox1" Required="true" runat="server">
-                                                            </f:TextBox>
-                                                        </Editor>
-                                                    </f:RenderField>
+                                                    <f:LinkButtonField HeaderText="闄勪欢" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
+                                                        TextAlign="Center" ToolTip="闄勪欢鏌ョ湅" Icon="Find" />
+
+                                                    <f:LinkButtonField HeaderText="闄勪欢" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl1" ColumnID="AttachUrl1" Hidden="true"
+                                                        TextAlign="Center" ToolTip="闄勪欢鏌ョ湅" Icon="Find" />
                  
                                                 </Columns>
              
@@ -148,7 +195,7 @@
                  </Items>
             </f:FormRow>
                 
-                <f:FormRow ID="nextProgress">
+              <%--  <f:FormRow ID="nextProgress">
                 <Items>
                     <f:ContentPanel ID="ContentPanel3" Title="涓嬩竴姝ユ祦绋�" ShowBorder="true"
                             BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
@@ -175,13 +222,21 @@
                           </f:Form>
                       </f:ContentPanel>
                  </Items>
-            </f:FormRow>
+            </f:FormRow>--%>
        
                 
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
                     <Items>
+                          <f:Button ID="btnAttachUrl" Text="闄勪欢" ToolTip="闄勪欢涓婁紶鍙婃煡鐪�" Icon="TableCell" runat="server"
+                                OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1" MarginLeft="5px">
+                            </f:Button>
+                            <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                            </f:ToolbarFill>
+                        <f:Button ID="Button1" ToolTip="鍏抽棴"  Icon="SystemSaveNew" runat="server"   OnClick="btnsubmit_Close" Hidden="true"  >
+                        </f:Button>
+
                         <f:Button ID="btnsubmit" ToolTip="鎻愪氦"  Icon="SystemSaveNew" runat="server"   OnClick="btnsubmit_Click"  >
                         </f:Button>
                         <f:Button ID="btnSave"  ToolTip="淇濆瓨"  Icon="SystemSave" runat="server"  
@@ -193,6 +248,11 @@
                 </f:Toolbar>
             </Toolbars>
         </f:Form>
+         <f:Window ID="WindowAtt" Title="闄勪欢" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
+
         <f:Window ID="Window1" Title="寮瑰嚭绐椾綋" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="880px"
             Height="500px">
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
index c6ac17f1..0c430548 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
@@ -62,6 +62,66 @@ namespace FineUIPro.Web.PZHGL.GJSX
         private static List<Model.GJSX_detail> GJSX_detail = new List<Model.GJSX_detail>();
         #endregion
 
+        #region 闄勪欢涓婁紶
+        /// <summary>
+        /// 涓婁紶闄勪欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            if (this.DropUnitId.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨鍗曚綅锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropCNProfessional_ID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨涓撲笟锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropQuestionTypeID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("闂绫诲埆锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropUser_Acceptance.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨璐ｄ换浜猴紒", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropUser_ReceiveID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨璺熻釜浜猴紒", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.Date_CompleteDate.Text == "")
+            {
+                Alert.ShowInParent("璇烽�夋嫨瑕佹眰瀹屾垚鏃ユ湡锛�", MessageBoxIcon.Warning);
+                return;
+            }
+           
+
+            string EditType = Request.Params["EditType"];
+            if (EditType == "add")
+            {
+                save("1");
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Gjsx&menuId={1}",
+                txtGJSXID.Text, BLL.Const.GJSXMenuId)));
+        }
+        #endregion
+
+        private string[] GetUserNames(string Ids)
+        {
+            string[] arr = Ids.Split(',');
+            var data = Funs.DB.Sys_User.Where(t => arr.Contains(t.UserId)).Select(t => t.UserName).ToList();
+            if (data.Count > 0)
+                return data.ToArray();
+            return null;
+
+        }
+
         /// <summary>
         /// 鍛樺伐缂栬緫椤甸潰
         /// </summary>
@@ -71,6 +131,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
         {
             if (!IsPostBack)
             {
+                GetCheckManBindGrid4();
+                GJSX_detail.Clear();
                 string EditType = Request.Params["EditType"];
                 string ID = Request.Params["ID"];
                 Table = null;
@@ -80,14 +142,19 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 //缂栧彿
                 //闂绫诲埆
                 QuestionTypeService.InitQuestionTypeDropDownList(this.DropQuestionTypeID, false);
-                //楠屾敹浜�
+
+                //璺熻釜浜� 榛樿鏄嚜宸�
                 UserService.InitUserDropDownList(DropUser_ReceiveID, CurrUser.LoginProjectId, false, string.Empty);
-                //鎺ユ敹浜�
+                DropUser_ReceiveID.SelectedValue = CurrUser.UserId;
+
+                //璺熻釜浜� 榛樿鏄嚜宸�
                 UserService.InitUserDropDownList(DropUser_Acceptance, CurrUser.LoginProjectId, false, string.Empty);
+               
                 //浜嬮」杩涘睍璐熻矗浜�
                 UserService.InitUserDropDownList(DropProgress_user, CurrUser.LoginProjectId, false, string.Empty);
-                //涓嬩竴鎺ュ彈浜�
-                UserService.InitUserDropDownList(DropNextRecipient, CurrUser.LoginProjectId, false, string.Empty);
+
+                ////涓嬩竴鎺ュ彈浜�
+                //UserService.InitUserDropDownList(DropNextRecipient, CurrUser.LoginProjectId, false, string.Empty);
 
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 if (EditType == "add")
@@ -95,8 +162,8 @@ namespace FineUIPro.Web.PZHGL.GJSX
                     txtGJSXID.Readonly = true;
                     txtUserID.Readonly = true;
                     //Date_CreateDate.Readonly = true;
-                    this.Progress_detail.Visible = false;
-                    this.nextProgress.Visible = false;
+                    //this.Progress_detail.Visible = false;
+                    //this.nextProgress.Visible = false;
 
 
                     //缂栧彿
@@ -135,10 +202,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
 
                 }
 
-                if (EditType == "Edit")  //娣诲姞浜嬮」杩涘睍
+                if (EditType == "Edit" || EditType=="See")  //娣诲姞浜嬮」杩涘睍
                 {
-                    this.Progress_detail.Visible = true;
-                    this.nextProgress.Visible = true;
+                    //this.Progress_detail.Visible = true;
+                    //this.nextProgress.Visible = true;
                     btnSave.Visible = false;
                     TextIsEnable(false); //浣挎枃鏈笉鍙紪杈�
 
@@ -158,7 +225,13 @@ namespace FineUIPro.Web.PZHGL.GJSX
 
                     //if (tb != null && tb.Rows.Count > 0)
                     //{
-                        txtGJSXID.Text = gjsx.GJSXID;
+                    if (!string.IsNullOrEmpty(gjsx.CsUsers))
+                    {
+                        drpCsUsers.Values = gjsx.CsUsers.Split(',');
+                        drpCsUsers.Texts = GetUserNames(gjsx.CsUsers);
+                    }
+
+                    txtGJSXID.Text = gjsx.GJSXID;
                         DropUnitId.SelectedValue = gjsx.UnitId;
                         if (!string.IsNullOrEmpty(gjsx.CNProfessional_ID))
                         {
@@ -179,7 +252,12 @@ namespace FineUIPro.Web.PZHGL.GJSX
                         {
                             List<string> list_User_ReceiveID = gjsx.User_ReceiveID.Split(',').ToList();
                             DropUser_ReceiveID.SelectedValueArray = list_User_ReceiveID.ToArray();
-                        }
+                            //if (DropUser_ReceiveID.SelectedItemArray.Length > 1)
+                            //{
+                            //    lblIsManyPeople.Hidden = false;
+                            //    lblIsManyPeople.SelectedValue = gjsx.IsManypeople;
+                            //}
+                    }
                         // Date_CloseDate.Text = tb.Rows[0]["CloseDate"].ToString();
                         //txtDetail.Text = tb.Rows[0]["detail"].ToString();
                         //txtUserID.Text = tb.Rows[0]["username"].ToString().Trim();
@@ -196,7 +274,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
                         {
                             Date_CompleteDate.Text = string.Format("{0:yyyy-MM-dd}", gjsx.CompleteDate);
                         }
-                        rblState.SelectedValue = gjsx.State.ToString().Trim();
+                        //rblState.SelectedValue = gjsx.State.ToString().Trim();
 
                     //}
 
@@ -205,50 +283,146 @@ namespace FineUIPro.Web.PZHGL.GJSX
                     {
                         TextIsEnable(true);
                         txtGJSXID.Readonly = true;
-                        this.Progress_detail.Visible = false;
-                        this.nextProgress.Visible = false;
+                        //this.Progress_detail.Visible = false;
+                        //this.nextProgress.Visible = false;
                         Grid2Binging();
                     }
+                    var state = BLL.GJSXService.GetGJSXById(txtGJSXID.Text).State.Trim();
                     if (gjsx.UserID == this.CurrUser.UserId) //濡傛灉褰撳墠鐧诲綍浜烘槸鎻愬嚭浜�
                     {
-                        rblIsClosed.Visible = false;
-                        if (BLL.GJSXService.GetGJSXById(txtGJSXID.Text).State.Trim() == "1")
+                        //rblIsClosed.Visible = false;
+                        if (state == "1")
                         {
                             TextIsEnable(true);
                             txtGJSXID.Readonly = true;
                             txtUserID.Readonly = true;
                             Date_CreateDate.Readonly = true;
                         }
-
-                        if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 0)
+                        else if (state=="2")
                         {
-                            Grid2Binging();
+                            Progress_detail.Hidden = false;
+                            btnsubmit.Hidden = true;
+                            Button1.Hidden = true;
+                            btnSave.Hidden = true;
                         }
-                    }
-                    else if (!string.IsNullOrEmpty(gjsx.User_ReceiveID) && gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))  //鎺ユ敹鑰�
-                    {
-                        rblIsClosed.Visible = false;
-                        btnSave.Visible = false;
-                        if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 0)
-                        {
+                        else {
+                            btnSave.Visible = false;
+                            Progress_detail.Hidden = false;
+                            btnsubmit.Hidden = true;
+                            Button1.Hidden = false;
+
                             Grid2Binging();
+                            Grid2.AllColumns[0].Hidden = true;
+                            Grid2.AllColumns[5].Hidden = true;
+                            Grid2.AllColumns[6].Hidden = false;
+                        }
+
+                        if (state == "0")
+                        {
+                            Button1.Hidden = true;
+                        }
+                        
+                    }
+                    else if (!string.IsNullOrEmpty(gjsx.User_ReceiveID) && gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))  //璺熻釜浜�
+                    {
+                        if (state == "3")
+                        {
+                            Progress_detail.Hidden = false;
+                            btnSave.Visible = false;
+                            btnsubmit.Hidden = true;
+                            Button1.Hidden = false;
+
+                            Grid2Binging();
+                            Grid2.AllColumns[0].Hidden = true;
+                            Grid2.AllColumns[5].Hidden = true;
+                            Grid2.AllColumns[6].Hidden = false;
+                        }
+                        else {
+                            Progress_detail.Hidden = false;
+                            btnSave.Visible = false;
+                            btnsubmit.Hidden = true;
+                            Button1.Hidden = true;
+                        }
+
+                        if (state == "0") {
+                            Button1.Hidden = true;
+                        }
+                        //rblIsClosed.Visible = false;
+
+
+
+                            //if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 0)
+                            //{
+                            //    Grid2Binging();
+                            //}
+                    }
+                    else if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId)) //濡傛灉褰撳墠鐧诲綍浜轰负璐ｄ换浜�
+                    {
+                        if (state == "2")
+                        {
+                            Toolbar131.Hidden = false;
+                            Progress_detail.Hidden = false;
+                            btnSave.Visible = false;
+                            btnsubmit.Hidden = false;
+                            Button1.Hidden = true;
+                        }
+                        else {
+                            Progress_detail.Hidden = true;
+                            btnSave.Visible = false;
+                            btnsubmit.Hidden = true;
+                            Button1.Hidden = true;
+                        }
+
+                        if (state=="0" || state=="3")
+                        {
+                            Progress_detail.Hidden = false;
+                            Grid2Binging();
+                            Grid2.AllColumns[0].Hidden = true;
+                            Grid2.AllColumns[5].Hidden = true;
+                            Grid2.AllColumns[6].Hidden = false;
                         }
                     }
                     else   //娴忚鑰�
                     {
-                        this.Grid2.AllowCellEditing = false;// 绂佹缂栬緫
-                        Progress_detail.Enabled = false;
-                        this.nextProgress.Visible = false;
+                        Progress_detail.Hidden = false;
+                        
+                        //Progress_detail.Enabled = false;
+                        //this.nextProgress.Visible = false;
                         btnSave.Visible = false;
                         btnsubmit.Visible = false;
+                        Button1.Hidden = true;
+                        Grid2Binging();
+                        Grid2.AllColumns[0].Hidden = true;
+                        Grid2.AllColumns[5].Hidden = true;
+                        Grid2.AllColumns[6].Hidden = false;
                     }
-                    if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId)) //濡傛灉褰撳墠鐧诲綍浜轰负楠屾敹浜�
+
+                    if (!string.IsNullOrEmpty(gjsx.User_Acceptance) && gjsx.User_Acceptance.Contains(this.CurrUser.UserId)
+                        && state=="2") //濡傛灉褰撳墠鐧诲綍浜轰负璐ｄ换浜�
                     {
-                        rblIsClosed.Visible = true;
-                        btnSave.Visible = false;
-                        if (BLL.GJSXProcessService.GetGJSXProcessByGJSXIDAndUserId(this.txtGJSXID.Text, this.CurrUser.UserId) > 0)
+                        if (state == "2")
                         {
+                            Toolbar131.Hidden = false;
+                            Progress_detail.Hidden = false;
+                            btnSave.Visible = false;
+                            btnsubmit.Hidden = false;
+                            Button1.Hidden = true;
+                        }
+                        else
+                        {
+                            Progress_detail.Hidden = true;
+                            btnSave.Visible = false;
+                            btnsubmit.Hidden = true;
+                            Button1.Hidden = true;
+                        }
+
+                        if (state == "0" || state == "3")
+                        {
+                            Progress_detail.Hidden = false;
                             Grid2Binging();
+                            Grid2.AllColumns[0].Hidden = true;
+                            Grid2.AllColumns[5].Hidden = true;
+                            Grid2.AllColumns[6].Hidden = false;
                         }
                     }
 
@@ -281,21 +455,21 @@ namespace FineUIPro.Web.PZHGL.GJSX
                         //    this.nextProgress.Visible = true;
                         //    this.rblIsClosed.Visible = false;
                         //}
-                        if (IsClosed_ManyPeople())
-                        {
-                            this.nextProgress.Visible = true;
-                            this.rblIsClosed.Visible = true;
-                        }
-                        else
-                        {
-                            this.rblIsClosed.Visible = false;
+                        //if (IsClosed_ManyPeople())
+                        //{
+                        //    this.nextProgress.Visible = true;
+                        //    this.rblIsClosed.Visible = true;
+                        //}
+                        //else
+                        //{
+                        //    this.rblIsClosed.Visible = false;
 
-                        }
+                        //}
                     }
                     if (BLL.GJSXService.GetGJSXById(this.txtGJSXID.Text).State.Trim() == "0")
                     {
-                        Progress_detail.Enabled = false;
-                        nextProgress.Visible = false;
+                        //Progress_detail.Enabled = false;
+                        //nextProgress.Visible = false;
                         btnsubmit.Visible = false;
                     }
 
@@ -320,26 +494,27 @@ namespace FineUIPro.Web.PZHGL.GJSX
             DropUser_ReceiveID.Enabled = isStart;
             //   Date_CloseDate.Enabled = isStart;
             txtDetail.Enabled = isStart;
-
+            drpCsUsers.Enabled = isStart;
+            //lblIsManyPeople.Enabled = isStart;
         }
 
         private void Grid2Binging()
         {
             GJSX_detail = BLL.GJSXItemService.GetGJSXDetailByGJSXID(txtGJSXID.Text);
-            if (rblState.SelectedValue.Trim() == "2")
-            {
-                Model.GJSX_detail detail = new Model.GJSX_detail
-                {
-                    Cuid = Guid.NewGuid().ToString(),
-                    GJSXID = txtGJSXID.Text,
-                    Progress_detail = "",
-                    FilePath = "",
-                    Progress_user = CurrUser.UserId,
-                    Date = DateTime.Parse(string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now))
-                };
+            //if (rblState.SelectedValue.Trim() == "2")
+            //{
+            //    Model.GJSX_detail detail = new Model.GJSX_detail
+            //    {
+            //        Cuid = Guid.NewGuid().ToString(),
+            //        GJSXID = txtGJSXID.Text,
+            //        Progress_detail = "",
+            //        FilePath = "",
+            //        Progress_user = CurrUser.UserId,
+            //        Date = DateTime.Parse(string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now))
+            //    };
 
-                GJSX_detail.Add(detail);
-            }
+            //    GJSX_detail.Add(detail);
+            //}
 
 
             Grid2.RecordCount = GJSX_detail.Count;
@@ -363,8 +538,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
             // 濮撳悕
             UpdateDataRow("Progress_detail", rowDict, rowData);
 
-            // 鎬у埆
-            UpdateDataRow("FilePath", rowDict, rowData);
+          
 
         }
         private DataRow FindRowByID(string rowID)
@@ -372,7 +546,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
             DataTable table = Table;
             foreach (DataRow row in table.Rows)
             {
-                if (row["cuid"].ToString() == rowID)
+                if (row["Cuid"].ToString() == rowID)
                 {
                     return row;
                 }
@@ -399,7 +573,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 _Detail.Progress_user = Table.Rows[i]["Progress_user"].ToString();
                 _Detail.Date = DateTime.Parse(Table.Rows[i]["Date"].ToString());
                 _Detail.Progress_detail = Table.Rows[i]["Progress_detail"].ToString();
-                _Detail.FilePath = Table.Rows[i]["FilePath"].ToString();
+               
 
                 Model.GJSX_detail isExit_detail = BLL.GJSXItemService.GetGJSXMXById(_Detail.Cuid);
 
@@ -419,37 +593,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
         }
         private void save(string state)
         {
-            if (this.DropUnitId.SelectedValue == Const._Null)
-            {
-                Alert.ShowInParent("璇烽�夋嫨鍗曚綅锛�", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.DropCNProfessional_ID.SelectedValue == Const._Null)
-            {
-                Alert.ShowInParent("璇烽�夋嫨涓撲笟锛�", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.DropQuestionTypeID.SelectedValue == Const._Null)
-            {
-                Alert.ShowInParent("闂绫诲埆锛�", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.DropUser_Acceptance.SelectedValue == Const._Null)
-            {
-                Alert.ShowInParent("楠屾敹浜猴紒", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.DropUser_ReceiveID.SelectedValue == Const._Null)
-            {
-                Alert.ShowInParent("璇烽�夋嫨鎺ュ彈浜猴紒", MessageBoxIcon.Warning);
-                return;
-            }
-            if (this.Date_CompleteDate.Text == "")
-            {
-                Alert.ShowInParent("璇烽�夋嫨瑕佹眰瀹屾垚鏃ユ湡锛�", MessageBoxIcon.Warning);
-                return;
-            }
-
+            
 
             Model.GJSX gjsx = new Model.GJSX();
             {
@@ -461,11 +605,19 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 gjsx.UnitId = this.DropUnitId.SelectedValue;
                 gjsx.State = state;
                 //gjsx.QuestionTypeID = this.DropQuestionTypeID.SelectedValue;
-                gjsx.IsManypeople = lblIsManyPeople.SelectedValue;
+                //gjsx.IsManypeople = lblIsManyPeople.SelectedValue;
                 gjsx.CompleteDate = DateTime.Parse(Date_CompleteDate.Text);
                 gjsx.AttachUrl = "";
             }
 
+            //鎶勯�佷汉
+            string sendUserIds = string.Empty;
+            if (!string.IsNullOrEmpty(drpCsUsers.Value))
+            {
+                sendUserIds = string.Join(",", drpCsUsers.Values);
+            }
+            gjsx.CsUsers = sendUserIds;
+
             foreach (var item in this.DropUser_ReceiveID.SelectedValueArray)
             {
                 if (item != BLL.Const._Null)
@@ -523,7 +675,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 }
             }
 
-            if (rblIsClosed.SelectedValue == "true")
+            if (state == "0")
             {
                 gjsx.CloseDate = DateTime.Now;
             }
@@ -538,15 +690,15 @@ namespace FineUIPro.Web.PZHGL.GJSX
                 GJSXService.UpdateGJSX(gjsx);
             }
 
-            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+            
         }
         protected void DropUser_ReceiveID_TextChanged(object sender, EventArgs e)
         {
-            if (DropUser_ReceiveID.SelectedItemArray.Length > 1)
-            {
-                lblIsManyPeople.Hidden = false;
+            //if (DropUser_ReceiveID.SelectedItemArray.Length > 1)
+            //{
+            //    lblIsManyPeople.Hidden = false;
 
-            }
+            //}
         }
 
         private bool IsClosed_ManyPeople()
@@ -572,62 +724,118 @@ namespace FineUIPro.Web.PZHGL.GJSX
         /// <param name="e"></param>
         protected void btnsubmit_Click(object sender, EventArgs e)
         {
-            if (rblIsClosed.SelectedValue == "true")
+            if (this.DropUnitId.SelectedValue == Const._Null)
             {
-                save("0");
+                Alert.ShowInParent("璇烽�夋嫨鍗曚綅锛�", MessageBoxIcon.Warning);
+                return;
             }
-            else
+            if (this.DropCNProfessional_ID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨涓撲笟锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropQuestionTypeID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("闂绫诲埆锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropUser_Acceptance.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨璐ｄ换浜猴紒", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropUser_ReceiveID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨璺熻釜浜猴紒", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.Date_CompleteDate.Text == "")
+            {
+                Alert.ShowInParent("璇烽�夋嫨瑕佹眰瀹屾垚鏃ユ湡锛�", MessageBoxIcon.Warning);
+                return;
+            }
+
+
+
+
+            //if (rblIsClosed.SelectedValue == "true")
+            //{
+            //    save("0");
+            //}
+            //else
+            //{
+            //    save("2");
+            //}
+
+
+            //string nextreceuserid = DropNextRecipient.SelectedValue;
+
+            //BLL.GJSXProcessService.DeleteProcess(this.txtGJSXID.Text); //鍏堝垹闄�
+            //List<string> List_GJSXProcess = BLL.GJSXProcessService.GetProcessListByGJSXID(this.txtGJSXID.Text);
+            //foreach (var item in this.DropUser_ReceiveID.SelectedValueArray)
+            //{
+            //    if (item != BLL.Const._Null)
+            //    {
+            //        if (!List_GJSXProcess.Contains(item)) //涓嶅瓨鍦ㄦ帴鏀惰褰�
+            //        {
+            //            Model.GJSX_Process gJSX_Process = new Model.GJSX_Process()
+            //            {
+            //                ProcessID = Guid.NewGuid().ToString(),
+            //                GJSXID = txtGJSXID.Text,
+            //                UserId = item
+            //            };
+            //            BLL.GJSXProcessService.AddProcess(gJSX_Process);     //鍚庢坊鍔�
+            //        }
+
+            //    }
+            //}
+
+            string EditType = Request.Params["EditType"];
+
+            if (EditType == "add")
             {
                 save("2");
             }
-
-
-            string nextreceuserid = DropNextRecipient.SelectedValue;
-
-            BLL.GJSXProcessService.DeleteProcess(this.txtGJSXID.Text); //鍏堝垹闄�
-            List<string> List_GJSXProcess = BLL.GJSXProcessService.GetProcessListByGJSXID(this.txtGJSXID.Text);
-            foreach (var item in this.DropUser_ReceiveID.SelectedValueArray)
-            {
-                if (item != BLL.Const._Null)
+            else {
+                //璐ｄ换浜虹殑鏃跺�欎繚瀛樺叧閿簨椤�
+                var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
+                if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
                 {
-                    if (!List_GJSXProcess.Contains(item)) //涓嶅瓨鍦ㄦ帴鏀惰褰�
-                    {
-                        Model.GJSX_Process gJSX_Process = new Model.GJSX_Process()
-                        {
-                            ProcessID = Guid.NewGuid().ToString(),
-                            GJSXID = txtGJSXID.Text,
-                            UserId = item
-                        };
-                        BLL.GJSXProcessService.AddProcess(gJSX_Process);     //鍚庢坊鍔�
-                    }
-
+                    save("3");
+                    OperateComplianceObligationsCSort();
                 }
             }
+            
+            
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+            //if (nextreceuserid != null)
+            //{
+            //    Model.GJSX gJSX = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
+            //    if (!gJSX.User_ReceiveID.Contains(nextreceuserid))
+            //    {
+            //        gJSX.User_ReceiveID += "," + nextreceuserid;
+            //        BLL.GJSXService.UpdateGJSX(gJSX);
+            //        Model.GJSX_Process gJSX_Process = new Model.GJSX_Process()
+            //        {
+            //            ProcessID = Guid.NewGuid().ToString(),
+            //            GJSXID = txtGJSXID.Text,
+            //            UserId = nextreceuserid
+            //        };
+            //        BLL.GJSXProcessService.AddProcess(gJSX_Process);
+            //    }
 
-            if (Table != null)
-            {
-                Grid2.GetModifiedDict();
-                Grid2Save(Grid2);
-            }
+            //}
 
-            if (nextreceuserid != null)
-            {
-                Model.GJSX gJSX = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
-                if (!gJSX.User_ReceiveID.Contains(nextreceuserid))
-                {
-                    gJSX.User_ReceiveID += "," + nextreceuserid;
-                    BLL.GJSXService.UpdateGJSX(gJSX);
-                    Model.GJSX_Process gJSX_Process = new Model.GJSX_Process()
-                    {
-                        ProcessID = Guid.NewGuid().ToString(),
-                        GJSXID = txtGJSXID.Text,
-                        UserId = nextreceuserid
-                    };
-                    BLL.GJSXProcessService.AddProcess(gJSX_Process);
-                }
-
-            }
+        }
 
+        /// <summary>
+        /// 鍏抽棴
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnsubmit_Close(object sender, EventArgs e) {
+            save("0");
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
         }
 
 
@@ -638,7 +846,38 @@ namespace FineUIPro.Web.PZHGL.GJSX
         /// <param name="e"></param>
         protected void btnSave_Click(object sender, EventArgs e)
         {
+            if (this.DropUnitId.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨鍗曚綅锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropCNProfessional_ID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨涓撲笟锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropQuestionTypeID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("闂绫诲埆锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropUser_Acceptance.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨璐ｄ换浜猴紒", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.DropUser_ReceiveID.SelectedValue == Const._Null)
+            {
+                Alert.ShowInParent("璇烽�夋嫨璺熻釜浜猴紒", MessageBoxIcon.Warning);
+                return;
+            }
+            if (this.Date_CompleteDate.Text == "")
+            {
+                Alert.ShowInParent("璇烽�夋嫨瑕佹眰瀹屾垚鏃ユ湡锛�", MessageBoxIcon.Warning);
+                return;
+            }
             save("1");
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
 
         }
 
@@ -656,7 +895,7 @@ namespace FineUIPro.Web.PZHGL.GJSX
             }
             else
             {
-                var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PersonSetMenuId);
+                var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.GJSXMenuId);
                 if (buttonList.Count() > 0)
                 {
                     if (buttonList.Contains(BLL.Const.BtnAdd) || buttonList.Contains(BLL.Const.BtnModify))
@@ -698,6 +937,156 @@ namespace FineUIPro.Web.PZHGL.GJSX
         }
         #endregion
 
+        #region 鍔犺浇鎶勯�佷汉鍛�
+        private void GetCheckManBindGrid4()
+        {
+            var tb = GetCheckManSource4();
+            // 1.璁剧疆鎬婚」鏁帮紙鐗瑰埆娉ㄦ剰锛氭暟鎹簱鍒嗛〉涓�瀹氳璁剧疆鎬昏褰曟暟RecordCount锛�
+            Grid4.RecordCount = tb.Rows.Count;
+
+            // 2.鑾峰彇褰撳墠鍒嗛〉鏁版嵁
+            var table = this.GetPagedDataTable(Grid4, tb);
+
+            // 3.缁戝畾鍒癎rid
+            Grid4.DataSource = table;
+            Grid4.DataBind();
+        }
+
+        private DataTable GetCheckManSource4()
+        {
+            string sortField = Grid4.SortField;
+            string sortDirection = Grid4.SortDirection;
+
+            var userList = (from x in Funs.DB.Sys_User
+                            join y in Funs.DB.Project_ProjectUnit
+                                on x.UnitId equals y.UnitId
+                            join p in Funs.DB.Project_ProjectUser
+                                on x.UserId equals p.UserId
+                            where p.ProjectId == CurrUser.LoginProjectId &&
+                                  y.ProjectId == CurrUser.LoginProjectId
+                            orderby x.UserCode
+                            select x);
+
+            DataTable table2 = LINQToDataTable(userList);
+            DataView view2 = table2.DefaultView;
+            view2.Sort = String.Format("{0} {1}", sortField, sortDirection);
+
+            string searchKeyword = ttbSearch4.Text.Trim();
+            if (!String.IsNullOrEmpty(searchKeyword) && ttbSearch4.ShowTrigger1)
+            {
+                view2.RowFilter = String.Format(" UserName LIKE '%{0}%'", searchKeyword);
+            }
+
+            return view2.ToTable();
+        }
+
+        protected void ttbSearch_Trigger1Click4(object sender, EventArgs e)
+        {
+            ttbSearch4.ShowTrigger1 = true;
+            GetCheckManBindGrid4();
+        }
+        protected void Grid4_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid4.PageIndex = e.NewPageIndex;
+            GetCheckManBindGrid4();
+        }
+        protected void Grid4_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid4.SortDirection = e.SortDirection;
+            Grid4.SortField = e.SortField;
+            GetCheckManBindGrid4();
+        }
+        protected void ttbSearch_Trigger2Click4(object sender, EventArgs e)
+        {
+            ttbSearch4.ShowTrigger1 = true;
+            GetCheckManBindGrid4();
+        }
+        #endregion
+
+        #region 鍏抽敭浜嬮」
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            jerqueSaveComplianceObligationsCList();
+            Model.GJSX_detail complianceObligationsC = new Model.GJSX_detail
+            {
+                Cuid = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolutionApprove_Item))
+            };
+            GJSX_detail.Add(complianceObligationsC);
+            this.Grid2.DataSource = GJSX_detail;
+            this.Grid2.DataBind();
+        }
+
+        protected void gvOperateComplianceObligations_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            jerqueSaveComplianceObligationsCList();
+            string rowID = this.Grid2.DataKeys[e.RowIndex][0].ToString();
+            if (e.CommandName == "Delete")
+            {
+                foreach (var item in GJSX_detail)
+                {
+                    if (item.Cuid == rowID)
+                    {
+                        GJSX_detail.Remove(item);
+                        break;
+                    }
+                }
+                Grid2.DataSource = GJSX_detail;
+                Grid2.DataBind();
+                ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+            }
+            else if (e.CommandName == "AttachUrl")
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=1&toKeyId={0}&path=FileUpload/Gjsx&menuId={1}",
+                    rowID, BLL.Const.GJSXMenuId)));
+            }
+            else if (e.CommandName == "AttachUrl1")
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/Gjsx&menuId={1}",
+                   rowID, BLL.Const.GJSXMenuId)));
+            }
+        }
+
+        private void OperateComplianceObligationsCSort()
+        {
+            var list = Funs.DB.GJSX_detail.Where(x => x.GJSXID == txtGJSXID.Text).ToList();
+            if (list.Count>0)
+            {
+                Funs.DB.GJSX_detail.DeleteAllOnSubmit(list);
+                Funs.DB.SubmitChanges();
+            }
+            jerqueSaveComplianceObligationsCList();
+            foreach (Model.GJSX_detail coc in GJSX_detail)
+            {
+                coc.GJSXID = txtGJSXID.Text;
+                BLL.GJSXItemService.AddGJSXMX(coc);
+            }
+        }
+
+
+        private void jerqueSaveComplianceObligationsCList()
+        {
+            GJSX_detail.Clear();
+            JArray mergedData = Grid2.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                var hazardSort = new Model.GJSX_detail
+                {
+                    Cuid = this.Grid2.Rows[i].DataKeys[0].ToString(),
+                    Progress_user= values.Value<string>("Progress_user").ToString(),
+                    Progress_detail = values.Value<string>("Progress_detail").ToString(),
+                };
+                if (!string.IsNullOrEmpty(values.Value<string>("Date").ToString()))
+                {
+                    hazardSort.Date = Convert.ToDateTime(values.Value<string>("Date").ToString());
+                }
+                GJSX_detail.Add(hazardSort);
+            }
+        }
+        #endregion
+
 
     }
 }
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs
index 1460db63..3ded8ab9 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.PZHGL.GJSX {
-    
-    
-    public partial class GJSXListEdit {
-        
+namespace FineUIPro.Web.PZHGL.GJSX
+{
+
+
+    public partial class GJSXListEdit
+    {
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// ContentPanel1 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// Form_edit 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Form Form_edit;
-        
+
         /// <summary>
         /// txtGJSXID 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtGJSXID;
-        
+
         /// <summary>
         /// DropUnitId 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList DropUnitId;
-        
+
         /// <summary>
         /// DropCNProfessional_ID 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList DropCNProfessional_ID;
-        
+
         /// <summary>
         /// txtUserID 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox txtUserID;
-        
+
         /// <summary>
         /// Date_CreateDate 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DatePicker Date_CreateDate;
-        
+
         /// <summary>
         /// DropQuestionTypeID 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList DropQuestionTypeID;
-        
+
         /// <summary>
         /// DropUser_Acceptance 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList DropUser_Acceptance;
-        
+
         /// <summary>
         /// Date_CompleteDate 鎺т欢銆�
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DatePicker Date_CompleteDate;
-        
+
         /// <summary>
         /// DropUser_ReceiveID 鎺т欢銆�
         /// </summary>
@@ -137,25 +139,34 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList DropUser_ReceiveID;
-        
+
         /// <summary>
-        /// rblState 鎺т欢銆�
+        /// drpCsUsers 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.RadioButtonList rblState;
-        
+        protected global::FineUIPro.DropDownBox drpCsUsers;
+
         /// <summary>
-        /// lblIsManyPeople 鎺т欢銆�
+        /// Grid4 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.RadioButtonList lblIsManyPeople;
-        
+        protected global::FineUIPro.Grid Grid4;
+
+        /// <summary>
+        /// ttbSearch4 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TwinTriggerBox ttbSearch4;
+
         /// <summary>
         /// txtDetail 鎺т欢銆�
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextArea txtDetail;
-        
+
         /// <summary>
         /// Progress_detail 鎺т欢銆�
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.FormRow Progress_detail;
-        
+
         /// <summary>
         /// ContentPanel2 鎺т欢銆�
         /// </summary>
@@ -182,7 +193,25 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel2;
-        
+
+        /// <summary>
+        /// Toolbar131 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar131;
+
+        /// <summary>
+        /// btnNewOtherManagement 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnNewOtherManagement;
+
         /// <summary>
         /// Form2 鎺т欢銆�
         /// </summary>
@@ -191,7 +220,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Form Form2;
-        
+
         /// <summary>
         /// Grid2 鎺т欢銆�
         /// </summary>
@@ -200,7 +229,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Grid Grid2;
-        
+
         /// <summary>
         /// DropProgress_user 鎺т欢銆�
         /// </summary>
@@ -209,7 +238,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList DropProgress_user;
-        
+
         /// <summary>
         /// DatePicker1 鎺т欢銆�
         /// </summary>
@@ -218,7 +247,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DatePicker DatePicker1;
-        
+
         /// <summary>
         /// tbxEditorName 鎺т欢銆�
         /// </summary>
@@ -227,61 +256,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TextBox tbxEditorName;
-        
-        /// <summary>
-        /// TextBox1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.TextBox TextBox1;
-        
-        /// <summary>
-        /// nextProgress 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.FormRow nextProgress;
-        
-        /// <summary>
-        /// ContentPanel3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.ContentPanel ContentPanel3;
-        
-        /// <summary>
-        /// Form3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Form Form3;
-        
-        /// <summary>
-        /// rblIsClosed 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.RadioButtonList rblIsClosed;
-        
-        /// <summary>
-        /// DropNextRecipient 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DropDownList DropNextRecipient;
-        
+
         /// <summary>
         /// Toolbar1 鎺т欢銆�
         /// </summary>
@@ -290,7 +265,34 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
+        /// <summary>
+        /// btnAttachUrl 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
+        /// <summary>
+        /// ToolbarFill1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// Button1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button Button1;
+
         /// <summary>
         /// btnsubmit 鎺т欢銆�
         /// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnsubmit;
-        
+
         /// <summary>
         /// btnSave 鎺т欢銆�
         /// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 鎺т欢銆�
         /// </summary>
@@ -317,7 +319,16 @@ namespace FineUIPro.Web.PZHGL.GJSX {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
+        /// <summary>
+        /// WindowAtt 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+
         /// <summary>
         /// Window1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx
new file mode 100644
index 00000000..160095aa
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx
@@ -0,0 +1,187 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ProjectUserContact.aspx.cs" Inherits="FineUIPro.Web.ProjectData.ProjectUserContact" %>
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>椤圭洰鐢ㄦ埛</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />  
+    <style type="text/css">
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }     
+        
+         .f-grid-row.red
+        {
+            background-color: #FF7575;
+            background-image: none;
+        }
+        
+        .fontred
+        {
+            color: #FF7575;
+            background-image: none;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1"  runat="server" />
+    <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" 
+       ShowHeader="false"  Layout="VBox" BoxConfigAlign="Stretch" >
+        <Items>
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="椤圭洰鐢ㄦ埛" 
+                EnableCollapse="true" runat="server" BoxFlex="1"  EnableColumnLines="true" ForceFit="true"
+                DataKeyNames="ProjectUserId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectUserId"
+                AllowSorting="true" SortField="UserName" SortDirection="ASC"  OnSort="Grid1_Sort"    
+                AllowPaging="true" IsDatabasePaging="true"  PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" 
+                 EnableTextSelection="True">
+                <Toolbars>
+                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                        <Items>
+                            <f:TextBox runat="server" Label="鐢ㄦ埛鍚嶇О" ID="txtUserName" EmptyText="杈撳叆鏌ヨ鏉′欢" 
+                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="80px"></f:TextBox>    
+                            
+                        </Items>
+                    </f:Toolbar>
+                </Toolbars>
+                <Columns>
+                    <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="搴忓彿" HeaderTextAlign="Center"
+                        TextAlign="Center">
+                        <ItemTemplate>
+                            <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                        </ItemTemplate>
+                    </f:TemplateField>
+             
+                       
+                    <f:RenderField Width="100px" ColumnID="UserName" DataField="UserName" SortField="UserName"
+                        FieldType="String" HeaderText="鐢ㄦ埛鍚嶇О"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                     <f:RenderField Width="200px" ColumnID="Telephone" DataField="Telephone" SortField="Telephone"
+                        FieldType="String" HeaderText="鑱旂郴鐢佃瘽"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="200px" ColumnID="RoleName" DataField="RoleName" SortField="RoleName"
+                        FieldType="String" HeaderText="椤圭洰瑙掕壊"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WorkPostName" DataField="WorkPostName" SortField="WorkPostName"
+                        FieldType="String" HeaderText="椤圭洰宀椾綅"  HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                   
+                    <f:TemplateField Width="60px" ColumnID="Actions">
+                    <ItemTemplate>
+                        <a class="action call" href="javascript:;">
+                            鎷ㄥ彿
+                        </a>
+                        &nbsp;&nbsp;
+                        <a class="action hangup" href="javascript:;">
+                            鎸傛柇
+                        </a> 
+                    </ItemTemplate>
+                </f:TemplateField>
+                                          
+                </Columns>
+                <Listeners>
+                 </Listeners>
+              <PageItems>
+                <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                </f:ToolbarSeparator>
+                <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
+                </f:ToolbarText>
+                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">                  
+                </f:DropDownList>        
+            </PageItems>            
+            </f:Grid>
+        </Items>
+    </f:Panel> 
+    
+   <audio id="audio" style="visibility: hidden;" src=""   controls="controls">
+        Your browser does not support the audio element.
+    </audio>
+    </form>
+      
+    <script src="../res/js/jssip-3.7.0.min.js"></script>
+    <script src="../res/js/mixrtc.min.js"></script>   
+    <script type="text/javascript">
+
+        F.ready(function () {
+
+
+        var gridClientID = '<%= Grid1.ClientID %>';
+        function change(value, CallInPhone = false) {
+            var classname = {
+                CallOut: 'label-warning',    // 鍛煎嚭鎸搩鐘舵��
+                CallIn: 'label-warning',     // 鍛煎叆鎸搩鐘舵��
+                Calling: 'label-info',    // 閫氳瘽涓�
+                Ended: 'label-success',      // 鎸傛柇
+                Failed: 'label-default',     // 澶辫触
+            }
+            //var status = $('#status')
+            //status.removeClass()
+            //status.addClass('label')
+            //status.addClass(classname[value])
+            //status.text(value)
+            //if (CallInPhone != false) {
+            //    $('#callin').text(CallInPhone)
+            //}
+        }
+
+            var audio = $('#audio')[0]
+             
+        var Configs = {
+            audioConfigs: {
+                audio: audio,             // audio鐨勫璞�
+                ringout: '../res/wav/ringout.wav',   // 鍛煎嚭鎸搩鐨勯煶棰戝湴鍧�
+                ringin: '../res/wav/ringin.wav',    // 鍛煎叆鐨勬尟閾冮煶棰戝湴鍧�
+                hangup: '../res/wav/dududu.wav',
+            },  // 褰曢煶闊抽閰嶇疆
+            changeStatus: change,   // 閫氳瘽鐘舵�佺殑鍙樺姩鍥炶皟
+            debug: false,    // sip淇′护debug鎺掓煡
+        }
+        var rtc = new WebRTC(Configs);
+        rtc.WebSocket('wss://demo1.mixcom.cn:8089/ws')
+
+
+
+        // 娉ㄥ唽鍒嗘満
+        function registered () {
+            var extension = '2008'
+            var password = 'r5yMCjxxxaHQtMXZ'
+            if (!extension || !password) {
+                alert("鎻愮ず: 鍒嗘満鍙风爜鍜屽瘑鐮佷笉鑳戒负绌�!")
+            }
+            rtc.register({
+                extension: extension,
+                password: password,
+                sipserver: 'pri-local-dev02.mixcom.cn',
+            })
+        }
+
+        //// 娉ㄩ攢鍒嗘満
+        //$('#unregistered').click(function () {
+        //    rtc.unregister()
+        //})     
+        
+      
+        
+            registered();
+            var grid = F(gridClientID);
+            grid.el.on('click', '.f-grid-cell-Actions .action.call', function (event) {
+                var targetEl = $(this);
+                var rowEl = targetEl.parents('.f-grid-row');
+                var rowData = grid.getRowData(rowEl); 
+                var phone = rowData.values.Telephone + '' ; 
+                rtc.call(phone);
+                
+            });
+            grid.el.on('click', '.f-grid-cell-Actions .action.hangup', function (event) { 
+                rtc.hangup() 
+            });
+
+        });
+
+
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.cs
new file mode 100644
index 00000000..75fed18b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.cs
@@ -0,0 +1,158 @@
+锘縰sing BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.ProjectData
+{
+    public partial class ProjectUserContact : PageBase
+    {
+        #region 鍔犺浇
+        /// <summary>
+        /// 鍔犺浇椤甸潰
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                Funs.DropDownPageSize(this.ddlPageSize);
+                if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
+                {
+                    Grid1.PageSize = this.CurrUser.PageSize.Value;
+                }
+                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+
+
+                // 缁戝畾琛ㄦ牸
+                this.BindGrid();
+                ////鏉冮檺鎸夐挳鏂规硶
+                this.GetButtonPower();
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        private void BindGrid()
+        {
+
+            string strSql = @" SELECT DISTINCT ProjectUser.ProjectUserId, Users.UserName,Users.Telephone,  WorkPost.WorkPostName 
+                                  ,RoleName= STUFF(( SELECT ',' + RoleName FROM dbo.Sys_Role where PATINDEX('%,' + RTRIM(RoleId) + ',%',',' +ProjectUser.RoleId + ',')>0 FOR XML PATH('')), 1, 1,'')
+                                  FROM Project_ProjectUser AS ProjectUser  
+                                  LEFT JOIN Sys_User AS Users ON ProjectUser.UserId = Users.UserId  
+                                  LEFT JOIN SitePerson_Person AS Person ON ProjectUser.ProjectId =Person.ProjectId AND Users.IdentityCard = Person.IdentityCard 
+                                  LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId 
+                                where ProjectUser.ProjectId=@ProjectId ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+
+            if (!string.IsNullOrEmpty(txtUserName.Text))
+            {
+                strSql+= " and Users.UserName like '%"+ txtUserName.Text + "%' ";
+            }
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+            tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+
+
+        }
+
+        
+
+        #region 鎺掑簭 鍒嗛〉
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+
+
+        }
+        #endregion
+
+        #region 鏌ヨ
+        /// <summary>
+        /// 鏌ヨ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+
+            this.BindGrid();
+            this.GetButtonPower();
+        }
+
+
+        #endregion
+
+        protected string ConvertTelephone(object WorkAreaId)
+        {
+            if (WorkAreaId != null)
+                return WorkAreaId.ToString();
+            else
+                return "";
+        }
+
+
+
+
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.designer.cs
new file mode 100644
index 00000000..62fcca2a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUserContact.aspx.designer.cs
@@ -0,0 +1,107 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ProjectData
+{
+
+
+    public partial class ProjectUserContact
+    {
+
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtUserName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtUserName;
+
+        /// <summary>
+        /// lblNumber 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblNumber;
+
+        /// <summary>
+        /// ToolbarSeparator1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+        /// <summary>
+        /// ToolbarText1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml b/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml
deleted file mode 100644
index 6bbda16d..00000000
--- a/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile.pubxml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-姝ゆ枃浠剁敱 Web 椤圭洰鐨勫彂甯�/鎵撳寘杩囩▼浣跨敤銆傚彲浠ラ�氳繃缂栬緫姝� MSBuild 鏂囦欢
-鑷畾涔夋杩囩▼鐨勮涓恒�備负浜嗚В涓庢鐩稿叧鐨勬洿澶氬唴瀹癸紝璇疯闂� https://go.microsoft.com/fwlink/?LinkID=208121銆� 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <PublishProvider>FileSystem</PublishProvider>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>E:\Package\SGGL</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <PrecompileBeforePublish>True</PrecompileBeforePublish>
-    <EnableUpdateable>True</EnableUpdateable>
-    <DebugSymbols>False</DebugSymbols>
-    <WDPMergeOption>DonotMerge</WDPMergeOption>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile1.pubxml b/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile1.pubxml
deleted file mode 100644
index a517c0e3..00000000
--- a/SGGL/FineUIPro.Web/Properties/PublishProfiles/FolderProfile1.pubxml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-姝ゆ枃浠剁敱 Web 椤圭洰鐨勫彂甯�/鎵撳寘杩囩▼浣跨敤銆傚彲浠ラ�氳繃缂栬緫姝� MSBuild 鏂囦欢
-鑷畾涔夋杩囩▼鐨勮涓恒�備负浜嗚В涓庢鐩稿叧鐨勬洿澶氬唴瀹癸紝璇疯闂� https://go.microsoft.com/fwlink/?LinkID=208121銆� 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <PublishProvider>FileSystem</PublishProvider>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>E:\Package\SGGL\Web</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx
index 39131980..eb87a094 100644
--- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx
+++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx
@@ -376,6 +376,13 @@
                                                 <f:TextBox ID="txtCallBackapiurl" runat="server" Label="鏂囨。淇濆瓨鍥炶皟鍦板潃" LabelWidth="230px"></f:TextBox>
                                             </Items>
                                         </f:FormRow>
+                                        <f:FormRow ColumnWidths="100%">
+                                            <Items>
+                                                <f:CheckBox ID="ckIsUseLoaclService" runat="server" Label="鏄惁浣跨敤鏈湴鏈嶅姟" LabelWidth="230px">
+                                                </f:CheckBox>
+                                            </Items>
+                                        </f:FormRow>
+
                                     </Rows>
                                 </f:Form>
                             </Items>
diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
index 299ff39e..f02f2c5e 100644
--- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
@@ -1048,6 +1048,18 @@ namespace FineUIPro.Web.SysManage
             {
                 txtCallBackapiurl.Text = sysSet3.ConstValue;
             }
+            var sysSet4 = (from x in db.Sys_Const where x.ConstText == "IsUseLoaclService" select x).ToList().FirstOrDefault();
+            if (sysSet4 != null)
+            {
+                if (sysSet4.ConstValue=="1")
+                {
+                    ckIsUseLoaclService .Checked=true;
+                }
+                else
+                {
+                    ckIsUseLoaclService.Checked = false;
+                }
+            }
         }
         protected void OnlineMenuSetSave_OnClick(object sender, EventArgs e)
         {
@@ -1115,6 +1127,36 @@ namespace FineUIPro.Web.SysManage
                 Funs.DB.Sys_Const.InsertOnSubmit(sysSet3);
                 Funs.DB.SubmitChanges();
             }
+            Model.Sys_Const sysSet4 = db.Sys_Const.FirstOrDefault(x => x.ConstText == "IsUseLoaclService");
+            if (sysSet4 != null)
+            {
+                if (ckIsUseLoaclService.Checked)
+                {
+                    sysSet4.ConstValue ="1";
+                }
+                else
+                {
+                    sysSet4.ConstValue = "0";
+                }
+
+                db.SubmitChanges();
+            }
+            else
+            {
+                sysSet4 = new Model.Sys_Const();
+                if (ckIsUseLoaclService.Checked)
+                {
+                    sysSet4.ConstValue = "1";
+                }
+                else
+                {
+                    sysSet4.ConstValue = "0";
+                }
+                sysSet4.ConstText = "IsUseLoaclService";
+                sysSet4.ID = SQLHelper.GetNewID();
+                Funs.DB.Sys_Const.InsertOnSubmit(sysSet4);
+                Funs.DB.SubmitChanges();
+            }
             ShowNotify("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs
index 2a80b251..5246388d 100644
--- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs
@@ -869,6 +869,15 @@ namespace FineUIPro.Web.SysManage
         /// </remarks>
         protected global::FineUIPro.TextBox txtCallBackapiurl;
 
+        /// <summary>
+        /// ckIsUseLoaclService 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckIsUseLoaclService;
+
         /// <summary>
         /// Toolbar5 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx
index 12b849a4..e41a5c8b 100644
--- a/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx
@@ -15,7 +15,7 @@
                     runat="server" EnableCollapse="true" DataKeyNames="PreRunId,ParentId,PreRunLevel" EnableTree="true"
                     TreeColumn="PreRunName" DataIDField="PreRunId" AllowPaging="true" DataParentIDField="ParentId" OnRowDataBound="Grid1_RowDataBound"
                     AllowCellEditing="false" ClicksToEdit="1" OnRowCommand="Grid1_RowCommand"
-                    EnableMultiSelect="false" EnableCheckBoxSelect="true" ExpandAllTreeNodes="true">
+                    EnableMultiSelect="true" EnableCheckBoxSelect="true" ExpandAllTreeNodes="true">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" runat="server">
                             <Items>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverProgress.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverProgress.aspx.cs
index 1c7eaacd..3590e1dd 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverProgress.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverProgress.aspx.cs
@@ -182,7 +182,7 @@ namespace FineUIPro.Web.TestRun
             string id = Grid1.DataKeys[e.RowIndex][0].ToString();
             if (e.CommandName == "AttachUrl")
             {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverProgress&menuId={1}", id, BLL.Const.DriverProgressMenuId)));
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverProgress&menuId={1}", id, BLL.Const.DriverProgressMenuId)));
             }
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
index 951ff6d7..bb05428f 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSchemeEdit.aspx.cs
@@ -151,8 +151,8 @@ namespace FineUIPro.Web.TestRun
                     options.Hidden = true;
                     optio.Hidden = true;
                     plApprove2.Hidden = true;
-                    txtCode.Text = SQLHelper.RunProcNewId2("SpGetNewCode3ByProjectId",
-                        "dbo.Solution_TestRunConstructSolution", "Code", CurrUser.LoginProjectId);
+                    //txtCode.Text = SQLHelper.RunProcNewId2("SpGetNewCode3ByProjectId",
+                    //    "dbo.Solution_TestRunConstructSolution", "Code", CurrUser.LoginProjectId);
                     this.txtSolutionType.Text = TestRunConstructSolutionService.ConvertSolutionType(Request.Params["SolutionType"]);
                     this.hdSolutionType.Text = Request.Params["SolutionType"];
                     TestRunConstructSolutionService.Init(drpHandleType, Const.TestRunConstructSolution_Compile, false);
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
index f85d259d..d7f7e6e4 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
@@ -18,16 +18,16 @@
                     <Rows>
                         <f:FormRow ColumnWidths="25% 30% 35%  10%">
                             <Items>
-                                <f:DropDownList ID="ddlSystemNo" runat="server" Label="System No" AutoPostBack="true"
-                                    OnSelectedIndexChanged="ddlSystemNo_SelectedIndexChanged" Width="300px" LabelWidth="100px">
+                                <f:DropDownList ID="ddlSubSysNo" runat="server" Label="Turnover System Code" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlSubSysNo_SelectedIndexChanged" Width="180px" LabelWidth="200px">
                                 </f:DropDownList>
                                 <f:DropDownList ID="ddlDateType" runat="server" Label="鏃ユ湡绫诲瀷" AutoPostBack="true"
-                                    OnSelectedIndexChanged="ddlDateType_SelectedIndexChanged" Width="200px" LabelWidth="80px">
+                                    OnSelectedIndexChanged="ddlDateType_SelectedIndexChanged" Width="120px" LabelWidth="100px">
                                     <f:ListItem Value="1" Text="涓�鍛�"></f:ListItem>
                                     <f:ListItem Value="2" Text="鏈堜唤"></f:ListItem>
                                 </f:DropDownList>
                                 <f:DropDownList ID="drpChartType" runat="server" Label="鍥惧舰绫诲瀷" AutoPostBack="true"
-                                    OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                    OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="120px" LabelWidth="100px">
                                     <f:ListItem Value="Line" Text="鎶樼嚎鍥�"></f:ListItem>
                                     <f:ListItem Value="Column" Text="鏌卞舰鍥�"></f:ListItem>
                                     <%--     <f:ListItem Value="Pie" Text="楗煎舰鍥�"></f:ListItem>
@@ -94,8 +94,6 @@
                                             </Columns>
                                         </f:GroupField>
 
-
-
                                         <f:GroupField HeaderText="A" TextAlign="Center" >
                                             <Columns>
                                                 <f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="鎬绘暟" TextAlign="Center" FieldType="Double" />
@@ -221,18 +219,19 @@
                             TitleToolTip="鍥惧舰">
                             <Items>
                                 <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
-                                    runat="server" BoxFlex="1" DataKeyNames="System_No" AllowCellEditing="true" EnableColumnLines="true"
-                                    ClicksToEdit="2" DataIDField="System_No" AllowSorting="true" OnSort="Grid3_Sort"
+                                    runat="server" BoxFlex="1" DataKeyNames="Sub_Sys_No" AllowCellEditing="true" EnableColumnLines="true"
+                                    ClicksToEdit="2" DataIDField="Sub_Sys_No" AllowSorting="true" OnSort="Grid3_Sort"
                                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid3_PageIndexChange"
                                     EnableRowDoubleClickEvent="true" EnableTextSelection="true"  EnableSummary="true">
                                     <Columns>
 
-                                        <f:BoundField  TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No."  minWidth="80px" />
+                                        <f:BoundField  TextAlign="Center" ColumnID="Sub_Sys_No" DataField="Sub_Sys_No" HeaderText="Turnover<br/>System<br/>Code"  Width="140px" />
 
                                         <f:GroupField HeaderText="鎬讳綋鎯呭喌" TextAlign="Center" >
                                             <Columns>
                                                 <f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="鎬绘暟" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="宸插畬鎴�" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="90px" ColumnID="allCountPercent" DataField="allCountPercent" HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
                                             </Columns>
@@ -244,6 +243,7 @@
                                             <Columns>
                                                 <f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="鎬绘暟" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="宸插畬鎴�" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="90px" ColumnID="Cat_A_CountPercent" DataField="Cat_A_CountPercent" HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
                                             </Columns>
@@ -253,6 +253,7 @@
                                             <Columns>
                                                 <f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="鎬绘暟" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="宸插畬鎴�" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="90px" ColumnID="Cat_B_CountPercent" DataField="Cat_B_CountPercent" HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
                                             </Columns>
@@ -262,6 +263,7 @@
                                             <Columns>
                                                 <f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="鎬绘暟" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="宸插畬鎴�" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="90px" ColumnID="Cat_C_CountPercent" DataField="Cat_C_CountPercent" HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
                                             </Columns>
@@ -271,6 +273,7 @@
                                             <Columns>
                                                 <f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="鎬绘暟" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="宸插畬鎴�" TextAlign="Center" FieldType="Double" />
+                                                <f:RenderField Width="90px" ColumnID="Cat_D_CountPercent" DataField="Cat_D_CountPercent" HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
                                                 <f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
                                             </Columns>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
index 52de22e5..8f67f4ca 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
@@ -18,17 +18,17 @@ namespace FineUIPro.Web.Transfer.Chart
         {
             if (!IsPostBack)
             {
-                ddlSystemNo.Hidden = true;
+                ddlSubSysNo.Hidden = true;
                 ddlDateType.Hidden = true;
                 drpChartType.Hidden = true;
                 BtnAnalyse.Hidden = true;
 
-                var systemNos = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).GroupBy(p => new { p.System_No }).Select(p => new { System_No = p.Key.System_No }).ToList();
+                var systemNos = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).GroupBy(p => new { p.Sub_Sys_No }).Select(p => new { SubSysNo = p.Key.Sub_Sys_No }).ToList();
                 int indexRow = 1;
-                ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
+                ddlSubSysNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
                 foreach (var t in systemNos)
                 {
-                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.System_No, t.System_No));
+                    ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SubSysNo, t.SubSysNo));
                     indexRow++;
                 }
                 AnalyseData();
@@ -62,13 +62,13 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </summary>
         private void AnalyseData()
         {
-            string _systemNo = ddlSystemNo.SelectedValue;
+            string _systemNo = ddlSubSysNo.SelectedValue;
             if (_systemNo == null)
                 _systemNo = "";
             _systemNo = _systemNo.Trim();
             //_systemNo涓虹┖鍒欐煡鍏ㄩ儴
             var forms = from x in Funs.DB.Transfer_PunchlistFrom
-                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.System_No == _systemNo || _systemNo == "")
+                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.Sub_Sys_No == _systemNo || _systemNo == "")
                         select x;
 
             string _dateType = ddlDateType.SelectedValue;
@@ -79,7 +79,7 @@ namespace FineUIPro.Web.Transfer.Chart
             {
                 #region 鍔犺浇灏鹃」瀹屾垚缁熻琛紙30澶╀互鍐咃級
                 var nowDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
-                for (var i = nowDate.AddDays(-30); i <= nowDate; i=i.AddDays(1))
+                for (var i = nowDate.AddDays(-30); i <= nowDate; i = i.AddDays(1))
                 {
                     //i鏄棩鏈�
 
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.Transfer.Chart
                     DateTime startTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 00:00:00");
                     DateTime endTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 23:59:59");
                     //褰撳ぉ璁″垝瀹屾垚閲�
-                    var dtjhwcl= forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
+                    var dtjhwcl = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
                     wcl1 += "'" + dtjhwcl + "',";
                     //褰撳ぉ瀹為檯瀹屾垚閲�
                     var dtsjwcl = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
@@ -96,12 +96,12 @@ namespace FineUIPro.Web.Transfer.Chart
                     var ljjhwcl = forms.Where(x => x.Required_Date <= endTime).Count();
                     wcl3 += "'" + ljjhwcl + "',";
                     //绱瀹為檯瀹屾垚閲�
-                    var ljsjwcl= forms.Where(x => x.Actual_Date <= endTime).Count();
+                    var ljsjwcl = forms.Where(x => x.Actual_Date <= endTime).Count();
                     wcl4 += "'" + ljsjwcl + "',";
 
-                    AllxDate += "'"+ d + "',";
+                    AllxDate += "'" + d + "',";
                 }
-                if (AllxDate.Length>0)
+                if (AllxDate.Length > 0)
                 {
                     AllxDate = AllxDate.Substring(0, AllxDate.Length - 1);
                     wcl1 = wcl1.Substring(0, wcl1.Length - 1);
@@ -239,7 +239,7 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
+        protected void ddlSubSysNo_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.AnalyseData();
             BindGrid1();
@@ -322,15 +322,15 @@ namespace FineUIPro.Web.Transfer.Chart
         {
             List<SqlParameter> listStr = new List<SqlParameter>();
             string _systemNo = string.Empty;
-            _systemNo = ddlSystemNo.SelectedValue;
+            _systemNo = ddlSubSysNo.SelectedValue;
             StringBuilder strSql = new StringBuilder("");
             strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp1') IS NOT NULL drop table #AllPunchlistFromSortTemp1; ");
             strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp1') IS NOT NULL drop table #PunchlistFromSortTemp1; ");
             strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp1 from  Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
             if (!string.IsNullOrWhiteSpace(_systemNo))
             {
-                strSql.AppendLine(" AND System_No=@System_No ");
-                listStr.Add(new SqlParameter("@System_No", _systemNo));
+                strSql.AppendLine(" AND Sub_Sys_No=@SubSysNo ");
+                listStr.Add(new SqlParameter("@SubSysNo", _systemNo));
             }
             strSql.AppendLine(@" select Disc,
                                  cast(0 as decimal(18, 2)) Cat_A_Count,
@@ -403,7 +403,7 @@ namespace FineUIPro.Web.Transfer.Chart
                 cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
                 cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
                 //
-                Cat_A_Countf+= Convert.ToInt32(row["Cat_A_Countf"]);
+                Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
                 Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
                 Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
 
@@ -465,15 +465,15 @@ namespace FineUIPro.Web.Transfer.Chart
         {
             List<SqlParameter> listStr = new List<SqlParameter>();
             string _systemNo = string.Empty;
-            _systemNo = ddlSystemNo.SelectedValue;
+            _systemNo = ddlSubSysNo.SelectedValue;
             StringBuilder strSql = new StringBuilder("");
             strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp2') IS NOT NULL drop table #AllPunchlistFromSortTemp2; ");
             strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp2') IS NOT NULL drop table #PunchlistFromSortTemp2; ");
             strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp2 from  Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
             if (!string.IsNullOrWhiteSpace(_systemNo))
             {
-                strSql.AppendLine(" AND System_No=@System_No ");
-                listStr.Add(new SqlParameter("@System_No", _systemNo));
+                strSql.AppendLine(" AND Sub_Sys_No=@SubSysNo ");
+                listStr.Add(new SqlParameter("@SubSysNo", _systemNo));
             }
             strSql.AppendLine(@" select Action_By,
                                  cast(0 as decimal(18, 2)) Cat_A_Count,
@@ -604,9 +604,9 @@ namespace FineUIPro.Web.Transfer.Chart
 
         protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
         {
-            if (TabStrip1.ActiveTabIndex ==0)
+            if (TabStrip1.ActiveTabIndex == 0)
             {
-                ddlSystemNo.Hidden = true;
+                ddlSubSysNo.Hidden = true;
                 ddlDateType.Hidden = true;
                 drpChartType.Hidden = true;
                 BtnAnalyse.Hidden = true;
@@ -614,7 +614,7 @@ namespace FineUIPro.Web.Transfer.Chart
             }
             else if (TabStrip1.ActiveTabIndex == 2)
             {
-                ddlSystemNo.Hidden = false;
+                ddlSubSysNo.Hidden = false;
                 ddlDateType.Hidden = true;
                 drpChartType.Hidden = true;
                 BtnAnalyse.Hidden = false;
@@ -622,7 +622,7 @@ namespace FineUIPro.Web.Transfer.Chart
             }
             else if (TabStrip1.ActiveTabIndex == 3)
             {
-                ddlSystemNo.Hidden = false;
+                ddlSubSysNo.Hidden = false;
                 ddlDateType.Hidden = true;
                 drpChartType.Hidden = true;
                 BtnAnalyse.Hidden = false;
@@ -632,13 +632,14 @@ namespace FineUIPro.Web.Transfer.Chart
             {
                 ddlDateType.Hidden = true;
                 drpChartType.Hidden = true;
-                ddlSystemNo.Hidden = true;
+                ddlSubSysNo.Hidden = true;
                 BtnAnalyse.Hidden = false;
                 BindGrid3();
             }
-            else {
+            else
+            {
                 this.AnalyseData();
-                ddlSystemNo.Hidden = false;
+                ddlSubSysNo.Hidden = false;
                 ddlDateType.Hidden = false;
                 drpChartType.Hidden = false;
                 BtnAnalyse.Hidden = false;
@@ -657,65 +658,72 @@ namespace FineUIPro.Web.Transfer.Chart
             strSql.AppendLine("IF OBJECT_ID('tempdb..#PunchlistFromProgressTemp') IS NOT NULL drop table #PunchlistFromProgressTemp; ");
 
             strSql.AppendLine(" select * INTO #AllPunchlistFromProgressTemp from  Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
-            //strSql.AppendLine(" select System_No,count(System_No) SystemNoCount,cast(0 as decimal(18,2)) ActualDateCount ");
+            //strSql.AppendLine(" select Sub_Sys_No,count(Sub_Sys_No) SystemNoCount,cast(0 as decimal(18,2)) ActualDateCount ");
             //strSql.AppendLine(" ,cast(0 as decimal(18,2)) ClearedByCount,cast(0 as decimal(18,2)) ConfirmedByCount,cast(0 as decimal(18,2)) VerifiedByCount ");
-            //strSql.AppendLine(" INTO #PunchlistFromProgressTemp from #AllPunchlistFromProgressTemp where ProjectId = @ProjectId group by System_No ");
-            //strSql.AppendLine(" update  a set a.ActualDateCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Actual_Date,'')<>'')  ");
-            //strSql.AppendLine(" ,a.ClearedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Cleared_By,'')<>'') ");
-            //strSql.AppendLine(" ,a.ConfirmedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Confirmed_By,'')<>'')  ");
-            //strSql.AppendLine(" ,a.VerifiedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Verified_By,'')<>'') ");
+            //strSql.AppendLine(" INTO #PunchlistFromProgressTemp from #AllPunchlistFromProgressTemp where ProjectId = @ProjectId group by Sub_Sys_No ");
+            //strSql.AppendLine(" update  a set a.ActualDateCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND isnull(b.Actual_Date,'')<>'')  ");
+            //strSql.AppendLine(" ,a.ClearedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND isnull(b.Cleared_By,'')<>'') ");
+            //strSql.AppendLine(" ,a.ConfirmedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND isnull(b.Confirmed_By,'')<>'')  ");
+            //strSql.AppendLine(" ,a.VerifiedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND isnull(b.Verified_By,'')<>'') ");
 
-            strSql.AppendLine(@" select System_No,
+            strSql.AppendLine(@" select Sub_Sys_No,
                                  cast(0 as decimal(18, 2)) Cat_A_Count,
-                                 cast(0 as decimal(18, 2)) Cat_A_Countf, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
+                                 cast(0 as decimal(18, 2)) Cat_A_Countf,cast(0 as decimal(18, 2)) Cat_A_CountPercent, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
                                  cast(0 as decimal(18, 2)) Cat_B_Count,
-                                 cast(0 as decimal(18, 2)) Cat_B_Countf, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
+                                 cast(0 as decimal(18, 2)) Cat_B_Countf,cast(0 as decimal(18, 2)) Cat_B_CountPercent, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
                                  cast(0 as decimal(18, 2)) Cat_C_Count,
-                                 cast(0 as decimal(18, 2)) Cat_C_Countf, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
+                                 cast(0 as decimal(18, 2)) Cat_C_Countf,cast(0 as decimal(18, 2)) Cat_C_CountPercent, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
                                  cast(0 as decimal(18, 2)) Cat_D_Count,
-                                 cast(0 as decimal(18, 2)) Cat_D_Countf, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
-                                 cast(0 as decimal(18, 2)) allCount, cast(0 as decimal(18, 2)) allfinshedCount, cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
+                                 cast(0 as decimal(18, 2)) Cat_D_Countf,cast(0 as decimal(18, 2)) Cat_D_CountPercent, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
+                                 cast(0 as decimal(18, 2)) allCount,cast(0 as decimal(18, 2)) allfinshedCount,cast(0 as decimal(18, 2)) allCountPercent,cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
                                  INTO #PunchlistFromProgressTemp 
-                                 from #AllPunchlistFromProgressTemp Group by System_No; ");
+                                 from #AllPunchlistFromProgressTemp Group by Sub_Sys_No; ");
             strSql.AppendLine(@" update  a set 
-                                 allCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No),
-                                 allfinshedCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No and (b.Required_Date is not null or b.Required_Date!='')),
-                                 allWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
-                                 allBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No and (b.Verified_Date is not null or b.Verified_Date!='')),
+                                 allCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No),
+                                 allfinshedCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Required_Date is not null or b.Required_Date!='')),
+                                 allWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
+                                 allBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Verified_Date is not null or b.Verified_Date!='')),
 
-                                 a.Cat_A_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
+                                 a.Cat_A_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
 
-                                 a.Cat_A_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')),
-                                 a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
-                                 a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
+                                 a.Cat_A_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')),
+                                 a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
+                                 a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
 
-                                 ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
+                                 ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
 
-                                 a.Cat_B_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')),
-                                 a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
-                                 a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
+                                 a.Cat_B_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')),
+                                 a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
+                                 a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
 
 
-                                ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
+                                ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
 
-                                a.Cat_C_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')),
-                                a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
-                                a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
+                                a.Cat_C_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')),
+                                a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
+                                a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
 
-                                ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
-                                a.Cat_D_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')),
-                                a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
-                                a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
+                                ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
+                                a.Cat_D_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')),
+                                a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
+                                a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
 
                                 from #PunchlistFromProgressTemp a;");
 
 
-           
+            strSql.AppendLine(@" update a set 
+                                a.Cat_A_CountPercent=(case ISNULL(a.Cat_A_Count,0) when 0 then 0 else  CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_A_Countf,0)*1.0/ISNULL(a.Cat_A_Count,0)))  end ),
+                                a.Cat_B_CountPercent=(case ISNULL(a.Cat_B_Count,0) when 0 then 0 else  CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_B_Countf,0)*1.0/ISNULL(a.Cat_B_Count,0)))  end ),
+                                a.Cat_C_CountPercent=(case ISNULL(a.Cat_C_Count,0) when 0 then 0 else  CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_C_Countf,0)*1.0/ISNULL(a.Cat_C_Count,0)))  end ),
+                                a.Cat_D_CountPercent=(case ISNULL(a.Cat_D_Count,0) when 0 then 0 else  CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_D_Countf,0)*1.0/ISNULL(a.Cat_D_Count,0)))  end ),
+                                a.allCountPercent=(case ISNULL(a.allCount,0) when 0 then 0 else  CONVERT(DECIMAL(10,2),100*(ISNULL(a.allfinshedCount,0)*1.0/ISNULL(a.allCount,0)))  end )
+                                from #PunchlistFromProgressTemp a; ");
+
             strSql.AppendLine(" select *  from #PunchlistFromProgressTemp ");
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
 
-            strSql.AppendLine(" order by System_No ");
+            strSql.AppendLine(" order by Sub_Sys_No ");
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
             Grid3.RecordCount = tb.Rows.Count;
@@ -734,13 +742,14 @@ namespace FineUIPro.Web.Transfer.Chart
                 Cat_C_Countf = 0, Cat_C_CountWUH = 0, Cat_C_CountBASF = 0,
                 Cat_D_Countf = 0, Cat_D_CountWUH = 0, Cat_D_CountBASF = 0,
                 allCount = 0, allfinshedCount = 0, allWUH = 0, allBASF = 0;
+
             foreach (DataRow row in tb.Rows)
             {
                 cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
                 cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
                 cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
                 cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
-                //
+
                 Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
                 Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
                 Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
@@ -763,36 +772,51 @@ namespace FineUIPro.Web.Transfer.Chart
                 allBASF += Convert.ToInt32(row["allBASF"]);
             }
 
+            //var Cat_A_CountPercent = 100 * ((float)Cat_A_Countf / (float)cat_A_Count);
+            //var Cat_B_CountPercent = 100 * ((float)Cat_B_Countf / (float)cat_B_Count);
+            //var Cat_C_CountPercent = 100 * ((float)Cat_C_Countf / (float)cat_C_Count);
+            //var Cat_D_CountPercent = 100 * ((float)Cat_D_Countf / (float)cat_D_Count);
+            //var allCountPercent = 100 * ((float)allfinshedCount / (float)allCount);
+
+            var Cat_A_CountPercent = Cat_A_Countf > 0 && cat_A_Count > 0 ? 100 * ((decimal)(Cat_A_Countf / cat_A_Count)) : 0;
+            var Cat_B_CountPercent = Cat_B_Countf > 0 && cat_B_Count > 0 ? 100 * ((decimal)(Cat_B_Countf / cat_B_Count)) : 0;
+            var Cat_C_CountPercent = Cat_C_Countf > 0 && cat_C_Count > 0 ? 100 * ((decimal)(Cat_C_Countf / cat_C_Count)) : 0;
+            var Cat_D_CountPercent = Cat_D_Countf > 0 && cat_D_Count > 0 ? 100 * ((decimal)(Cat_D_Countf / cat_D_Count)) : 0;
+            var allCountPercent = allfinshedCount > 0 && allCount > 0 ? 100 * ((decimal)(allfinshedCount / allCount)) : 0;
 
             JObject summary = new JObject();
-            summary.Add("System_No", "鍚堣");
+            summary.Add("SubSysNo", "鍚堣");
             summary.Add("Cat_A_Count", cat_A_Count.ToString());
             summary.Add("Cat_B_Count", cat_B_Count.ToString());
             summary.Add("Cat_C_Count", cat_C_Count.ToString());
             summary.Add("Cat_D_Count", cat_D_Count.ToString());
 
             summary.Add("Cat_A_Countf", Cat_A_Countf.ToString());
+            summary.Add("Cat_A_CountPercent", Cat_A_CountPercent.ToString("F2"));
             summary.Add("Cat_A_CountWUH", Cat_A_CountWUH.ToString());
             summary.Add("Cat_A_CountBASF", Cat_A_CountBASF.ToString());
 
             summary.Add("Cat_B_Countf", Cat_B_Countf.ToString());
+            summary.Add("Cat_B_CountPercent", Cat_B_CountPercent.ToString("F2"));
             summary.Add("Cat_B_CountWUH", Cat_B_CountWUH.ToString());
             summary.Add("Cat_B_CountBASF", Cat_B_CountBASF.ToString());
 
             summary.Add("Cat_C_Countf", Cat_C_Countf.ToString());
+            summary.Add("Cat_C_CountPercent", Cat_C_CountPercent.ToString("F2"));
             summary.Add("Cat_C_CountWUH", Cat_C_CountWUH.ToString());
             summary.Add("Cat_C_CountBASF", Cat_C_CountBASF.ToString());
 
             summary.Add("Cat_D_Countf", Cat_D_Countf.ToString());
+            summary.Add("Cat_D_CountPercent", Cat_D_CountPercent.ToString("F2"));
             summary.Add("Cat_D_CountWUH", Cat_D_CountWUH.ToString());
             summary.Add("Cat_D_CountBASF", Cat_D_CountBASF.ToString());
 
             summary.Add("allCount", allCount.ToString());
             summary.Add("allfinshedCount", allfinshedCount.ToString());
+            summary.Add("allCountPercent", allCountPercent.ToString("F2"));
             summary.Add("allWUH", allWUH.ToString());
             summary.Add("allBASF", allBASF.ToString());
 
-
             Grid3.SummaryData = summary;
         }
 
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
index 242da888..d8aff7bd 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
@@ -51,13 +51,13 @@ namespace FineUIPro.Web.Transfer.Chart
         protected global::FineUIPro.Form Form2;
 
         /// <summary>
-        /// ddlSystemNo 鎺т欢銆�
+        /// ddlSubSysNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlSystemNo;
+        protected global::FineUIPro.DropDownList ddlSubSysNo;
 
         /// <summary>
         /// ddlDateType 鎺т欢銆�
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
index 9fdbb1db..4251ea7c 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
@@ -12,149 +12,175 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="璁惧鏉愭枡鎶ラ獙" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="SystemNo" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="SystemNo" AllowSorting="true" 
+            <items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="绉讳氦缁熻琛�" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="SubSysNo" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="SubSysNo" AllowSorting="true"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true" AllowColumnLocking="true">
-                    <Toolbars>
+                    <toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:DropDownList ID="ddlSystemNo" runat="server" Label="System No" AutoPostBack="true" EnableEdit="true"
-                                    OnSelectedIndexChanged="ddlSystemNo_SelectedIndexChanged" Width="300px" LabelWidth="100px">
+                            <items>
+                                <f:DropDownList ID="ddlSubSysNo" runat="server" Label="Turnover System Code" AutoPostBack="true" EnableEdit="true"
+                                    OnSelectedIndexChanged="ddlSubSysNo_SelectedIndexChanged" Width="400px" LabelWidth="200px">
                                 </f:DropDownList>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="鏌ヨ">
                                 </f:Button>
 
-                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp"
-                                            EnableAjax="false" DisableControlBeforePostBack="false">
-                                </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                            </Items>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </items>
                         </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                         <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
+                    </toolbars>
+                    <columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="true">
-                            <ItemTemplate>
+                            <itemtemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                            </ItemTemplate>
+                            </itemtemplate>
                         </f:TemplateField>
-                       <%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
+                        <%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
                             HeaderTextAlign="Center" MinWidth="50px">
                         </f:RenderField>--%>
 
-                        <f:RenderField ColumnID="SystemNo" DataField="SystemNo"
-                            FieldType="String" HeaderText="SystemNo" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="120px" EnableLock="true" Locked="true">
+                        <f:RenderField ColumnID="SubSysNo" DataField="SubSysNo"
+                            FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="180px" EnableLock="true" Locked="true">
                         </f:RenderField>
 
-                        <f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
+                        <f:RenderField MinWidth="100px" ColumnID="PlanPWD" DataField="PlanPWD"
                             HeaderText="Plan PWD<br/>璁″垝PWD" TextAlign="Center"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
 
-                        <f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
+                        <f:RenderField MinWidth="110px" ColumnID="PlanJWD" DataField="PlanJWD"
                             HeaderText="Plan JWD<br/>璁″垝鑱斿悎妫�鏌�" TextAlign="Center"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
 
-                        <f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
+                        <f:RenderField MinWidth="100px" ColumnID="McPlan" DataField="McPlan"
                             HeaderText="MC Plan<br/>MC 璁″垝" TextAlign="Center"
-                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
+                            FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
 
-                        <f:GroupField HeaderText="Piping<br/>绠￠亾娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:RenderField MinWidth="50px" ColumnID="PipingCount" DataField="PipingCount"
-                                    HeaderText="鎬绘暟" TextAlign="Center" />
+                        <f:GroupField HeaderText="Welding<br/>绠￠亾鐒婃帴淇℃伅" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrTotalFactor" DataField="StrTotalFactor"
+                                    HeaderText="鎬昏揪鍥犳暟" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="50px" ColumnID="PipingScount" DataField="PipingScount"
-                                    HeaderText="瀹屾垚鏁�" TextAlign="Center" />
+                                <f:RenderField MinWidth="50px" ColumnID="StrCompleteFactor" DataField="StrCompleteFactor"
+                                    HeaderText="瀹屾垚杈惧洜鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="PipingPercent" DataField="PipingPercent"
+                                <f:RenderField MinWidth="30px" ColumnID="StrCompleteProportion" DataField="StrCompleteProportion"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                        <f:GroupField HeaderText="Equipment<br/>璁惧娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:RenderField MinWidth="50px" ColumnID="EqCount" DataField="EqCount"
+                        <f:GroupField HeaderText="Piping<br/>绠￠亾璇曞帇鍖�" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrPipingCount" DataField="StrPipingCount"
                                     HeaderText="鎬绘暟" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="50px" ColumnID="EqSCount" DataField="EqSCount"
+                                <f:RenderField MinWidth="30px" ColumnID="StrPipingScount" DataField="StrPipingScount"
                                     HeaderText="瀹屾垚鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="EqPercent" DataField="EqPercent"
+                                <f:RenderField MinWidth="30px" ColumnID="StrPipingPercent" DataField="StrPipingPercent"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                        <f:GroupField HeaderText="Electric<br/>鐢垫皵娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:RenderField MinWidth="50px" ColumnID="TeCount" DataField="TeCount"
+                        <f:GroupField HeaderText="Reinstate<br/>绠￠亾鍐叉礂鍚规壂&澶嶄綅淇℃伅" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrReinstateCount" DataField="StrReinstateCount"
                                     HeaderText="鎬绘暟" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="50px" ColumnID="TeScount" DataField="TeScount"
+                                <f:RenderField MinWidth="30px" ColumnID="StrReinstateScount" DataField="StrReinstateScount"
                                     HeaderText="瀹屾垚鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="TePercent" DataField="TePercent"
+                                <f:RenderField MinWidth="30px" ColumnID="StrReinstatePercent" DataField="StrReinstatePercent"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                        <f:GroupField HeaderText="instrument<br/>浠〃娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:RenderField MinWidth="50px" ColumnID="TiCount" DataField="TiCount"
+                        <f:GroupField HeaderText="Equipment<br/>璁惧娴嬭瘯鍖�" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrEqCount" DataField="StrEqCount"
                                     HeaderText="鎬绘暟" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="50px" ColumnID="TiScount" DataField="TiScount"
+                                <f:RenderField MinWidth="30px" ColumnID="StrEqSCount" DataField="StrEqSCount"
                                     HeaderText="瀹屾垚鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="TiPercent" DataField="TiPercent"
+                                <f:RenderField MinWidth="30px" ColumnID="StrEqPercent" DataField="StrEqPercent"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                         <f:GroupField HeaderText="Civil/Structure<br/>鍦熷缓/寤虹瓚/缁撴瀯娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:RenderField MinWidth="50px" ColumnID="TcsCount" DataField="TcsCount"
+                        <f:GroupField HeaderText="Electric<br/>鐢垫皵娴嬭瘯鍖�" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrTeCount" DataField="StrTeCount"
                                     HeaderText="鎬绘暟" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="50px" ColumnID="TcsScount" DataField="TcsScount"
+                                <f:RenderField MinWidth="30px" ColumnID="StrTeScount" DataField="StrTeScount"
                                     HeaderText="瀹屾垚鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="TcsPercent" DataField="TcsPercent"
+                                <f:RenderField MinWidth="30px" ColumnID="StrTePercent" DataField="StrTePercent"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                        <f:GroupField HeaderText="Firefighting<br/>娑堥槻娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:RenderField MinWidth="50px" ColumnID="TfCount" DataField="TfCount"
+                        <f:GroupField HeaderText="instrument<br/>浠〃娴嬭瘯鍖�" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrTiCount" DataField="StrTiCount"
                                     HeaderText="鎬绘暟" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="50px" ColumnID="TfScount" DataField="TfScount"
+                                <f:RenderField MinWidth="30px" ColumnID="StrTiScount" DataField="StrTiScount"
                                     HeaderText="瀹屾垚鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="TfPercent" DataField="TfPercent"
+                                <f:RenderField MinWidth="30px" ColumnID="StrTiPercent" DataField="StrTiPercent"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                        <f:GroupField HeaderText="Telecom<br/>鐢典俊娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:RenderField MinWidth="50px" ColumnID="TtCount" DataField="TtCount"
+                        <f:GroupField HeaderText="Civil/Structure<br/>鍦熷缓/寤虹瓚/缁撴瀯娴嬭瘯鍖�" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrTcsCount" DataField="StrTcsCount"
                                     HeaderText="鎬绘暟" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="50px" ColumnID="TtScount" DataField="TtScount"
+                                <f:RenderField MinWidth="30px" ColumnID="StrTcsScount" DataField="StrTcsScount"
                                     HeaderText="瀹屾垚鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="TtPercent" DataField="TtPercent"
+                                <f:RenderField MinWidth="30px" ColumnID="StrTcsPercent" DataField="StrTcsPercent"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                         <f:GroupField HeaderText="Plumbing<br/>鍦扮娴嬭瘯鍖�" TextAlign="Center" MinWidth="200px">
+                        <%--  <f:GroupField HeaderText="Firefighting<br/>娑堥槻娴嬭瘯鍖�" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField MinWidth="30px" ColumnID="TfCount" DataField="TfCount"
+                                    HeaderText="鎬绘暟" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="30px" ColumnID="TfScount" DataField="TfScount"
+                                    HeaderText="瀹屾垚鏁�" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="30px" ColumnID="TfPercent" DataField="TfPercent"
+                                    HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>--%>
+
+                        <f:GroupField HeaderText="Telecom<br/>鐢典俊娴嬭瘯鍖�" TextAlign="Center">
+                            <columns>
+                                <f:RenderField MinWidth="30px" ColumnID="StrTtCount" DataField="StrTtCount"
+                                    HeaderText="鎬绘暟" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="30px" ColumnID="StrTtScount" DataField="StrTtScount"
+                                    HeaderText="瀹屾垚鏁�" TextAlign="Center" />
+
+                                <f:RenderField MinWidth="30px" ColumnID="StrTtPercent" DataField="StrTtPercent"
+                                    HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
+                            </columns>
+                        </f:GroupField>
+
+                        <%--<f:GroupField HeaderText="Plumbing<br/>鍦扮娴嬭瘯鍖�" TextAlign="Center" >
                             <Columns>
                                 <f:RenderField MinWidth="50px" ColumnID="TpCount" DataField="TpCount"
                                     HeaderText="鎬绘暟" TextAlign="Center" />
@@ -162,26 +188,34 @@
                                 <f:RenderField MinWidth="50px" ColumnID="TpScount" DataField="TpScount"
                                     HeaderText="瀹屾垚鏁�" TextAlign="Center" />
 
-                                <f:RenderField MinWidth="80px" ColumnID="TpPercent" DataField="TpPercent"
+                                <f:RenderField MinWidth="30px" ColumnID="TpPercent" DataField="TpPercent"
                                     HeaderText="瀹屾垚鐜�(%)" TextAlign="Center" />
                             </Columns>
-                        </f:GroupField>
+                        </f:GroupField>--%>
 
-                        <f:TemplateField ColumnID="Count4" minWidth="120px" HeaderText="Total<br/>completion<br/>percentage<br/>鎬诲畬鎴愮巼锛�%锛�" HeaderTextAlign="Center" TextAlign="Right">
-                            <ItemTemplate>
-                                <asp:Label ID="Label5" runat="server" Text='<%# totalper(Eval("SystemNo")) %>'></asp:Label>
-                            </ItemTemplate>
+                        <f:TemplateField ColumnID="Count4" MinWidth="120px" HeaderText="Total<br/>completion<br/>鎬诲畬鎴愮巼锛�%锛�" HeaderTextAlign="Center" TextAlign="Right">
+                            <itemtemplate>
+                                <asp:Label ID="Label5" runat="server" Text='<%# totalper(Eval("SubSysNo")) %>'></asp:Label>
+                            </itemtemplate>
                         </f:TemplateField>
 
-                            <f:RenderField MinWidth="140px" ColumnID="SubmitPackage" DataField="SubmitPackage"
-                            HeaderText="Submit Package<br/>绯荤粺鍖呮彁浜� " TextAlign="Center"
-                            FieldType="String"/>
+                        <f:RenderField MinWidth="120px" ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing"
+                            HeaderText="electric heat<br/> tracing<br/>鐢典即鐑� " TextAlign="Center"
+                            FieldType="String" />
 
-                         <f:RenderField MinWidth="120px" ColumnID="ActualPWD" DataField="ActualPWD"
+                        <f:RenderField MinWidth="120px" ColumnID="Insulation" DataField="Insulation"
+                            HeaderText="Insulation<br/>淇濇俯/鍐� " TextAlign="Center"
+                            FieldType="String" />
+
+                        <f:RenderField MinWidth="130px" ColumnID="SubmitPackage" DataField="SubmitPackage"
+                            HeaderText="Submit Package<br/>绯荤粺鍖呮彁浜� " TextAlign="Center"
+                            FieldType="String" />
+
+                        <f:RenderField MinWidth="120px" ColumnID="ActualPWD" DataField="ActualPWD"
                             HeaderText="Actual PWD<br/>瀹為檯棰勮仈鍚堟鏌�" TextAlign="Center"
                             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
-                         <f:GroupField HeaderText="PWD Punch items <br/>outstanding 鏈畬鎴愭暟" TextAlign="Center" MinWidth="200px">
+                        <%--<f:GroupField HeaderText="PWD Punch items <br/>outstanding 鏈畬鎴愭暟" TextAlign="Center" MinWidth="200px">
                             <Columns>
                                 <f:RenderField MinWidth="50px" ColumnID="pwdACount" DataField="pwdACount"
                                     HeaderText="A" TextAlign="Center" />
@@ -192,7 +226,7 @@
                                 <f:RenderField MinWidth="50px" ColumnID="pwdCCount" DataField="pwdCCount"
                                     HeaderText="C" TextAlign="Center" />
                             </Columns>
-                        </f:GroupField>
+                        </f:GroupField>--%>
 
 
                         <f:RenderField MinWidth="120px" ColumnID="ActualJWD" DataField="ActualJWD"
@@ -200,7 +234,7 @@
                             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
 
-                        <f:GroupField HeaderText="FWD Punch items  <br/>outstanding 鏈畬鎴愭暟" TextAlign="Center" MinWidth="200px">
+                        <%--<f:GroupField HeaderText="FWD Punch items  <br/>outstanding 鏈畬鎴愭暟" TextAlign="Center" MinWidth="200px">
                             <Columns>
                                 <f:RenderField MinWidth="50px" ColumnID="fwdACount" DataField="fwdACount"
                                     HeaderText="A" TextAlign="Center" />
@@ -211,7 +245,7 @@
                                 <f:RenderField MinWidth="50px" ColumnID="fwdCCount" DataField="fwdCCount"
                                     HeaderText="C" TextAlign="Center" />
                             </Columns>
-                        </f:GroupField>
+                        </f:GroupField>--%>
 
 
                         <f:RenderField MinWidth="120px" ColumnID="ActualMC" DataField="ActualMC"
@@ -219,35 +253,35 @@
                             FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
 
-                          <f:RenderField MinWidth="120px" ColumnID="Commissioning" DataField="Commissioning"
+                        <f:RenderField MinWidth="120px" ColumnID="Commissioning" DataField="Commissioning"
                             HeaderText="Commissioning<br/>璇曡繍琛� " TextAlign="Center"
-                            FieldType="String"/>
+                            FieldType="String" />
 
-                          <f:RenderField MinWidth="120px" ColumnID="IaQian" DataField="IaQian"
+                        <f:RenderField MinWidth="120px" ColumnID="IaQian" DataField="IaQian"
                             HeaderText="IA绛剧讲 " TextAlign="Center"
-                            FieldType="String"/>
+                            FieldType="String" />
 
-                          <f:RenderField MinWidth="120px" ColumnID="TcccQ" DataField="TcccQ"
+                        <f:RenderField MinWidth="120px" ColumnID="TcccQ" DataField="TcccQ"
                             HeaderText="TCCC绛剧讲" TextAlign="Center"
-                            FieldType="String"/>
+                            FieldType="String" />
 
-                          <f:RenderField MinWidth="120px" ColumnID="SystemStatus" DataField="SystemStatus"
+                        <f:RenderField MinWidth="120px" ColumnID="SystemStatus" DataField="SystemStatus"
                             HeaderText="System Status<br/>绯荤粺鐘舵�� " TextAlign="Center"
-                            FieldType="String"/>
+                            FieldType="String" />
 
-                          <f:RenderField MinWidth="160px" ColumnID="TurnoverDescription" DataField="TurnoverDescription"
-                            HeaderText="Turnover Description" TextAlign="Center"
-                            FieldType="String"/>
+                        <f:RenderField MinWidth="120px" ColumnID="TurnoverDescription" DataField="TurnoverDescription"
+                            HeaderText="Turnover<br/>Description" TextAlign="Center"
+                            FieldType="String" />
 
                         <f:RenderField MinWidth="120px" ColumnID="Remark" DataField="Remark"
                             HeaderText="Remark<br/>澶囨敞" TextAlign="Center"
-                            FieldType="String"/>
+                            FieldType="String" />
 
-                    </Columns>
-                     <Listeners>
+                    </columns>
+                    <listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
+                    </listeners>
+                    <pageitems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -257,19 +291,19 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="鎵�鏈夎" Value="100000" />
                         </f:DropDownList>
-                    </PageItems>
+                    </pageitems>
                 </f:Grid>
-            </Items>
+            </items>
         </f:Panel>
-           <f:Window ID="Window1" Title="淇敼" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="淇敼" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
             Height="600px">
         </f:Window>
-         <f:Menu ID="Menu1" runat="server">
-            <Items>
+        <f:Menu ID="Menu1" runat="server">
+            <items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
-            </Items>
+            </items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index 489cb0c2..f3e0c40a 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -28,13 +28,13 @@ namespace FineUIPro.Web.Transfer.Chart
             {
                 var systemCode = Funs.DB.Transfer_LHCSystemList
                     .Where(x => x.ProjectId == CurrUser.LoginProjectId)
-                    .GroupBy(p => new { p.SystemNo })
-                    .Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
+                    .GroupBy(p => new { p.Commissioningsystemcode })
+                    .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
                 int indexRow = 1;
-                ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
+                ddlSubSysNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
                 foreach (var t in systemCode)
                 {
-                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SystemNo, t.SystemNo));
+                    ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode));
                     indexRow++;
                 }
 
@@ -45,171 +45,132 @@ namespace FineUIPro.Web.Transfer.Chart
 
         public DataTable DataSql()
         {
-            string strSql = @"
-                    select f.SystemNo,f.ProjectId,
-                    ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount,
-                    case ISNULL(tpi.PipingCount,0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(tpi1.PipingScount,0)*1.0/ISNULL(tpi.PipingCount,0)))  end PipingPercent,
+            string strSql = @"select f.SubSysNo,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
+case ISNULL(tpi3.TotalFactor,0) when 0 then 0
+else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0)))  end CompleteProportion,
 
-                    ISNULL((TseCount+TreCount),0) as EqCount,ISNULL((TseSCount+TreSCount),0) as EqScount,
-                    case ISNULL((TseCount+TreCount),0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100 *(ISNULL((TseSCount+TreSCount),0)*1.0/ISNULL((TseCount+TreCount),0))) end EqPercent,
+ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount,
+case ISNULL(tpi.PipingCount,0)
+when 0 then 0
+else  CONVERT(DECIMAL(10,2),100*(ISNULL(tpi1.PipingScount,0)*1.0/ISNULL(tpi.PipingCount,0)))  end PipingPercent,
+ISNULL(tpi.PipingCount,0) ReinstateCount,ISNULL(tpi2.ReinstateScount,0) ReinstateScount,
+case ISNULL(tpi.PipingCount,0)
+when 0 then 0
+else  CONVERT(DECIMAL(10,2),100*(ISNULL(tpi2.ReinstateScount,0)*1.0/ISNULL(tpi.PipingCount,0)))  end ReinstatePercent,
 
-                    ISNULL(TeCount,0) TeCount,ISNULL(TeScount,0) TeScount,
-                    case ISNULL(TeCount,0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TeScount,0)*1.0/ISNULL(TeCount,0)))  end TePercent,
+(ISNULL(TseCount,0)+ISNULL(TreCount,0)) as EqCount,ISNULL((ISNULL(TseSCount,0)+ISNULL(TreSCount,0)),0) as EqScount,
+case (ISNULL(TseCount,0)+ISNULL(TreCount,0))
+when 0 then 0
+else  CONVERT(DECIMAL(10,2),100 *(((ISNULL(TseSCount,0)+ISNULL(TreSCount,0))*1.0/(ISNULL(TseCount,0)+ISNULL(TreCount,0))))) end EqPercent,
 
-                    ISNULL(TiCount,0) TiCount,ISNULL(TiScount,0) TiScount,
-                    case ISNULL(TiCount,0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TiScount,0)*1.0/ISNULL(TiCount,0)))  end TiPercent,
+ISNULL(TeCount,0) TeCount,ISNULL(TeScount,0) TeScount,
+case ISNULL(TeCount,0)
+when 0 then 0
+else  CONVERT(DECIMAL(10,2),100*(ISNULL(TeScount,0)*1.0/ISNULL(TeCount,0)))  end TePercent,
 
-                    ISNULL(TcsCount,0) TcsCount,ISNULL(TcsScount,0) TcsScount,
-                    case ISNULL(TcsCount,0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TcsScount,0)*1.0/ISNULL(TcsCount,0)))  end TcsPercent,
+ISNULL(TiCount,0) TiCount,ISNULL(TiScount,0) TiScount,
+case ISNULL(TiCount,0)
+when 0 then 0
+else  CONVERT(DECIMAL(10,2),100*(ISNULL(TiScount,0)*1.0/ISNULL(TiCount,0)))  end TiPercent,
 
-                    ISNULL(TfCount,0) TfCount,ISNULL(TfScount,0) TfScount,
-                    case ISNULL(TfCount,0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TfScount,0)*1.0/ISNULL(TfCount,0)))  end TfPercent,
+ISNULL(TcsCount,0) TcsCount,ISNULL(TcsScount,0) TcsScount,
+case ISNULL(TcsCount,0)
+when 0 then 0
+else  CONVERT(DECIMAL(10,2),100*(ISNULL(TcsScount,0)*1.0/ISNULL(TcsCount,0)))  end TcsPercent,
 
-                    ISNULL(TtCount,0) TtCount,ISNULL(TtScount,0) TtScount,
-                    case ISNULL(TtCount,0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0)))  end TtPercent,
+ISNULL(TtCount,0) TtCount,ISNULL(TtScount,0) TtScount,
+case ISNULL(TtCount,0)
+when 0 then 0
+else  CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0)))  end TtPercent,
 
-                    ISNULL(TpCount,0) TpCount,ISNULL(TpScount,0) TpScount,
+ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark
 
-                    case ISNULL(TpCount,0)
-                    when 0 then 0
-                    else  CONVERT(DECIMAL(10,2),100*(ISNULL(TpScount,0)*1.0/ISNULL(TpCount,0)))  end TpPercent,
+from(
+SELECT Commissioningsystemcode as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by Commissioningsystemcode,ProjectId
+) f
+left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
+--piping
 
-                    ts.PlanPWD,PlanJWD,McPlan,
-                    SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,
-                    IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark,
-                    ISNULL(pwdACount,0) pwdACount,ISNULL(pwdBCount,0) pwdBCount,ISNULL(pwdCCount,0) pwdCCount,
-                    ISNULL(fwdACount,0) fwdACount,ISNULL(fwdBCount,0) fwdBCount,ISNULL(fwdCCount,0) fwdCCount
-                    from(
-                    SELECT SystemNo,ProjectId FROM Transfer_LHCSystemList group by SystemNo,ProjectId
-                    ) f
-                    left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SystemNo=ts.SystemNo
-                    --piping
-                    left join (select count(*)as PipingCount,ProjectId,SYSTEM from Transfer_Piping
-                    group by ProjectId,SYSTEM)
-                    tpi on f.ProjectId=tpi.ProjectId and f.SystemNo=tpi.SYSTEM
+left join (select count(*)as PipingCount,ProjectId,TestPackage from Transfer_Piping
+group by ProjectId,TestPackage)
+tpi on f.ProjectId=tpi.ProjectId and f.SubSysNo=tpi.TestPackage
 
-                    left join (select count(*)as PipingScount,ProjectId,SYSTEM from Transfer_Piping where FINALStatus='Completed'
-                    group by ProjectId,SYSTEM)
-                    tpi1 on f.ProjectId=tpi1.ProjectId and f.SystemNo=tpi1.SYSTEM
-                    --璁惧娴嬭瘯鍖�
-                    left join (select count(*)as TseCount,ProjectId,SYSTEM from Transfer_StaticEquipment
-                    group by ProjectId,SYSTEM)
-                    tse on f.ProjectId=tse.ProjectId and f.SystemNo=tse.SYSTEM
+left join (select count(*)as PipingScount,ProjectId,TestPackage from Transfer_Piping where FINALStatus='Completed'
+group by ProjectId,TestPackage)
+tpi1 on f.ProjectId=tpi1.ProjectId and f.SubSysNo=tpi1.TestPackage
 
-                    left join (select count(*)as TseSCount,ProjectId,SYSTEM from Transfer_StaticEquipment where MechanicalFINALStatus='Completed'
-                    group by ProjectId,SYSTEM)
-                    tse1 on f.ProjectId=tse1.ProjectId and f.SystemNo=tse1.SYSTEM
-                    --
-                    left join (select count(*)as TreCount,ProjectId,SYSTEM from Transfer_RotatingEquipment
-                    group by ProjectId,SYSTEM)
-                    tre on f.ProjectId=tre.ProjectId and f.SystemNo=tre.SYSTEM
+left join (select count(*)as ReinstateScount,ProjectId,TestPackage from Transfer_Piping where Reduction='Completed'
+group by ProjectId,TestPackage)
+tpi2 on f.ProjectId=tpi2.ProjectId and f.SubSysNo=tpi2.TestPackage
 
-                    left join (select count(*)as TreSCount,ProjectId,SYSTEM from Transfer_RotatingEquipment where MechanicalFINALStatus='Completed'
-                    group by ProjectId,SYSTEM)
-                    tre1 on f.ProjectId=tre1.ProjectId and f.SystemNo=tre1.SYSTEM
+left join (select sum(TotalFactor) as TotalFactor,sum(CompleteFactor) as CompleteFactor,ProjectId,TestPackage from Transfer_Piping 
+group by ProjectId,TestPackage)
+tpi3 on f.ProjectId=tpi3.ProjectId and f.SubSysNo=tpi3.TestPackage
 
-                    --Transfer_Electrical
-                    left join (select count(*)as TeCount,ProjectId,SystemName from Transfer_Electrical
-                    group by ProjectId,SystemName)
-                    te on f.ProjectId=te.ProjectId and f.SystemNo=te.SystemName
+--璁惧娴嬭瘯鍖�
+left join (select count(*)as TseCount,ProjectId,TestPackage from Transfer_StaticEquipment
+group by ProjectId,TestPackage)
+tse on f.ProjectId=tse.ProjectId and f.SubSysNo=tse.TestPackage
 
-                    left join (select count(*)as TeScount,ProjectId,SystemName from Transfer_Electrical where FINAL_Status='Completed'
-                    group by ProjectId,SystemName)
-                    te1 on f.ProjectId=te1.ProjectId and f.SystemNo=te1.SystemName
+left join (select count(*)as TseSCount,ProjectId,TestPackage from Transfer_StaticEquipment where MechanicalFINALStatus='Completed'
+group by ProjectId,TestPackage)
+tse1 on f.ProjectId=tse1.ProjectId and f.SubSysNo=tse1.TestPackage
+--
+left join (select count(*)as TreCount,ProjectId,TestPackage from Transfer_RotatingEquipment
+group by ProjectId,TestPackage)
+tre on f.ProjectId=tre.ProjectId and f.SubSysNo=tre.TestPackage
 
-                    --Transfer_Instrumentation
-                    left join (select count(*)as TiCount,ProjectId,SystemName from Transfer_Instrumentation
-                    group by ProjectId,SystemName)
-                    ti on f.ProjectId=ti.ProjectId and f.SystemNo=ti.SystemName
+left join (select count(*)as TreSCount,ProjectId,TestPackage from Transfer_RotatingEquipment where MechanicalFINALStatus='Completed'
+group by ProjectId,TestPackage)
+tre1 on f.ProjectId=tre1.ProjectId and f.SubSysNo=tre1.TestPackage
 
-                    left join (select count(*)as TiScount,ProjectId,SystemName from Transfer_Instrumentation where FINAL_Status='Completed'
-                    group by ProjectId,SystemName)
-                    ti1 on f.ProjectId=ti1.ProjectId and f.SystemNo=ti1.SystemName
+--Transfer_Electrical
+left join (select count(*)as TeCount,ProjectId,Test_Package from Transfer_Electrical
+group by ProjectId,Test_Package)
+te on f.ProjectId=te.ProjectId and f.SubSysNo=te.Test_Package
 
-                    --Transfer_Civil_Structure
-                    left join (select count(*)as TcsCount,ProjectId,SystemName from Transfer_Civil_Structure
-                    group by ProjectId,SystemName)
-                    tcs on f.ProjectId=tcs.ProjectId and f.SystemNo=tcs.SystemName
+left join (select count(*)as TeScount,ProjectId,Test_Package from Transfer_Electrical where FINAL_Status='Completed'
+group by ProjectId,Test_Package)
+te1 on f.ProjectId=te1.ProjectId and f.SubSysNo=te1.Test_Package
 
-                    left join (select count(*)as TcsScount,ProjectId,SystemName from Transfer_Civil_Structure where FINAL_Status='Completed'
-                    group by ProjectId,SystemName)
-                    tcs1 on f.ProjectId=tcs1.ProjectId and f.SystemNo=tcs1.SystemName
+--Transfer_Instrumentation
+left join (select count(*)as TiCount,ProjectId,Test_Package from Transfer_Instrumentation
+group by ProjectId,Test_Package)
+ti on f.ProjectId=ti.ProjectId and f.SubSysNo=ti.Test_Package
 
-                    --Transfer_Firefighting
-                    left join (select count(*)as TfCount,ProjectId,SystemName from Transfer_Firefighting
-                    group by ProjectId,SystemName)
-                    tf on f.ProjectId=tf.ProjectId and f.SystemNo=tf.SystemName
+left join (select count(*)as TiScount,ProjectId,Test_Package from Transfer_Instrumentation where FINAL_Status='Completed'
+group by ProjectId,Test_Package)
+ti1 on f.ProjectId=ti1.ProjectId and f.SubSysNo=ti1.Test_Package
 
-                    left join (select count(*)as TfScount,ProjectId,SystemName from Transfer_Firefighting where FINAL_Status='Completed'
-                    group by ProjectId,SystemName)
-                    tf1 on f.ProjectId=tf1.ProjectId and f.SystemNo=tf1.SystemName
+--Transfer_Civil_Structure
+left join (select count(*)as TcsCount,ProjectId,Test_Package from Transfer_Civil_Structure
+group by ProjectId,Test_Package)
+tcs on f.ProjectId=tcs.ProjectId and f.SubSysNo=tcs.Test_Package
 
-                    --Transfer_Telecom
-                    left join (select count(*)as TtCount,ProjectId,SystemName from Transfer_Telecom
-                    group by ProjectId,SystemName)
-                    Tt on f.ProjectId=Tt.ProjectId and f.SystemNo=Tt.SystemName
+left join (select count(*)as TcsScount,ProjectId,Test_Package from Transfer_Civil_Structure where FINAL_Status='Completed'
+group by ProjectId,Test_Package)
+tcs1 on f.ProjectId=tcs1.ProjectId and f.SubSysNo=tcs1.Test_Package
 
-                    left join (select count(*)as TtScount,ProjectId,SystemName from Transfer_Telecom where FINAL_Status='Completed'
-                    group by ProjectId,SystemName)
-                    Tt1 on f.ProjectId=Tt1.ProjectId and f.SystemNo=Tt1.SystemName
+--Transfer_Telecom
+left join (select count(*)as TtCount,ProjectId,Test_Package from Transfer_Telecom
+group by ProjectId,Test_Package)
+Tt on f.ProjectId=Tt.ProjectId and f.SubSysNo=Tt.Test_Package
 
-                    --Transfer_Plumbing
-                    left join (select count(*)as TpCount,ProjectId,SystemName from Transfer_Plumbing
-                    group by ProjectId,SystemName)
-                    tp on f.ProjectId=tp.ProjectId and f.SystemNo=tp.SystemName
+left join (select count(*)as TtScount,ProjectId,Test_Package from Transfer_Telecom where FINAL_Status='Completed'
+group by ProjectId,Test_Package)
+Tt1 on f.ProjectId=Tt1.ProjectId and f.SubSysNo=Tt1.Test_Package 
 
-                    left join (select count(*)as TpScount,ProjectId,SystemName from Transfer_Plumbing where FINAL_Status='Completed'
-                    group by ProjectId,SystemName)
-                    tp1 on f.ProjectId=tp1.ProjectId and f.SystemNo=tp1.SystemName
-                    
-                    left join (select count(*) as pwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
-                    and Punch_Type='PWD' and Cat='A' group by ProjectId,System_No)
-                    tpA on f.ProjectId=tpA.ProjectId and f.SystemNo=tpA.System_No
+where f.ProjectId = @ProjectId";
 
-                    left join (select count(*) as pwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
-                    and Punch_Type='PWD' and Cat='B' group by ProjectId,System_No)
-                    tpB on f.ProjectId=tpB.ProjectId and f.SystemNo=tpB.System_No
-
-                    left join (select count(*) as pwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
-                    and Punch_Type='PWD' and Cat='C' group by ProjectId,System_No)
-                    tpC on f.ProjectId=tpC.ProjectId and f.SystemNo=tpC.System_No
-
-                    left join (select count(*) as fwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
-                    and Punch_Type='FWD' and Cat='A' group by ProjectId,System_No)
-                    tpfA on f.ProjectId=tpfA.ProjectId and f.SystemNo=tpfA.System_No
-
-                    left join (select count(*) as fwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
-                    and Punch_Type='FWD' and Cat='B' group by ProjectId,System_No)
-                    tpfB on f.ProjectId=tpfB.ProjectId and f.SystemNo=tpfB.System_No
-
-                    left join (select count(*) as fwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
-                    and Punch_Type='FWD' and Cat='C' group by ProjectId,System_No)
-                    tpfC on f.ProjectId=tpfC.ProjectId and f.SystemNo=tpfC.System_No
-
-                              where f.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
 
-            if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue))
+            if (!string.IsNullOrEmpty(ddlSubSysNo.SelectedValue))
             {
-                strSql += " AND SystemNo='" + ddlSystemNo.SelectedValue + "' ";
+                strSql += " AND f.SubSysNo='" + ddlSubSysNo.SelectedValue + "' ";
             }
 
-            strSql += " order by SystemNo ";
+            strSql += " order by f.SubSysNo ";
             SqlParameter[] parameter = listStr.ToArray();
             return SQLHelper.GetDataTableRunText(strSql, parameter);
         }
@@ -222,6 +183,187 @@ namespace FineUIPro.Web.Transfer.Chart
             DataTable tb = DataSql();
             Grid1.RecordCount = tb.Rows.Count;
             var table = this.GetPagedDataTable(Grid1, tb);
+            // 娣诲姞绠￠亾鐒婃帴淇℃伅
+            DataColumn StrTotalFactor = new DataColumn("StrTotalFactor", typeof(string));
+            DataColumn StrCompleteFactor = new DataColumn("StrCompleteFactor", typeof(string));
+            DataColumn StrCompleteProportion = new DataColumn("StrCompleteProportion", typeof(string));
+            table.Columns.Add(StrTotalFactor);
+            table.Columns.Add(StrCompleteFactor);
+            table.Columns.Add(StrCompleteProportion);
+            // 娣诲姞绠￠亾璇曞帇鍖�
+            DataColumn StrPipingCount = new DataColumn("StrPipingCount", typeof(string));
+            DataColumn StrPipingScount = new DataColumn("StrPipingScount", typeof(string));
+            DataColumn StrPipingPercent = new DataColumn("StrPipingPercent", typeof(string));
+            table.Columns.Add(StrPipingCount);
+            table.Columns.Add(StrPipingScount);
+            table.Columns.Add(StrPipingPercent);
+            // 绠￠亾鍐叉礂鍚规壂&澶嶄綅淇℃伅
+            DataColumn StrReinstateCount = new DataColumn("StrReinstateCount", typeof(string));
+            DataColumn StrReinstateScount = new DataColumn("StrReinstateScount", typeof(string));
+            DataColumn StrReinstatePercent = new DataColumn("StrReinstatePercent", typeof(string));
+            table.Columns.Add(StrReinstateCount);
+            table.Columns.Add(StrReinstateScount);
+            table.Columns.Add(StrReinstatePercent);
+            // 璁惧娴嬭瘯鍖�
+            DataColumn StrEqCount = new DataColumn("StrEqCount", typeof(string));
+            DataColumn StrEqSCount = new DataColumn("StrEqSCount", typeof(string));
+            DataColumn StrEqPercent = new DataColumn("StrEqPercent", typeof(string));
+            table.Columns.Add(StrEqCount);
+            table.Columns.Add(StrEqSCount);
+            table.Columns.Add(StrEqPercent);
+            // 鐢垫皵娴嬭瘯鍖�
+            DataColumn StrTeCount = new DataColumn("StrTeCount", typeof(string));
+            DataColumn StrTeScount = new DataColumn("StrTeScount", typeof(string));
+            DataColumn StrTePercent = new DataColumn("StrTePercent", typeof(string));
+            table.Columns.Add(StrTeCount);
+            table.Columns.Add(StrTeScount);
+            table.Columns.Add(StrTePercent);
+            // 浠〃娴嬭瘯鍖�
+            DataColumn StrTiCount = new DataColumn("StrTiCount", typeof(string));
+            DataColumn StrTiScount = new DataColumn("StrTiScount", typeof(string));
+            DataColumn StrTiPercent = new DataColumn("StrTiPercent", typeof(string));
+            table.Columns.Add(StrTiCount);
+            table.Columns.Add(StrTiScount);
+            table.Columns.Add(StrTiPercent);
+            // 鍦熷缓/寤虹瓚/缁撴瀯娴嬭瘯鍖�
+            DataColumn StrTcsCount = new DataColumn("StrTcsCount", typeof(string));
+            DataColumn StrTcsScount = new DataColumn("StrTcsScount", typeof(string));
+            DataColumn StrTcsPercent = new DataColumn("StrTcsPercent", typeof(string));
+            table.Columns.Add(StrTcsCount);
+            table.Columns.Add(StrTcsScount);
+            table.Columns.Add(StrTcsPercent);
+            // 鐢典俊娴嬭瘯鍖�
+            DataColumn StrTtCount = new DataColumn("StrTtCount", typeof(string));
+            DataColumn StrTtScount = new DataColumn("StrTtScount", typeof(string));
+            DataColumn StrTtPercent = new DataColumn("StrTtPercent", typeof(string));
+            table.Columns.Add(StrTtCount);
+            table.Columns.Add(StrTtScount);
+            table.Columns.Add(StrTtPercent);
+
+            // 閬嶅巻鎵�鏈夎
+            foreach (DataRow row in table.Rows)
+            {
+                //绠￠亾鐒婃帴淇℃伅-鎬昏揪鍥犳暟
+                //string TotalFactor = row["TotalFactor"].ToString();
+                //if (string.IsNullOrWhiteSpace(TotalFactor) || TotalFactor == "0.0" || TotalFactor == "0")
+                if (string.IsNullOrWhiteSpace(row["TotalFactor"].ToString()) || (decimal)row["TotalFactor"] == 0)
+                {
+                    row["StrTotalFactor"] = "NA";
+                    row["StrCompleteFactor"] = "NA";
+                    row["StrCompleteProportion"] = "NA";
+                }
+                else
+                {
+                    row["StrTotalFactor"] = row["TotalFactor"].ToString();
+                    row["StrCompleteFactor"] = row["CompleteFactor"].ToString();
+                    row["StrCompleteProportion"] = row["CompleteProportion"].ToString();
+                }
+                //绠￠亾璇曞帇鍖�
+                //string PipingCount = row["PipingCount"].ToString();
+                //if (string.IsNullOrWhiteSpace(PipingCount) || PipingCount == "0.0" || PipingCount == "0")
+                if (string.IsNullOrWhiteSpace(row["PipingCount"].ToString()) || (int)row["PipingCount"] == 0)
+                {
+                    row["StrPipingCount"] = "NA";
+                    row["StrPipingScount"] = "NA";
+                    row["StrPipingPercent"] = "NA";
+                }
+                else
+                {
+                    row["StrPipingCount"] = row["PipingCount"].ToString();
+                    row["StrPipingScount"] = row["PipingScount"].ToString();
+                    row["StrPipingPercent"] = row["PipingPercent"].ToString();
+                }
+                //绠￠亾鍐叉礂鍚规壂&澶嶄綅淇℃伅
+                //string ReinstateCount = row["ReinstateCount"].ToString();
+                //if (string.IsNullOrWhiteSpace(ReinstateCount) || ReinstateCount == "0.0" || ReinstateCount == "0")
+                if (string.IsNullOrWhiteSpace(row["ReinstateCount"].ToString()) || (int)row["ReinstateCount"] == 0)
+                {
+                    row["StrReinstateCount"] = "NA";
+                    row["StrReinstateScount"] = "NA";
+                    row["StrReinstatePercent"] = "NA";
+                }
+                else
+                {
+                    row["StrReinstateCount"] = row["ReinstateCount"].ToString();
+                    row["StrReinstateScount"] = row["ReinstateScount"].ToString();
+                    row["StrReinstatePercent"] = row["ReinstatePercent"].ToString();
+                }
+                //璁惧娴嬭瘯鍖�
+                //string EqCount = row["EqCount"].ToString();
+                //if (string.IsNullOrWhiteSpace(EqCount) || EqCount == "0.0" || EqCount == "0")
+                if (string.IsNullOrWhiteSpace(row["EqCount"].ToString()) || (int)row["EqCount"] == 0)
+                {
+                    row["StrEqCount"] = "NA";
+                    row["StrEqSCount"] = "NA";
+                    row["StrEqPercent"] = "NA";
+                }
+                else
+                {
+                    row["StrEqCount"] = row["EqCount"].ToString();
+                    row["StrEqSCount"] = row["EqSCount"].ToString();
+                    row["StrEqPercent"] = row["EqPercent"].ToString();
+                }
+                //鐢垫皵娴嬭瘯鍖�
+                //string TeCount = row["TeCount"].ToString();
+                //if (string.IsNullOrWhiteSpace(TeCount) || TeCount == "0.0" || TeCount == "0")
+                if (string.IsNullOrWhiteSpace(row["TeCount"].ToString()) || (int)row["TeCount"] == 0)
+                {
+                    row["StrTeCount"] = "NA";
+                    row["StrTeScount"] = "NA";
+                    row["StrTePercent"] = "NA";
+                }
+                else
+                {
+                    row["StrTeCount"] = row["TeCount"].ToString();
+                    row["StrTeScount"] = row["TeScount"].ToString();
+                    row["StrTePercent"] = row["TePercent"].ToString();
+                }
+                //浠〃娴嬭瘯鍖�
+                //string TiCount = row["TiCount"].ToString();
+                //if (string.IsNullOrWhiteSpace(TiCount) || TiCount == "0.0" || TiCount == "0")
+                if (string.IsNullOrWhiteSpace(row["TiCount"].ToString()) || (int)row["TiCount"] == 0)
+                {
+                    row["StrTiCount"] = "NA";
+                    row["StrTiScount"] = "NA";
+                    row["StrTiPercent"] = "NA";
+                }
+                else
+                {
+                    row["StrTiCount"] = row["TiCount"].ToString();
+                    row["StrTiScount"] = row["TiScount"].ToString();
+                    row["StrTiPercent"] = row["TiPercent"].ToString();
+                }
+                //鍦熷缓/寤虹瓚/缁撴瀯娴嬭瘯鍖�
+                //string TcsCount = row["TcsCount"].ToString();
+                //if (string.IsNullOrWhiteSpace(TcsCount) || TcsCount == "0.0" || TcsCount == "0")
+                if (string.IsNullOrWhiteSpace(row["TcsCount"].ToString()) || (int)row["TcsCount"] == 0)
+                {
+                    row["StrTcsCount"] = "NA";
+                    row["StrTcsScount"] = "NA";
+                    row["StrTcsPercent"] = "NA";
+                }
+                else
+                {
+                    row["StrTcsCount"] = row["TcsCount"].ToString();
+                    row["StrTcsScount"] = row["TcsScount"].ToString();
+                    row["StrTcsPercent"] = row["TcsPercent"].ToString();
+                }
+                //鐢典俊娴嬭瘯鍖�
+                //string TtCount = row["TtCount"].ToString();
+                //if (string.IsNullOrWhiteSpace(TtCount) || TtCount == "0.0" || TtCount == "0")
+                if (string.IsNullOrWhiteSpace(row["TtCount"].ToString()) || (int)row["TtCount"] == 0)
+                {
+                    row["StrTtCount"] = "NA";
+                    row["StrTtScount"] = "NA";
+                    row["StrTtPercent"] = "NA";
+                }
+                else
+                {
+                    row["StrTtCount"] = row["TtCount"].ToString();
+                    row["StrTtScount"] = row["TtScount"].ToString();
+                    row["StrTtPercent"] = row["TtPercent"].ToString();
+                }
+            }
             Grid1.DataSource = table;
             Grid1.DataBind();
         }
@@ -299,13 +441,13 @@ namespace FineUIPro.Web.Transfer.Chart
                 Alert.ShowInTop("璇疯嚦灏戦�夋嫨涓�鏉¤褰曪紒", MessageBoxIcon.Warning);
                 return;
             }
-            
+
             string SystemNo = Grid1.SelectedRowID;
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SystemstatusEdit.aspx?SystemNo={0}", SystemNo, "缂栬緫 - ")));
         }
         #endregion
 
-        protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
+        protected void ddlSubSysNo_SelectedIndexChanged(object sender, EventArgs e)
         {
             BindGrid();
         }
@@ -323,26 +465,42 @@ namespace FineUIPro.Web.Transfer.Chart
                 var scode = systemNo.ToString();
                 //鏍规嵁systemNo鍜宲rojectid鑾峰彇鎵�鏈夋暟鎹� 鍜屽畬鎴愮殑鏁版嵁
                 #region 涔濅釜琛ㄧ殑鏁版嵁
-                var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList();
-                var list2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList();
-                var list3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == pid && x.SYSTEM == scode).ToList();
-                var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
-                var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
-                var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
-                var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
-                var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid && x.SystemName == scode).ToList();
+                var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid && x.TestPackage == scode).ToList();
+                var list2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == pid && x.TestPackage == scode).ToList();
+                var list3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == pid && x.TestPackage == scode).ToList();
+                var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList();
+                var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList();
+                var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList();
+                //var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList();
+                var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid && x.Test_Package == scode).ToList();
                 #endregion
 
-                float allcount = (list1.Count + list2.Count + list3.Count + list4.Count +
-                    list5.Count + list6.Count + list7.Count + list8.Count);
+                //float allcount = (list1.Count + list2.Count + list3.Count + list4.Count +
+                //    list5.Count + list6.Count + list8.Count);//list7.Count +
 
-                float allScount = (list1.Where(x => x.FINALStatus == "Completed").ToList().Count + list2.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count
-                    + list3.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + list4.Where(x => x.FINAL_Status == "Completed").ToList().Count +
-                    list5.Where(x => x.FINAL_Status == "Completed").ToList().Count + list6.Where(x => x.FINAL_Status == "Completed").ToList().Count
-                    + list7.Where(x => x.FINAL_Status == "Completed").ToList().Count + list8.Where(x => x.FINAL_Status == "Completed").ToList().Count
+                //float allScount = (list1.Where(x => x.FINALStatus == "Completed").ToList().Count + list2.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count
+                //    + list3.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count + list4.Where(x => x.FINAL_Status == "Completed").ToList().Count +
+                //    list5.Where(x => x.FINAL_Status == "Completed").ToList().Count + list6.Where(x => x.FINAL_Status == "Completed").ToList().Count
+                //    //+ list7.Where(x => x.FINAL_Status == "Completed").ToList().Count 
+                //    + list8.Where(x => x.FINAL_Status == "Completed").ToList().Count
+                //    );
+
+                //Piping绠￠亾璇曞帇鍖呭拰澶嶄綅閮借缁熻
+                float allcount = (list1.Count + list1.Count + list2.Count + list3.Count + list4.Count +
+                    list5.Count + list6.Count + list8.Count);//list7.Count +
+
+                float allScount = (list1.Where(x => x.FINALStatus == "Completed").ToList().Count
+                    + list1.Where(x => x.Reduction == "Completed").ToList().Count
+                    + list2.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count
+                    + list3.Where(x => x.MechanicalFINALStatus == "Completed").ToList().Count
+                    + list4.Where(x => x.FINAL_Status == "Completed").ToList().Count +
+                    list5.Where(x => x.FINAL_Status == "Completed").ToList().Count
+                    + list6.Where(x => x.FINAL_Status == "Completed").ToList().Count
+                    //+ list7.Where(x => x.FINAL_Status == "Completed").ToList().Count 
+                    + list8.Where(x => x.FINAL_Status == "Completed").ToList().Count
                     );
 
-                if (Convert.ToInt32(allcount)==0)
+                if (Convert.ToInt32(allcount) == 0)
                 {
                     return "0";
                 }
@@ -366,82 +524,83 @@ namespace FineUIPro.Web.Transfer.Chart
             Response.ContentEncoding = System.Text.Encoding.UTF8;
             this.Grid1.PageSize = 100000;
             this.BindGrid();
-            Response.Write(GetGridTableHtml(Grid1));
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
             Response.End();
         }
 
-        /// <summary>
-        /// 瀵煎嚭鏂规硶
-        /// </summary>
-        /// <param name="grid"></param>
-        /// <returns></returns>
-        private string GetGridTableHtml(Grid grid)
-        {
-            StringBuilder sb = new StringBuilder();
-            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
-            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
-            //sb.Append("<tr>");
-            //foreach (GridColumn column in grid.Columns)
-            //{
-            //    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
-            //    {
-            //        sb.AppendFormat("<td>{0}</td>", column.HeaderText);
-            //    }
-            //}
-            //sb.Append("</tr>");
-            MultiHeaderTable mht = new MultiHeaderTable();
-            mht.ResolveMultiHeaderTable(Grid1.Columns);
+        ///// <summary>
+        ///// 瀵煎嚭鏂规硶
+        ///// </summary>
+        ///// <param name="grid"></param>
+        ///// <returns></returns>
+        //private string GetGridTableHtml(Grid grid)
+        //{
+        //    StringBuilder sb = new StringBuilder();
+        //    sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+        //    sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+        //    //sb.Append("<tr>");
+        //    //foreach (GridColumn column in grid.Columns)
+        //    //{
+        //    //    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+        //    //    {
+        //    //        sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+        //    //    }
+        //    //}
+        //    //sb.Append("</tr>");
+        //    MultiHeaderTable mht = new MultiHeaderTable();
+        //    mht.ResolveMultiHeaderTable(Grid1.Columns);
 
-            foreach (List<object[]> rows in mht.MultiTable)
-            {
-                sb.Append("<tr>");
-                foreach (object[] cell in rows)
-                {
-                    int rowspan = Convert.ToInt32(cell[0]);
-                    int colspan = Convert.ToInt32(cell[1]);
-                    GridColumn column = cell[2] as GridColumn;
-                    if (column.Hidden == false)
-                    {
-                        sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
-                        rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
-                        colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
-                        colspan != 1 ? " style=\"text-align:center;\"" : "",
-                        column.HeaderText);
-                    }
-                }
-                sb.Append("</tr>");
-            }
-            foreach (GridRow row in grid.Rows)
-            {
-                sb.Append("<tr>");
-                //if (row.Grid.gr.Hidden == false) { 
-                foreach (GridColumn column in mht.Columns)
-                {
-                    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
-                    {
-                        string html = row.Values[column.ColumnIndex].ToString();
+        //    foreach (List<object[]> rows in mht.MultiTable)
+        //    {
+        //        sb.Append("<tr>");
+        //        foreach (object[] cell in rows)
+        //        {
+        //            int rowspan = Convert.ToInt32(cell[0]);
+        //            int colspan = Convert.ToInt32(cell[1]);
+        //            GridColumn column = cell[2] as GridColumn;
+        //            if (column.Hidden == false)
+        //            {
+        //                sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
+        //                rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
+        //                colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
+        //                colspan != 1 ? " style=\"text-align:center;\"" : "",
+        //                column.HeaderText);
+        //            }
+        //        }
+        //        sb.Append("</tr>");
+        //    }
+        //    foreach (GridRow row in grid.Rows)
+        //    {
+        //        sb.Append("<tr>");
+        //        //if (row.Grid.gr.Hidden == false) { 
+        //        foreach (GridColumn column in mht.Columns)
+        //        {
+        //            if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+        //            {
+        //                string html = row.Values[column.ColumnIndex].ToString();
 
-                        if (column.ColumnID == "tfPageIndex")
-                        {
-                            html = (row.FindControl("lblPageIndex") as AspNet.Label).Text;
-                        }
-                       
-                        else if (column.ColumnID == "Count4")
-                        {
-                            html = (row.FindControl("Label5") as AspNet.Label).Text;
-                        }
+        //                if (column.ColumnID == "tfPageIndex")
+        //                {
+        //                    html = (row.FindControl("lblPageIndex") as AspNet.Label).Text;
+        //                }
 
-                        sb.AppendFormat("<td>{0}</td>", html);
-                    }
-                }
-                //}
-                sb.Append("</tr>");
-            }
-            
-            sb.Append("</table>");
+        //                else if (column.ColumnID == "Count4")
+        //                {
+        //                    html = (row.FindControl("Label5") as AspNet.Label).Text;
+        //                }
 
-            return sb.ToString();
-        }
+        //                sb.AppendFormat("<td>{0}</td>", html);
+        //            }
+        //        }
+        //        //}
+        //        sb.Append("</tr>");
+        //    }
+
+        //    sb.Append("</table>");
+
+        //    return sb.ToString();
+        //}
         #endregion
 
     }
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
index 592ff387..f5173c9d 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.designer.cs
@@ -60,13 +60,13 @@ namespace FineUIPro.Web.Transfer.Chart
         protected global::FineUIPro.Toolbar ToolSearch;
 
         /// <summary>
-        /// ddlSystemNo 鎺т欢銆�
+        /// ddlSubSysNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlSystemNo;
+        protected global::FineUIPro.DropDownList ddlSubSysNo;
 
         /// <summary>
         /// btnSearch 鎺т欢銆�
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
index efe5a15f..8bca2f21 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
@@ -16,13 +16,13 @@ namespace FineUIPro.Web.Transfer.Chart
             if (!IsPostBack) {
                 var systemCode = Funs.DB.Transfer_LHCSystemList
                     .Where(x => x.ProjectId == CurrUser.LoginProjectId)
-                    .GroupBy(p => new { p.SystemNo })
-                    .Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
+                    .GroupBy(p => new { p.Commissioningsystemcode })
+                    .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
                 int indexRow = 1;
                 ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
                 foreach (var t in systemCode)
                 {
-                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SystemNo, t.SystemNo));
+                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode));
                     indexRow++;
                 }
 
@@ -40,15 +40,15 @@ namespace FineUIPro.Web.Transfer.Chart
             #region 缁熻鎵�鏈�
             var systemCode = Funs.DB.Transfer_LHCSystemList
                    .Where(x => x.ProjectId == CurrUser.LoginProjectId)
-                   .GroupBy(p => new { p.SystemNo })
-                   .Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
+                   .GroupBy(p => new { p.Commissioningsystemcode })
+                   .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
 
             if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue))
             {
                 systemCode= Funs.DB.Transfer_LHCSystemList
-                   .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SystemNo == ddlSystemNo.SelectedValue)
-                   .GroupBy(p => new { p.SystemNo })
-                   .Select(p => new { SystemNo = p.Key.SystemNo }).ToList();
+                   .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.Commissioningsystemcode == ddlSystemNo.SelectedValue)
+                   .GroupBy(p => new { p.Commissioningsystemcode })
+                   .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
             }
             #region 涔濅釜琛ㄧ殑鏁版嵁
             var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid).ToList();
@@ -57,7 +57,7 @@ namespace FineUIPro.Web.Transfer.Chart
             var list4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == pid).ToList();
             var list5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == pid).ToList();
             var list6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == pid).ToList();
-            var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid).ToList();
+            //var list7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == pid).ToList();
             var list8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == pid).ToList();
             var list9 = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == pid).ToList();
             #endregion
@@ -67,46 +67,46 @@ namespace FineUIPro.Web.Transfer.Chart
             dt.Columns.Add("杩涜涓暟閲�", typeof(string));
             dt.Columns.Add("鏈畬鎴愭暟閲�", typeof(string));
             foreach (var t in systemCode) {
-                var scode = t.SystemNo;
+                var scode = t.Commissioningsystemcode;
                 AllSystemNo += "'" + scode + "',";
                 DataRow dr = dt.NewRow();
                 dr["绯荤粺缂栧彿"] = scode;
                 #region 鏍规嵁绯荤粺缂栧彿鑾峰彇瀹屾垚鐨勬暟閲�
-                var completedCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Completed").ToList().Count()
-                    + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
-                    + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
-                    + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
-                    + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
-                    + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
-                    + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
-                    + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
-                    + list9.Where(x => x.SystemName == scode && x.Status == "Completed").ToList().Count();
+                var completedCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "Completed").ToList().Count()
+                    + list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
+                    + list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Completed").ToList().Count()
+                    + list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
+                    + list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
+                    + list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
+                    //+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Completed").ToList().Count()
+                    + list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "Completed").ToList().Count()
+                    + list9.Where(x => x.Sub_Sys_No == scode && x.Status == "Completed").ToList().Count();
                 #endregion
                 dr["瀹屾垚鏁伴噺"] = completedCount;
                 completed+= "'" + completedCount.ToString() + "',";
                 #region 鏍规嵁绯荤粺缂栧彿鑾峰彇杩涜涓暟閲�
-                var InprogressCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "In progress").ToList().Count()
-                    + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
-                    + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
-                    + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
-                    + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
-                     + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
-                    + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
-                    + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
-                    + list9.Where(x => x.SystemName == scode && x.Status == "In progress").ToList().Count();
+                var InprogressCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "In progress").ToList().Count()
+                    + list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
+                    + list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "In progress").ToList().Count()
+                    + list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
+                    + list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
+                     + list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
+                    //+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "In progress").ToList().Count()
+                    + list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "In progress").ToList().Count()
+                    + list9.Where(x => x.Sub_Sys_No == scode && x.Status == "In progress").ToList().Count();
                 #endregion
                 dr["杩涜涓暟閲�"] = InprogressCount;
                 Inprogress += "'" + InprogressCount.ToString() + "',";
                 #region 鏍规嵁绯荤粺缂栧彿鑾峰彇鏈畬鎴愭暟閲�
-                var NotStartCount = list1.Where(x => x.SYSTEM == scode && x.FINALStatus == "Not Start").ToList().Count()
-                   + list2.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
-                   + list3.Where(x => x.SYSTEM == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
-                   + list4.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
-                   + list5.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
-                   + list6.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
-                   + list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
-                   + list8.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
-                   + list9.Where(x => x.SystemName == scode && x.Status == "Not Start").ToList().Count();
+                var NotStartCount = list1.Where(x => x.TestPackage == scode && x.FINALStatus == "Not Start").ToList().Count()
+                   + list2.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
+                   + list3.Where(x => x.TestPackage == scode && x.MechanicalFINALStatus == "Not Start").ToList().Count()
+                   + list4.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
+                   + list5.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
+                   + list6.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
+                   //+ list7.Where(x => x.SystemName == scode && x.FINAL_Status == "Not Start").ToList().Count()
+                   + list8.Where(x => x.Test_Package == scode && x.FINAL_Status == "Not Start").ToList().Count()
+                   + list9.Where(x => x.Sub_Sys_No == scode && x.Status == "Not Start").ToList().Count();
                 #endregion
                 dr["鏈畬鎴愭暟閲�"] = NotStartCount;
                 NotStart += "'" + NotStartCount.ToString() + "',";
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
index e98acddc..e48fce87 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
@@ -16,16 +16,16 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                         <f:DatePicker runat="server" Label="Plan PWD/璁″垝PWD" ID="txtPlanPWD"  DateFormatString="yyyy-MM-dd" 
-                             LabelAlign="Right" LabelWidth="200px"  Required="true" ShowRedStar="true">
+                        <f:DatePicker runat="server" Label="Plan PWD/璁″垝PWD" ID="txtPlanPWD" DateFormatString="yyyy-MM-dd"
+                            LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
                         </f:DatePicker>
 
-                         <f:DatePicker runat="server" Label="Plan JWD/璁″垝鑱斿悎妫�鏌�" ID="txtPlanJWD" DateFormatString="yyyy-MM-dd" 
-                             LabelAlign="Right"  Required="true" ShowRedStar="true">
+                        <f:DatePicker runat="server" Label="Plan JWD/璁″垝鑱斿悎妫�鏌�" ID="txtPlanJWD" DateFormatString="yyyy-MM-dd"
+                            LabelAlign="Right" Required="true" ShowRedStar="true">
                         </f:DatePicker>
 
-                         <f:DatePicker runat="server" Label="MC Plan/MC 璁″垝" ID="txtMcPlan" DateFormatString="yyyy-MM-dd" 
-                             LabelAlign="Right"  Required="true" ShowRedStar="true">
+                        <f:DatePicker runat="server" Label="MC Plan/MC 璁″垝" ID="txtMcPlan" DateFormatString="yyyy-MM-dd"
+                            LabelAlign="Right" Required="true" ShowRedStar="true">
                         </f:DatePicker>
                     </Items>
                 </f:FormRow>
@@ -39,23 +39,23 @@
 
                 <f:FormRow>
                     <Items>
-                         <f:DatePicker runat="server" Label="Actual PWD/瀹為檯棰勮仈鍚堟鏌�" ID="txtActualPWD"  DateFormatString="yyyy-MM-dd" 
-                             LabelAlign="Right" LabelWidth="200px">
+                        <f:DatePicker runat="server" Label="Actual PWD/瀹為檯棰勮仈鍚堟鏌�" ID="txtActualPWD" DateFormatString="yyyy-MM-dd"
+                            LabelAlign="Right" LabelWidth="200px">
                         </f:DatePicker>
 
-                         <f:DatePicker runat="server" Label="Actual JWD/瀹為檯鑱斿悎妫�鏌�" ID="txtActualJWD" DateFormatString="yyyy-MM-dd" 
-                             LabelAlign="Right">
+                        <f:DatePicker runat="server" Label="Actual JWD/瀹為檯鑱斿悎妫�鏌�" ID="txtActualJWD" DateFormatString="yyyy-MM-dd"
+                            LabelAlign="Right">
                         </f:DatePicker>
 
-                         <f:DatePicker runat="server" Label="Actual  MC/瀹為檯鏈烘瀹屽伐" ID="txtActualMC" DateFormatString="yyyy-MM-dd" 
-                             LabelAlign="Right">
+                        <f:DatePicker runat="server" Label="Actual  MC/瀹為檯鏈烘瀹屽伐" ID="txtActualMC" DateFormatString="yyyy-MM-dd"
+                            LabelAlign="Right">
                         </f:DatePicker>
                     </Items>
                 </f:FormRow>
 
                 <f:FormRow>
                     <Items>
-                         <f:TextBox ID="txtCommissioning" runat="server" Label="Commissioning/璇曡繍琛�" LabelAlign="Right" LabelWidth="200px">
+                        <f:TextBox ID="txtCommissioning" runat="server" Label="Commissioning/璇曡繍琛�" LabelAlign="Right" LabelWidth="200px">
                         </f:TextBox>
 
                         <f:TextBox ID="txtIaQian" runat="server" Label="IA绛剧讲" LabelAlign="Right">
@@ -68,7 +68,7 @@
 
                 <f:FormRow>
                     <Items>
-                          <f:DropDownList ID="ddlSystemStatus" runat="server" Label="System Status/绯荤粺鐘舵��" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="ddlSystemStatus" runat="server" Label="System Status/绯荤粺鐘舵��" LabelWidth="200px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
                             <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                             <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -79,8 +79,23 @@
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
+                
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="鐢典即鐑�" LabelWidth="180px">
+                            <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                            <f:ListItem Value="N" Text="N"></f:ListItem>
+                        </f:DropDownList>
+                        <f:DropDownList ID="ddlInsulation" runat="server" Label="淇濇俯/鍐�" LabelWidth="180px">
+                            <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                            <f:ListItem Value="N" Text="N"></f:ListItem>
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
 
-                 <f:FormRow>
+                <f:FormRow>
                     <Items>
                         <f:TextArea ID="txtRemark" runat="server" Label="Remark/澶囨敞 " LabelAlign="Right" LabelWidth="200px">
                         </f:TextArea>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.cs
index b89ff589..f15b7392 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.cs
@@ -74,6 +74,8 @@ namespace FineUIPro.Web.Transfer.Chart
                     ddlSystemStatus.SelectedValue = model.SystemStatus;
                     txtTurnoverDescription.Text = model.TurnoverDescription;
                     txtRemark.Text = model.Remark;
+                    ddlElectricHeatTracing.SelectedValue = model.ElectricHeatTracing;
+                    ddlInsulation.SelectedValue = model.Insulation;
                 }
             }
         }
@@ -96,8 +98,10 @@ namespace FineUIPro.Web.Transfer.Chart
                 IaQian= txtIaQian.Text,
                 TcccQ= txtTcccQ.Text,
                 SystemStatus= ddlSystemStatus.SelectedValue,
-                TurnoverDescription= txtTurnoverDescription.Text,
-                Remark= txtRemark.Text
+                TurnoverDescription = txtTurnoverDescription.Text,
+                Remark = txtRemark.Text,
+                ElectricHeatTracing = ddlElectricHeatTracing.SelectedValue,
+                Insulation = ddlInsulation.SelectedValue,
             };
             if (!string.IsNullOrEmpty(txtActualPWD.Text))
             {
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
index fb9f979a..f213fe79 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
@@ -149,6 +149,24 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.TextBox txtTurnoverDescription;
 
+        /// <summary>
+        /// ddlElectricHeatTracing 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlElectricHeatTracing;
+
+        /// <summary>
+        /// ddlInsulation 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInsulation;
+
         /// <summary>
         /// txtRemark 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
index d22b2e3b..94d7de8a 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
@@ -4,33 +4,34 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
     <form id="form1" runat="server">
-         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false"  EnableCollapse="true"
+            <items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true"  OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true"  EnableTextSelection="true">
-                    <Toolbars>
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
+                    <toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                
-                                <f:TextBox runat="server" ID="txtCivil_Structure" Label="Tag.No" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
+                            <items>
 
-                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtCivil_Structure" Label="Tag.No" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
+
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                 <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
-                                    <f:ListItem Value="" Text="All" Selected="true"/>
-                                    <f:ListItem Value="Not Start" Text="Not Start"/>
-                                    <f:ListItem Value="In progress" Text="In progress"/>
-                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                    <f:ListItem Value="" Text="All" Selected="true" />
+                                    <f:ListItem Value="Not Start" Text="Not Start" />
+                                    <f:ListItem Value="In progress" Text="In progress" />
+                                    <f:ListItem Value="Completed" Text="Completed" />
                                 </f:DropDownList>
                                 <%--<f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
@@ -44,82 +45,86 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                  <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
                                 </f:Button>
-                               <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
+                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
                                 </f:Button>--%>
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnImport" ToolTip="瀵煎叆" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
-                            </Items>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </items>
                         </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                      
-                          <f:GroupField HeaderText="Civil Structure" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:BoundField minWidth="140px"  TextAlign="Center"  ColumnID="Civil_Structure" DataField="Civil_Structure" HeaderText="Tag.No" />
-                            </Columns>
+                    </toolbars>
+                    <columns>
+
+                        <f:GroupField HeaderText="Civil Structure" TextAlign="Center" MinWidth="200px">
+                            <columns>
+                                <f:BoundField MinWidth="160px" TextAlign="Center" ColumnID="Civil_Structure" DataField="Civil_Structure" HeaderText="Tag.No" />
+                            </columns>
                         </f:GroupField>
 
-                         <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="210px">
-                         </f:RenderField>
-                       
-                         <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
-                            <Columns>
-                                <f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
-                                <f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
-                                <f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
-                            </Columns>
+                        <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="320px">
+                        </f:RenderField>
+
+                        <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
+                            <columns>
+                                <f:BoundField MinWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
+                                <f:BoundField MinWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center" />
+                                <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
+                            </columns>
                         </f:GroupField>
-                       
-                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
-                            <Columns>
-                                   <f:RenderField ColumnID="Foundation" DataField="Foundation" FieldType="String" HeaderText="Construction" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="120px">
+
+                        <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
+                            <columns>
+                                <f:RenderField ColumnID="Foundation" DataField="Foundation" FieldType="String" HeaderText="Construction" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
 
-                                 <f:RenderField ColumnID="Mainstructure" DataField="Mainstructure" FieldType="String" HeaderText="CQVD" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                <f:RenderField ColumnID="Mainstructure" DataField="Mainstructure" FieldType="String" HeaderText="CQVD" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>
 
-                               <%-- <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Roof sub-project" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                <%-- <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Roof sub-project" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>
 
                                  <f:RenderField ColumnID="Buildingdecoration" DataField="Buildingdecoration" FieldType="String" HeaderText="Building<br/> decoration" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                    HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>--%>
 
-                               <%--  <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="120px">
+                                <%--  <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
 
                                  <f:RenderField ColumnID="Instrument" DataField="Instrument" FieldType="String" HeaderText="Instrument" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="120px">
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
 
                                  <f:RenderField ColumnID="Electrical" DataField="Electrical" FieldType="String" HeaderText="Electrical" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="120px">
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
 
                                  <f:RenderField ColumnID="FireFighting" DataField="FireFighting" FieldType="String" HeaderText="Fire<br/> Fighting" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="120px">
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>--%>
 
-                               <%--  <f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="100px">
+                                <%--  <f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="100px">
                                 </f:RenderField>--%>
-                            </Columns>
+                            </columns>
                         </f:GroupField>
-                       
-                         <f:BoundField MinWidth="200px"  ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status"  TextAlign="Center"/>
 
-                    </Columns>
-                    <Listeners>
+                        <f:BoundField MinWidth="200px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
+
+                    </columns>
+                    <listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
+                    </listeners>
+                    <pageitems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -129,11 +134,11 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="鎵�鏈夎" Value="100000" />
                         </f:DropDownList>
-                    </PageItems>
+                    </pageitems>
                 </f:Grid>
-            </Items>
+            </items>
         </f:Panel>
-         <f:Window ID="Window1" Title="CivilStructure" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="CivilStructure" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="900px" Height="480px">
         </f:Window>
@@ -142,15 +147,15 @@
             Width="700px" Height="560px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <Items>
-                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
+            <items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="鍒犻櫎" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </Items>
+            </items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
index 9935c7e7..a827b8bd 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
@@ -63,12 +63,17 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND Test_Package_START <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
-            {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
-            }
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
 
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
+            {
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
+            }
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
             {
                 strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";
@@ -181,6 +186,49 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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 = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_Civil_Structure where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -212,6 +260,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
index d7430e7a..3fa9454b 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtCivil_Structure;
 
         /// <summary>
-        /// txtSystem 鎺т欢銆�
+        /// txtSysSubNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 鎺т欢銆�
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
index 2d9f55d9..e34360f4 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
@@ -348,9 +348,8 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-
-                    //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                    if (listObj.Where(x => x == "Not Start").ToList().Count == 2)
+                    //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2)
                     {
                         model.FINAL_Status = "Not Start";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
index c2e12ad1..3c8b6f6f 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
@@ -4,12 +4,12 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
     <form id="form1" runat="server">
-       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
         <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false"
             AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
             LabelAlign="Right">
@@ -31,14 +31,17 @@
                         <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
-
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
 
-                  <f:FormRow>
+                <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtDescriptions" runat="server" Label="Description"
                             LabelAlign="Right" LabelWidth="180px">
@@ -78,7 +81,7 @@
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
                                 </f:DropDownList>--%>
 
-                               
+
 
                                 <%--<f:DropDownList ID="ddlInstrument" runat="server" Label="Instrument" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
@@ -101,7 +104,7 @@
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
                                 </f:DropDownList>--%>
 
-                              <%--  <f:DropDownList ID="ddlHVAC" runat="server" Label="HVAC" LabelWidth="180px">
+                                <%--  <f:DropDownList ID="ddlHVAC" runat="server" Label="HVAC" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
index 7d831ab8..c5fbc48c 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
@@ -106,8 +106,9 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2)
             {
                 model.FINAL_Status = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 2)
+            } 
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 2)
             {
                 model.FINAL_Status = "Not Start";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
index 445fbbbb..58f90083 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
@@ -13,27 +13,28 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false"  EnableCollapse="true"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true"  OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true"  EnableTextSelection="true">
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                
-                                <f:TextBox runat="server" ID="txtELECTRICAL" Label="Tag. No" LabelWidth="110px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtELECTRICAL" Label="Tag. No" LabelWidth="110px" LabelAlign="Right"></f:TextBox>
 
-                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status">
-                                    <f:ListItem Value="" Text="All" Selected="true"/>
-                                    <f:ListItem Value="Not Start" Text="Not Start"/>
-                                    <f:ListItem Value="In progress" Text="In progress"/>
-                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
+
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status">
+                                    <f:ListItem Value="" Text="All" Selected="true" />
+                                    <f:ListItem Value="Not Start" Text="Not Start" />
+                                    <f:ListItem Value="In progress" Text="In progress" />
+                                    <f:ListItem Value="Completed" Text="Completed" />
                                 </f:DropDownList>
 
-                               <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="鑷�">
@@ -45,56 +46,60 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
                                 </f:Button>
-                               <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
+                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
                                 </f:Button>--%>
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
+                                </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>
                     <Columns>
-                      
-                          <f:GroupField HeaderText="ELECTRICAL" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:BoundField minWidth="160px"  TextAlign="Center"  ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
-                            </Columns>
-                        </f:GroupField>
-                       
-                        <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="230px">
-                         </f:RenderField>
 
-                         <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
+                        <f:GroupField HeaderText="ELECTRICAL" TextAlign="Center">
                             <Columns>
-                                <f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
-                                <f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
-                                <f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
+                                <f:BoundField MinWidth="220px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
                             </Columns>
                         </f:GroupField>
-                       
-                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
+
+                        <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="320px">
+                        </f:RenderField>
+
+                        <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
                             <Columns>
-                                    <f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/> &Inspection Reocrd" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="150px">
+                                <f:BoundField Width="90px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
+                                <f:BoundField Width="100px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" />
+                                <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
+                            </Columns>
+                        </f:GroupField>
+
+                        <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/>&Inspection Reocrd" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="Communicationtest" DataField="Communicationtest" FieldType="String" HeaderText="Communication<br/> test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
-                    
-                                <f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/> Insulation Test<br/> Record" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+
+                                <f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/>Insulation Test<br/>Record" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="140px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="LoopTest" DataField="LoopTest" FieldType="String" HeaderText="Loop Test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                    HeaderTextAlign="Center" Width="110px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
-                       
-                         <f:BoundField MinWidth="200px"  ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status"  TextAlign="Center"/>
+
+                        <f:BoundField Width="120px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
 
                     </Columns>
                     <Listeners>
@@ -114,7 +119,7 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-         <f:Window ID="Window1" Title="Electrical" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="Electrical" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="900px" Height="480px">
         </f:Window>
@@ -125,7 +130,7 @@
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
-                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
 
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
index 0b2907d6..75554ea0 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
@@ -54,12 +54,17 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND ELECTRICAL like @ELECTRICAL";
                 listStr.Add(new SqlParameter("@ELECTRICAL", "%" + this.txtELECTRICAL.Text.Trim() + "%"));
             }
-            
 
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
 
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
@@ -175,6 +180,50 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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 = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_Electrical where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -206,6 +255,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
index 7f87aba8..9cdef456 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtELECTRICAL;
 
         /// <summary>
-        /// txtSystem 鎺т欢銆�
+        /// txtSysSubNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 鎺т欢銆�
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
index 68e91fe8..e4bc345b 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
@@ -344,9 +344,8 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-
-                    //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                    if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+                    //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
                     {
                         model.FINAL_Status = "Not Start";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx
index 07ff0aff..87cbba0e 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx
@@ -31,7 +31,10 @@
                         <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
-
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
index c9977e73..34bc6cd7 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
@@ -93,8 +93,9 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
             {
                 model.FINAL_Status = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+            }
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
             {
                 model.FINAL_Status = "Not Start";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
index 60ec13c9..45cd39e8 100644
--- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
@@ -70,7 +70,7 @@
                             <Columns>
                                 <f:BoundField minWidth="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
                                 <f:BoundField minWidth="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
-                                <f:BoundField minWidth="160px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
+                                <f:BoundField minWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
                             </Columns>
                         </f:GroupField>
                        
diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
index 606c1f96..e1746265 100644
--- a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
@@ -341,10 +341,8 @@ namespace FineUIPro.Web.Transfer
                             list.Add(model);
                             continue;
                         }
-
-
-                        //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                        if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+                        //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
                         {
                             model.FINAL_Status = "Not Start";
                             list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
index c6f75a5e..89fb8978 100644
--- a/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
@@ -88,8 +88,9 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
             {
                 model.FINAL_Status = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+            }
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.FINAL_Status = "Not Start";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
index 652aac34..b631a3df 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>Instrumentation</title>
 </head>
 <body>
@@ -13,27 +13,28 @@
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false"  EnableCollapse="true"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true"  OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true"  EnableTextSelection="true">
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                
-                                <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="Tag No" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="Tag No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status"  LabelWidth="80px" LabelAlign="Right">
-                                    <f:ListItem Value="" Text="All" Selected="true"/>
-                                    <f:ListItem Value="Not Start" Text="Not Start"/>
-                                    <f:ListItem Value="In progress" Text="In progress"/>
-                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
+
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
+                                    <f:ListItem Value="" Text="All" Selected="true" />
+                                    <f:ListItem Value="Not Start" Text="Not Start" />
+                                    <f:ListItem Value="In progress" Text="In progress" />
+                                    <f:ListItem Value="Completed" Text="Completed" />
                                 </f:DropDownList>
 
-                               <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="鑷�">
@@ -47,62 +48,66 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
                                 </f:Button>
-                               <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
+                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
                                 </f:Button>--%>
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
+                                </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>
                     <Columns>
-                      
-                          <f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px">
+
+                        <f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px">
                             <Columns>
-                                <f:BoundField minWidth="160px"  TextAlign="Center"  ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
+                                <f:BoundField Width="160px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
                             </Columns>
                         </f:GroupField>
 
                         <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="240px">
-                         </f:RenderField>
-                       
-                         <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
+                            HeaderTextAlign="Center" MinWidth="320px">
+                        </f:RenderField>
+
+                        <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
                             <Columns>
-                                <f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
-                                <f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
-                                <f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
+                                <f:BoundField Width="100px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
+                                <f:BoundField Width="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" />
+                                <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
                             </Columns>
                         </f:GroupField>
-                       
-                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
+
+                        <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
-                                </f:RenderField>
+                                <%--<f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="140px">
+                                </f:RenderField>--%>
 
                                 <f:RenderField ColumnID="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
 
-                                <f:RenderField ColumnID="PipingPressuretest" DataField="PipingPressuretest" FieldType="String" HeaderText="Piping Pressure test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="150px">
+                                <%--<f:RenderField ColumnID="PipingPressuretest" DataField="PipingPressuretest" FieldType="String" HeaderText="Piping Pressure test" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="150px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="PipingLeak" DataField="PipingLeak" FieldType="String" HeaderText="Piping Leak/<br/>Vacuum Test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
-                                </f:RenderField>
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>--%>
 
                                 <f:RenderField ColumnID="PipingBlowing" DataField="PipingBlowing" FieldType="String" HeaderText="Piping Blowing" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
-                       
-                         <f:BoundField MinWidth="200px"  ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="Mechanical FINAL Status"  TextAlign="Center"/>
+
+                        <f:BoundField MinWidth="120px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
 
                     </Columns>
                     <Listeners>
@@ -132,7 +137,7 @@
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
-                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
index 562cb686..0395381b 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.Transfer
                               where ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            
+
             if (!string.IsNullOrEmpty(this.txtINSTRUMENTATION.Text.Trim()))
             {
                 strSql += " AND INSTRUMENTATION like @INSTRUMENTATION";
@@ -70,12 +70,17 @@ namespace FineUIPro.Web.Transfer
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
 
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
-            {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
-            }
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
 
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
+            {
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
+            }
             strSql += " order by INSTRUMENTATION ";
 
             SqlParameter[] parameter = listStr.ToArray();
@@ -159,7 +164,7 @@ namespace FineUIPro.Web.Transfer
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    Model.Transfer_Instrumentation model = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x=>x.Id==rowID);
+                    Model.Transfer_Instrumentation model = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.Id == rowID);
                     if (model != null)
                     {
                         Funs.DB.Transfer_Instrumentation.DeleteOnSubmit(model);
@@ -184,6 +189,52 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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 = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_Instrumentation where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
+
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -215,6 +266,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
index 94838967..83fcc319 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtINSTRUMENTATION;
 
         /// <summary>
-        /// txtSystem 鎺т欢銆�
+        /// txtSysSubNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 鎺т欢銆�
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
index 670c27aa..0db982b6 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL(ds.Tables[0], 11);
+                AddDatasetToSQL(ds.Tables[0], 8);
                 hdCheckResult.Text = "1";
             }
             catch (Exception exc)
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConn.Close();
                 oleDBConn.Dispose();
 
-                AddDatasetToSQL2(ds.Tables[0], 11);
+                AddDatasetToSQL2(ds.Tables[0], 8);
             }
             catch (Exception ex)
             {
@@ -327,31 +327,37 @@ namespace FineUIPro.Web.Transfer
                         model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
                         model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
 
-                        var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
-                        var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
-                        var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
-                        var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
-                        var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
-                        var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
+                        //var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
+                        //var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
+                        //var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
+                        //var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
+                        //var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
+                        //var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
+
+                        var obj1 = model.InstallationCalibration = pds.Rows[i][5].ToString().Trim();
+                        //var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim();
+                        //var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim();
+                        var obj4 = model.PipingBlowing = pds.Rows[i][6].ToString().Trim();
+                        var obj5 = model.Looptest = pds.Rows[i][7].ToString().Trim();
+
                         #region 鍒ゆ柇鐘舵��
                         var listObj = new List<string>();
                         listObj.Add(obj1);
-                        listObj.Add(obj2);
-                        listObj.Add(obj3);
+                        //listObj.Add(obj2);
+                        //listObj.Add(obj3);
                         listObj.Add(obj4);
                         listObj.Add(obj5);
-                        listObj.Add(obj0);
+                        //listObj.Add(obj0);
                         //鍏ㄦ槸NA鎴朇ompleted 鐘舵�佹槸Completed
-                        if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 6)
+                        if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
                         {
                             model.FINAL_Status = "Completed";
                             list.Add(model);
                             continue;
                         }
 
-
-                        //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                        if (listObj.Where(x => x == "Not Start").ToList().Count == 6)
+                        //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
                         {
                             model.FINAL_Status = "Not Start";
                             list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
index 96108c87..ad09ff88 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
@@ -31,7 +31,10 @@
                         <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
-
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
@@ -50,12 +53,12 @@
                     <Items>
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
-                                 <f:DropDownList ID="ddlCalibration" runat="server" Label="Calibration" LabelWidth="180px">
+                                 <%--<f:DropDownList ID="ddlCalibration" runat="server" Label="Calibration" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
-                                </f:DropDownList>
+                                </f:DropDownList>--%>
 
                                 <f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
@@ -64,7 +67,7 @@
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
                                 </f:DropDownList>
 
-                                <f:DropDownList ID="ddlPipingPressuretest" runat="server" Label="Piping Pressure test" LabelWidth="180px">
+                                <%--<f:DropDownList ID="ddlPipingPressuretest" runat="server" Label="Piping Pressure test" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -76,7 +79,7 @@
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
-                                </f:DropDownList>
+                                </f:DropDownList>--%>
 
                                 <f:DropDownList ID="ddlPipingBlowing" runat="server" Label="Piping Blowing" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
index f7c1eed8..3be30efb 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
@@ -56,11 +56,11 @@ namespace FineUIPro.Web.Transfer
                         txtSubsystem.Text = model.Subsystem;
                         txtTest_Package.Text = model.Test_Package;
                         ddlInstallationCalibration.SelectedValue = model.InstallationCalibration;
-                        ddlPipingPressuretest.SelectedValue = model.PipingPressuretest;
-                        ddlPipingLeak.SelectedValue = model.PipingLeak;
+                        //ddlPipingPressuretest.SelectedValue = model.PipingPressuretest;
+                        //ddlPipingLeak.SelectedValue = model.PipingLeak;
                         ddlPipingBlowing.SelectedValue = model.PipingBlowing;
                         ddlLooptest.SelectedValue = model.Looptest;
-                        ddlCalibration.SelectedValue = model.Calibration;
+                        //ddlCalibration.SelectedValue = model.Calibration;
                         txtDescriptions.Text = model.Descriptions;
                     }
                 }
@@ -77,11 +77,11 @@ namespace FineUIPro.Web.Transfer
                 Subsystem = txtSubsystem.Text,
                 Test_Package = txtTest_Package.Text,
                 InstallationCalibration = ddlInstallationCalibration.SelectedValue,
-                PipingPressuretest = ddlPipingPressuretest.SelectedValue,
-                PipingLeak = ddlPipingLeak.SelectedValue,
+                //PipingPressuretest = ddlPipingPressuretest.SelectedValue,
+                //PipingLeak = ddlPipingLeak.SelectedValue,
                 PipingBlowing = ddlPipingBlowing.SelectedValue,
                 Looptest = ddlLooptest.SelectedValue,
-                Calibration= ddlCalibration.SelectedValue,
+                //Calibration= ddlCalibration.SelectedValue,
                 Descriptions = txtDescriptions.Text
 
             };
@@ -89,18 +89,19 @@ namespace FineUIPro.Web.Transfer
             #region 鍒ゆ柇鐘舵��
             var listObj = new List<string>();
             listObj.Add(model.InstallationCalibration);
-            listObj.Add(model.PipingPressuretest);
-            listObj.Add(model.PipingLeak);
+            //listObj.Add(model.PipingPressuretest);
+            //listObj.Add(model.PipingLeak);
             listObj.Add(model.PipingBlowing);
             listObj.Add(model.Looptest);
-            listObj.Add(model.Calibration);
+            //listObj.Add(model.Calibration);
 
             //鍏ㄦ槸NA鎴朇ompleted 鐘舵�佹槸Completed
-            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 6)
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
             {
                 model.FINAL_Status = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 6)
+            }
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.FINAL_Status = "Not Start";
             }
@@ -122,11 +123,11 @@ namespace FineUIPro.Web.Transfer
                     newModel.Subsystem = txtSubsystem.Text;
                     newModel.Test_Package = txtTest_Package.Text;
                     newModel.InstallationCalibration = ddlInstallationCalibration.SelectedValue;
-                    newModel.PipingPressuretest = ddlPipingPressuretest.SelectedValue;
-                    newModel.PipingLeak = ddlPipingLeak.SelectedValue;
+                    //newModel.PipingPressuretest = ddlPipingPressuretest.SelectedValue;
+                    //newModel.PipingLeak = ddlPipingLeak.SelectedValue;
                     newModel.PipingBlowing = ddlPipingBlowing.SelectedValue;
                     newModel.Looptest = ddlLooptest.SelectedValue;
-                    newModel.Calibration = ddlCalibration.SelectedValue;
+                    //newModel.Calibration = ddlCalibration.SelectedValue;
                     newModel.FINAL_Status = model.FINAL_Status;
                     newModel.Descriptions = txtDescriptions.Text;
                 }
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
index 2f84802f..010b72ff 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
@@ -86,15 +86,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtDescriptions;
 
-        /// <summary>
-        /// ddlCalibration 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlCalibration;
-
         /// <summary>
         /// ddlInstallationCalibration 鎺т欢銆�
         /// </summary>
@@ -104,24 +95,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlInstallationCalibration;
 
-        /// <summary>
-        /// ddlPipingPressuretest 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPipingPressuretest;
-
-        /// <summary>
-        /// ddlPipingLeak 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPipingLeak;
-
         /// <summary>
         /// ddlPipingBlowing 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
index 7ac24cb0..ebdf02d7 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>Table 1锛歀HC System List</title>
 </head>
 <body>
@@ -12,21 +12,23 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <Items>
+            <items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="璁惧鏉愭枡鎶ラ獙" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="SN"
                     SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true">
-                    <Toolbars>
+                    <toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                <f:TextBox runat="server" ID="txtCommissioningsystemcode" 
-                                    Label="Commissioning system code" LabelWidth="220px"  LabelAlign="Right"></f:TextBox>
+                            <items>
+                                <f:TextBox runat="server" ID="txtCommissioningsystemcode"
+                                    Label="Commissioning system code" LabelWidth="220px" LabelAlign="Right">
+                                </f:TextBox>
 
-                                 <f:TextBox runat="server" ID="txtCommissioningCodeDescription" Label="Commissioning Code Description" 
-                                     LabelWidth="240px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtCommissioningCodeDescription" Label="Commissioning Code Description"
+                                    LabelWidth="240px" LabelAlign="Right">
+                                </f:TextBox>
 
                                 <%--<f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
@@ -42,69 +44,72 @@
 
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
                                 </f:Button>
-
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnImport" ToolTip="瀵煎叆" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
-                            </Items>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </items>
                         </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                         <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="50px">
+                    </toolbars>
+                    <columns>
+                        <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="70px">
                         </f:RenderField>
 
-                        <f:RenderField ColumnID="SystemNo" DataField="SystemNo" 
+                        <f:RenderField ColumnID="SystemNo" DataField="SystemNo"
                             FieldType="String" HeaderText="SystemNo" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="120px">
+                            HeaderTextAlign="Center" MinWidth="100px">
                         </f:RenderField>
 
-                        <f:RenderField ColumnID="Commissioningsystemcode" DataField="Commissioningsystemcode" 
+                        <f:RenderField ColumnID="Commissioningsystemcode" DataField="Commissioningsystemcode"
                             FieldType="String" HeaderText="Commissioning<br/> system code" TextAlign="Center"
                             HeaderTextAlign="Center" MinWidth="180px">
                         </f:RenderField>
 
-                         
-                        <f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription" 
+
+                        <f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription"
                             FieldType="String" HeaderText="Commissioning Code<br/> Description" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="180px">
+                            HeaderTextAlign="Center" MinWidth="300px">
                         </f:RenderField>
 
-                        <f:RenderField ColumnID="Describe" DataField="Describe" 
+                        <f:RenderField ColumnID="Describe" DataField="Describe"
                             FieldType="String" HeaderText="璇曡溅浠ｅ彿鎻忚堪" TextAlign="Center" Hidden="true"
-                            HeaderTextAlign="Center" MinWidth="160px">
+                            HeaderTextAlign="Center" MinWidth="200px">
                         </f:RenderField>
 
-                         <f:RenderField ColumnID="SubCommissioningsystem" DataField="SubCommissioningsystem" 
+                        <f:RenderField ColumnID="SubCommissioningsystem" DataField="SubCommissioningsystem"
                             FieldType="String" HeaderText="Sub-system No" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="180px">
+                            HeaderTextAlign="Center" MinWidth="120px">
                         </f:RenderField>
 
-                         <f:RenderField ColumnID="PlanStartofTestingDate" DataField="PlanStartofTestingDate" FieldType="Date" Renderer="Date"   
-                               RendererArgument="yyyy-MM-dd"
-                            HeaderText="Plan Start of Testing Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="180px">
+                        <f:RenderField ColumnID="PlanStartofTestingDate" DataField="PlanStartofTestingDate" FieldType="Date" Renderer="Date"
+                            RendererArgument="yyyy-MM-dd"
+                            HeaderText="Plan Start of<br/>Testing Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="140px">
                         </f:RenderField>
 
-                        <f:RenderField ColumnID="PlanFinishofTestingDate" DataField="PlanFinishofTestingDate" FieldType="Date" Renderer="Date"   
-                               RendererArgument="yyyy-MM-dd"
-                            HeaderText="Plan Finish of Testing Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="200px">
+                        <f:RenderField ColumnID="PlanFinishofTestingDate" DataField="PlanFinishofTestingDate" FieldType="Date" Renderer="Date"
+                            RendererArgument="yyyy-MM-dd"
+                            HeaderText="Plan Finish of<br/>Testing Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="140px">
                         </f:RenderField>
 
-                         <f:RenderField ColumnID="Status" DataField="Status" 
+                        <f:RenderField ColumnID="Status" DataField="Status"
                             FieldType="String" HeaderText="Status" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="150px">
+                            HeaderTextAlign="Center" MinWidth="90px">
                         </f:RenderField>
 
-                        <f:RenderField ColumnID="ActualFinishedDate" DataField="ActualFinishedDate" FieldType="Date" Renderer="Date"   
-                               RendererArgument="yyyy-MM-dd"
-                            HeaderText="Actual Finished Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="180px">
+                        <f:RenderField ColumnID="ActualFinishedDate" DataField="ActualFinishedDate" FieldType="Date" Renderer="Date"
+                            RendererArgument="yyyy-MM-dd"
+                            HeaderText="Actual Finished Date" TextAlign="Center" HeaderTextAlign="Center" MinWidth="160px">
                         </f:RenderField>
 
-                    </Columns>
-                    <Listeners>
+                    </columns>
+                    <listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                         <f:Listener Event="dataload" Handler="onGridDataLoad" />
-                    </Listeners>
-                    <PageItems>
+                    </listeners>
+                    <pageitems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -114,9 +119,9 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="鎵�鏈夎" Value="100000" />
                         </f:DropDownList>
-                    </PageItems>
+                    </pageitems>
                 </f:Grid>
-            </Items>
+            </items>
         </f:Panel>
         <f:Window ID="Window1" Title="LHC System List" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
@@ -131,14 +136,14 @@
             IsModal="true" Width="700px" Height="500px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <Items>
+            <items>
                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
 
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="鍒犻櫎" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </Items>
+            </items>
         </f:Menu>
     </form>
     <script type="text/javascript">
@@ -155,4 +160,4 @@
 
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
index 7a8f8ea5..efb55a78 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.cs
@@ -32,8 +32,8 @@ namespace FineUIPro.Web.Transfer
         {
             if (!IsPostBack)
             {
-                Type= Request.Params["Type"];
-                if (Type=="1")
+                Type = Request.Params["Type"];
+                if (Type == "1")
                 {
                     var a = Grid1;
                     Grid1.Columns[4].Hidden = false;
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.Transfer
                 GetButtonPower();
                 BindGrid();
 
-                btnNew.OnClientClick = Window1.GetShowReference("LHCSystemListEdit.aspx?Type="+Type) + "return false;";
+                btnNew.OnClientClick = Window1.GetShowReference("LHCSystemListEdit.aspx?Type=" + Type) + "return false;";
             }
         }
 
@@ -59,8 +59,8 @@ namespace FineUIPro.Web.Transfer
                 return;
             }
             string id = Grid1.SelectedRowID;
-           
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LHCSystemListEdit.aspx?Id={0}&Type={1}", id,Type, "缂栬緫 - ")));
+
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LHCSystemListEdit.aspx?Id={0}&Type={1}", id, Type, "缂栬緫 - ")));
         }
         #endregion
 
@@ -221,10 +221,52 @@ namespace FineUIPro.Web.Transfer
         /// <param name="e"></param>
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("LHCSystemListDataIn.aspx?Type="+Type, "瀵煎叆 - ")));
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("LHCSystemListDataIn.aspx?Type=" + Type, "瀵煎叆 - ")));
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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($"{(Type == "1" ? "闈�" : "")}宸ヨ壓娓呭崟" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_LHCSystemList where ProjectId = '{ProjectId}' and Type = '{Type}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -242,8 +284,9 @@ namespace FineUIPro.Web.Transfer
             {
                 menuId = BLL.Const.Transfer_LHCSystemListMenuId0;
             }
-            else {
-                menuId= BLL.Const.Transfer_LHCSystemListMenuId1;
+            else
+            {
+                menuId = BLL.Const.Transfer_LHCSystemListMenuId1;
             }
 
             var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId);
@@ -252,6 +295,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs
index e1eface1..a8cc65f7 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -104,6 +113,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index 260ce638..0bcbfefc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -12,64 +12,68 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <Items>
+            <items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="璁惧鏉愭枡鎶ラ獙" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="PIPINGLINENUMBER"
                     SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true">
-                    <Toolbars>
+                    <toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
+                            <items>
                                 <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="Test Package No" LabelWidth="150px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtTurnoverSystemCode" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
-                                    <f:ListItem Value="" Text="All" Selected="true"/>
-                                    <f:ListItem Value="Not Start" Text="Not Start"/>
-                                    <f:ListItem Value="In progress" Text="In progress"/>
-                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                    <f:ListItem Value="" Text="All" Selected="true" />
+                                    <f:ListItem Value="Not Start" Text="Not Start" />
+                                    <f:ListItem Value="In progress" Text="In progress" />
+                                    <f:ListItem Value="Completed" Text="Completed" />
                                 </f:DropDownList>
 
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="鏌ヨ">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
+                                </f:Button>
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
                                 </f:Button>
-
                                 <f:Button ID="btnImport" ToolTip="瀵煎叆" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
-                            </Items>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </items>
                         </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
+                    </toolbars>
+                    <columns>
                         <f:GroupField ID="g1" HeaderText="PIPING" HeaderTextAlign="Center">
-                            <Columns>
+                            <columns>
                                 <f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="Test Package No" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="220px">
+                                    HeaderTextAlign="Center" MinWidth="230px">
                                 </f:RenderField>
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
-                          <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="330px">
-                         </f:RenderField>
+                        <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="300px">
+                        </f:RenderField>
 
                         <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
-                            <Columns>
+                            <columns>
                                 <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="90px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
+                                <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System No" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="200px">
+                                    HeaderTextAlign="Center" MinWidth="180px">
                                 </f:RenderField>
-                            </Columns>
+                            </columns>
                         </f:GroupField>
 
                         <%--<f:GroupField ID="g3" HeaderText="Ready for Test " HeaderTextAlign="Center">
@@ -96,7 +100,7 @@
                             </Columns>
                         </f:GroupField>--%>
 
-                        <f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
+                        <%--<f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
                             <Columns>
                                  <f:RenderField ColumnID="PWD" DataField="PWD" FieldType="String" HeaderText="Ready for Test" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="120px">
@@ -110,9 +114,9 @@
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                             </Columns>
-                        </f:GroupField>
+                        </f:GroupField>--%>
 
-                        <f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
+                        <%--<f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
                             <Columns>
                                       <f:RenderField ColumnID="Blowingflushing" DataField="Blowingflushing" FieldType="String" HeaderText="Blowing /flushing &<br/> Dry out" TextAlign="Center"
                                     HeaderTextAlign="Center" Width="160px">
@@ -126,17 +130,53 @@
                                     HeaderTextAlign="Center" Width="150px">
                                 </f:RenderField>
                             </Columns>
+                        </f:GroupField>--%>
+
+                        <f:GroupField ID="g6" HeaderText="鐒婃帴淇℃伅" HeaderTextAlign="Center">
+                            <columns>
+                                <f:RenderField ColumnID="TotalFactor" DataField="TotalFactor" FieldType="String" HeaderText="鎬昏揪鍥犳暟" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="90px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CompleteFactor" DataField="CompleteFactor" FieldType="String" HeaderText="瀹屾垚杈惧洜鏁�" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="CompleteProportion" DataField="CompleteProportion" FieldType="String" HeaderText="瀹屾垚姣斾緥(%)" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                            </columns>
                         </f:GroupField>
 
-                         <f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
+                        <f:GroupField ID="g7" HeaderText="璇曞帇鍖呯姸鎬�" HeaderTextAlign="Center">
+                            <columns>
+                                <f:RenderField ColumnID="PressureTestCompleted" DataField="PressureTestCompleted" FieldType="String" HeaderText="璇曞帇瀹屾垚" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="RinseAndBlowClean" DataField="RinseAndBlowClean" FieldType="String" HeaderText="鍐叉礂鍚规壂" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Reduction" DataField="Reduction" FieldType="String" HeaderText="澶嶄綅" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="100px">
+                                </f:RenderField>
+                            </columns>
+                        </f:GroupField>
+
+                        <f:RenderField ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing" FieldType="String" HeaderText="鐢典即鐑�" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="60px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="Insulation" DataField="Insulation" FieldType="String" HeaderText="淇濇俯/鍐�" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="60px">
+                        </f:RenderField>
+
+                        <f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
                             HeaderTextAlign="Center" MinWidth="120px">
                         </f:RenderField>
 
-                    </Columns>
-                    <Listeners>
+                    </columns>
+                    <listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
+                    </listeners>
+                    <pageitems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -146,13 +186,13 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="鎵�鏈夎" Value="100000" />
                         </f:DropDownList>
-                    </PageItems>
+                    </pageitems>
                 </f:Grid>
-            </Items>
+            </items>
         </f:Panel>
         <f:Window ID="Window1" Title="Piping" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="900px" Height="480px">
+            Width="900px" Height="800px">
         </f:Window>
         <f:Window ID="Window2" Title="寮瑰嚭绐椾綋" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
@@ -163,14 +203,14 @@
             IsModal="true" Width="700px" Height="500px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <Items>
-                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
+            <items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
 
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="鍒犻櫎" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </Items>
+            </items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
index 683c61b5..6d7ca059 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
@@ -55,10 +55,15 @@ namespace FineUIPro.Web.Transfer
             {
                 strSql += " And FINALStatus='" + ddStatus.SelectedValue + "' ";
             }
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SYSTEM like @SYSTEM";
+            //    listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.txtTurnoverSystemCode.Text.Trim()))
             {
-                strSql += " AND SYSTEM like @SYSTEM";
-                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND TestPackage like @SUBSYSTEM";
+                listStr.Add(new SqlParameter("@SUBSYSTEM", "%" + this.txtTurnoverSystemCode.Text.Trim() + "%"));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -206,6 +211,48 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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 = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from Transfer_Piping where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -224,6 +271,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
index ad4e146d..ce4680b9 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtPIPINGLINENUMBER;
 
         /// <summary>
-        /// txtSystem 鎺т欢銆�
+        /// txtTurnoverSystemCode 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtTurnoverSystemCode;
 
         /// <summary>
         /// ddStatus 鎺т欢銆�
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// g1 鎺т欢銆�
         /// </summary>
@@ -132,22 +150,22 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.GroupField g2;
 
         /// <summary>
-        /// g4 鎺т欢銆�
+        /// g6 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.GroupField g4;
+        protected global::FineUIPro.GroupField g6;
 
         /// <summary>
-        /// g5 鎺т欢銆�
+        /// g7 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.GroupField g5;
+        protected global::FineUIPro.GroupField g7;
 
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
index c672ba7d..f4b4048f 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
@@ -317,44 +317,65 @@ namespace FineUIPro.Web.Transfer
                     model.ProjectId = CurrUser.LoginProjectId;
                     model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
                     model.Descriptions = pds.Rows[i][1].ToString().Trim();
-                    model.SYSTEM = pds.Rows[i][1+1].ToString().Trim();
+                    model.SYSTEM = pds.Rows[i][1 + 1].ToString().Trim();
                     model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
                     model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
 
-                    var obj1 = model.PWD= pds.Rows[i][4 + 1].ToString().Trim();
-                    //var obj2 =model.Apunchclosed = pds.Rows[i][5 + 1].ToString().Trim();
-                    //var obj3 =model.NDTReport = pds.Rows[i][6 + 1].ToString().Trim();
-                    //var obj4 =model.TemperaryMeasurement = pds.Rows[i][7 + 1].ToString().Trim();
-                    //var obj5 =model.FWDfinished = pds.Rows[i][8 + 1].ToString().Trim();
-                    var obj6 =model.HydrostaticTest = pds.Rows[i][6].ToString().Trim();
-                    var obj7 =model.Report = pds.Rows[i][7].ToString().Trim();
-                    var obj8 =model.Blowingflushing = pds.Rows[i][8].ToString().Trim();
-                    var obj9 = model.Systemreinstalled = pds.Rows[i][9].ToString().Trim();
+                    //var obj1 = model.PWD = pds.Rows[i][4 + 1].ToString().Trim();
+                    ////var obj2 =model.Apunchclosed = pds.Rows[i][5 + 1].ToString().Trim();
+                    ////var obj3 =model.NDTReport = pds.Rows[i][6 + 1].ToString().Trim();
+                    ////var obj4 =model.TemperaryMeasurement = pds.Rows[i][7 + 1].ToString().Trim();
+                    ////var obj5 =model.FWDfinished = pds.Rows[i][8 + 1].ToString().Trim();
+                    //var obj6 = model.HydrostaticTest = pds.Rows[i][6].ToString().Trim();
+                    //var obj7 = model.Report = pds.Rows[i][7].ToString().Trim();
+                    //var obj8 = model.Blowingflushing = pds.Rows[i][8].ToString().Trim();
+                    //var obj9 = model.Systemreinstalled = pds.Rows[i][9].ToString().Trim();
 
-                    model.BlowingReport= pds.Rows[i][10].ToString().Trim();
+                    //model.BlowingReport = pds.Rows[i][10].ToString().Trim();
+
+                    //var obj1 = model.TotalFactor = pds.Rows[i][5].ToString().Trim();
+                    //var obj6 = model.CompleteFactor = pds.Rows[i][6].ToString().Trim();
+                    //var obj7 = model.CompleteProportion = pds.Rows[i][7].ToString().Trim();
+
+                    var obj1 = pds.Rows[i][5].ToString().Trim();
+                    var obj6 = pds.Rows[i][6].ToString().Trim();
+                    var obj7 = pds.Rows[i][7].ToString().Trim();
+
+                    model.TotalFactor = !string.IsNullOrWhiteSpace(obj1) ? decimal.Parse(obj1) : 0;
+                    model.CompleteFactor = !string.IsNullOrWhiteSpace(obj6) ? decimal.Parse(obj6) : 0;
+
+                    if (model.TotalFactor > 0 && model.CompleteFactor > 0)
+                    {
+                        model.CompleteProportion = Math.Round((decimal)(model.CompleteFactor / model.TotalFactor) * 100, 2);
+                    }
+                    else
+                    {
+                        model.CompleteProportion = 0;
+                    }
+
+                    var obj8 = model.PressureTestCompleted = pds.Rows[i][8].ToString().Trim();
+                    var obj9 = model.RinseAndBlowClean = pds.Rows[i][9].ToString().Trim();
+
+                    var obj10 = model.Reduction = pds.Rows[i][10].ToString().Trim();
+
+                    model.ElectricHeatTracing = pds.Rows[i][11].ToString().Trim();
+                    model.Insulation = pds.Rows[i][12].ToString().Trim();
 
                     #region 鍒ゆ柇鐘舵��
                     var listObj = new List<string>();
-                    listObj.Add(obj1);
-                    //listObj.Add(obj2);
-                    //listObj.Add(obj3);
-                    //listObj.Add(obj4);
-                    //listObj.Add(obj10);
-                    listObj.Add(obj6);
-                    listObj.Add(obj7);
                     listObj.Add(obj8);
                     listObj.Add(obj9);
+                    listObj.Add(obj10);
                     //鍏ㄦ槸NA鎴朇ompleted 鐘舵�佹槸Completed
-                    if (listObj.Where(x=>x=="NA" || x== "Completed").ToList().Count==5)
+                    if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
                     {
                         model.FINALStatus = "Completed";
                         list.Add(model);
-                        continue ;
+                        continue;
                     }
-                    
 
-                    //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                    if (listObj.Where(x=>x== "Not Start").ToList().Count==5)
+                    //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
                     {
                         model.FINALStatus = "Not Start";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
index af5509e0..d273ab05 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
@@ -30,7 +30,10 @@
                         <f:TextBox ID="txtSubsystem" runat="server" Label="Sub-System"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
-
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTestPackage" runat="server" Label="Turnover System Code"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
@@ -44,7 +47,6 @@
                     </Items>
                 </f:FormRow>
 
-
                 <%--<f:FormRow>
                     <Items>
                         <f:GroupPanel Layout="Anchor" Title="Ready for Test" runat="server">
@@ -88,7 +90,7 @@
                     </Items>
                 </f:FormRow>--%>
 
-                <f:FormRow>
+                <%--<f:FormRow>
                     <Items>
                         <f:GroupPanel Layout="Anchor" Title="Hydrostatic test schedule" runat="server">
                             <Items>
@@ -115,9 +117,9 @@
                             </Items>
                         </f:GroupPanel>
                     </Items>
-                </f:FormRow>
+                </f:FormRow>--%>
 
-                <f:FormRow>
+                <%--<f:FormRow>
                     <Items>
                         <f:GroupPanel Layout="Anchor" Title="Pre-Commissioning" runat="server">
                             <Items>
@@ -141,7 +143,80 @@
                             </Items>
                         </f:GroupPanel>
                     </Items>
+                </f:FormRow>--%>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="鐒婃帴淇℃伅" runat="server">
+                            <Items>
+                                <f:NumberBox ID="txtTotalFactor" NoDecimal="false" NoNegative="true" MinValue="0" runat="server" AutoPostBack="true" OnTextChanged="TextBox_OnTextChanged" Label="鎬昏揪鍥犳暟" LabelWidth="180px">
+                                </f:NumberBox>
+                                <f:NumberBox ID="txtCompleteFactor" NoDecimal="false" NoNegative="true" MinValue="0" runat="server" Label="瀹屾垚杈惧洜鏁�" AutoPostBack="true" OnTextChanged="TextBox_OnTextChanged" LabelWidth="180px">
+                                </f:NumberBox>
+                                <f:NumberBox ID="txtCompleteProportion" NoDecimal="false" NoNegative="true" MinValue="0" MaxValue="100" runat="server" Label="瀹屾垚姣斾緥锛�%锛�" Readonly="true" LabelWidth="180px">
+                                </f:NumberBox>
+                                <%-- <f:TextBox ID="txtTotalFactor" runat="server" Label="鎬昏揪鍥犳暟"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:TextBox>
+                                <f:TextBox ID="txtCompleteFactor" runat="server" Label="瀹屾垚杈惧洜鏁�"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:TextBox>
+                                <f:TextBox ID="txtCompleteProportion" runat="server" Label="瀹屾垚姣斾緥锛�%锛�"
+                                    LabelAlign="Right" LabelWidth="180px">
+                                </f:TextBox>--%>
+                            </Items>
+                        </f:GroupPanel>
+                    </Items>
                 </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="璇曞帇鍖呯姸鎬�" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlPressureTestCompleted" runat="server" Label="璇曞帇瀹屾垚" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlRinseAndBlowClean" runat="server" Label="鍐叉礂鍚规壂" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+
+                                <f:DropDownList ID="ddlReduction" runat="server" Label="澶嶄綅" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
+                                    <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
+                                    <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:GroupPanel Layout="Anchor" Title="鍏朵粬淇℃伅" runat="server">
+                            <Items>
+                                <f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="鐢典即鐑�" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlInsulation" runat="server" Label="淇濇俯/鍐�" LabelWidth="180px">
+                                    <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                            </Items>
+                        </f:GroupPanel>
+                    </Items>
+                </f:FormRow>
+
             </Rows>
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
index c741d152..213e5fc9 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
@@ -45,73 +45,102 @@ namespace FineUIPro.Web.Transfer
             {
                 Id = Request.Params["Id"];
                 ProjectId = this.CurrUser.LoginProjectId;
-                if (!string.IsNullOrEmpty(Id)) {
+                if (!string.IsNullOrEmpty(Id))
+                {
                     var model = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.Id == Id);
-                    if (model!=null)
+                    if (model != null)
                     {
                         txtPIPINGLINENUMBER.Text = model.PIPINGLINENUMBER;
                         txtSYSTEM.Text = model.SYSTEM;
                         txtSubsystem.Text = model.Subsystem;
                         txtTestPackage.Text = model.TestPackage;
-                        ddlPWD.SelectedValue = model.PWD;
+                        txtDescriptions.Text = model.Descriptions;
+                        //ddlPWD.SelectedValue = model.PWD;
                         //ddlApunchclosed.SelectedValue = model.Apunchclosed;
                         //ddlNDTReport.SelectedValue = model.NDTReport;
                         //ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
-                        ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
-                        ddlReport.SelectedValue = model.Report;
-                        ddlBlowingflushing.SelectedValue = model.Blowingflushing;
+                        //ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
+                        //ddlReport.SelectedValue = model.Report;
+                        //ddlBlowingflushing.SelectedValue = model.Blowingflushing;
                         //ddlFWDfinished.SelectedValue = model.FWDfinished;
-                        ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
-                        txtBlowingReport.Text = model.BlowingReport;
+                        //ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
+                        //txtBlowingReport.Text = model.BlowingReport;
 
-                        txtDescriptions.Text = model.Descriptions;
+                        txtTotalFactor.Text = model.TotalFactor.ToString();
+                        txtCompleteFactor.Text = model.CompleteFactor.ToString();
+                        txtCompleteProportion.Text = model.CompleteProportion.ToString();
+                        ddlPressureTestCompleted.SelectedValue = model.PressureTestCompleted;
+                        ddlRinseAndBlowClean.SelectedValue = model.RinseAndBlowClean;
+                        ddlReduction.SelectedValue = model.Reduction;
+                        ddlElectricHeatTracing.SelectedValue = model.ElectricHeatTracing;
+                        ddlInsulation.SelectedValue = model.Insulation;
                     }
                 }
             }
         }
 
-        protected void btnSave_Click(object sender, EventArgs e) {
-            var model = new Model.Transfer_Piping() {
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            var model = new Model.Transfer_Piping()
+            {
                 ProjectId = ProjectId,
                 PIPINGLINENUMBER = txtPIPINGLINENUMBER.Text,
                 SYSTEM = txtSYSTEM.Text,
                 Subsystem = txtSubsystem.Text,
                 TestPackage = txtTestPackage.Text,
-                PWD = ddlPWD.SelectedValue,
+                //PWD = ddlPWD.SelectedValue,
                 //Apunchclosed = ddlApunchclosed.SelectedValue,
                 //NDTReport= ddlNDTReport.SelectedValue,
                 //TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
-                HydrostaticTest=ddlHydrostaticTest.SelectedValue,
-                Report= ddlReport.SelectedValue,
-                Blowingflushing= ddlBlowingflushing.SelectedValue,
+                //HydrostaticTest=ddlHydrostaticTest.SelectedValue,
+                //Report= ddlReport.SelectedValue,
+                //Blowingflushing= ddlBlowingflushing.SelectedValue,
                 //FWDfinished= ddlFWDfinished.SelectedValue,
-                Systemreinstalled= ddlSystemreinstalled.SelectedValue,
-                BlowingReport= txtBlowingReport.Text,
-                Descriptions= txtDescriptions.Text
+                //Systemreinstalled= ddlSystemreinstalled.SelectedValue,
+                //BlowingReport= txtBlowingReport.Text,
+
+                TotalFactor = Convert.ToDecimal(txtTotalFactor.Text.Trim()),
+                CompleteFactor = Convert.ToDecimal(txtCompleteFactor.Text.Trim()),
+                CompleteProportion = Convert.ToDecimal(txtCompleteProportion.Text.Trim()),
+                PressureTestCompleted = ddlPressureTestCompleted.SelectedValue,
+                RinseAndBlowClean = ddlRinseAndBlowClean.SelectedValue,
+                Reduction = ddlReduction.SelectedValue,
+                ElectricHeatTracing = ddlElectricHeatTracing.SelectedValue,
+                Insulation = ddlInsulation.SelectedValue,
+
+                Descriptions = txtDescriptions.Text
             };
             #region 鍒ゆ柇鐘舵��
             var listObj = new List<string>();
-            listObj.Add(model.PWD);
+            //listObj.Add(model.PWD);
             //listObj.Add(model.Apunchclosed);
             //listObj.Add(model.NDTReport);
             //listObj.Add(model.TemperaryMeasurement);
-            listObj.Add(model.HydrostaticTest);
-            listObj.Add(model.Report);
-            listObj.Add(model.Blowingflushing);
+            //listObj.Add(model.HydrostaticTest);
+            //listObj.Add(model.Report);
+            //listObj.Add(model.Blowingflushing);
             //listObj.Add(model.FWDfinished);
-            listObj.Add(model.Systemreinstalled);
+            //listObj.Add(model.Systemreinstalled);
             //listObj.Add(model.BlowingReport);
+
+            //listObj.Add(model.TotalFactor);
+            //listObj.Add(model.CompleteFactor);
+            //listObj.Add(model.CompleteProportion);
+            listObj.Add(model.PressureTestCompleted);
+            listObj.Add(model.RinseAndBlowClean);
+            listObj.Add(model.Reduction);
+
             //鍏ㄦ槸NA鎴朇ompleted 鐘舵�佹槸Completed
-            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
+            if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
             {
                 model.FINALStatus = "Completed";
-              
+
             }
-            //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.FINALStatus = "Not Start";
-               
+
             }
             //濡傛灉鍏朵腑鏈変竴椤规槸In progress 鎴朜ot Start 鏄� In progress
             else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.Transfer
                 model.FINALStatus = "In progress";
             }
 
-           
+
             #endregion
 
             if (!string.IsNullOrEmpty(Id))
@@ -129,21 +158,32 @@ namespace FineUIPro.Web.Transfer
                 newModel.SYSTEM = model.SYSTEM;
                 newModel.Subsystem = newModel.Subsystem;
                 newModel.TestPackage = txtTestPackage.Text;
-                newModel.PWD = ddlPWD.SelectedValue;
+                //newModel.PWD = ddlPWD.SelectedValue;
                 //newModel.Apunchclosed = ddlApunchclosed.SelectedValue;
                 //newModel.NDTReport = ddlNDTReport.SelectedValue;
                 //newModel.TemperaryMeasurement = ddlTemperaryMeasurement.SelectedValue;
-                newModel.HydrostaticTest = ddlHydrostaticTest.SelectedValue;
-                newModel.Report = ddlReport.SelectedValue;
-                newModel.Blowingflushing = ddlBlowingflushing.SelectedValue;
+                //newModel.HydrostaticTest = ddlHydrostaticTest.SelectedValue;
+                //newModel.Report = ddlReport.SelectedValue;
+                //newModel.Blowingflushing = ddlBlowingflushing.SelectedValue;
                 //newModel.FWDfinished = ddlFWDfinished.SelectedValue;
-                newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
-                newModel.BlowingReport = txtBlowingReport.Text;
+                //newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
+                //newModel.BlowingReport = txtBlowingReport.Text;
+
+                newModel.TotalFactor = Convert.ToDecimal(txtTotalFactor.Text.Trim());
+                newModel.CompleteFactor = Convert.ToDecimal(txtCompleteFactor.Text.Trim());
+                newModel.CompleteProportion = Convert.ToDecimal(txtCompleteProportion.Text.Trim());
+                newModel.PressureTestCompleted = ddlPressureTestCompleted.SelectedValue;
+                newModel.RinseAndBlowClean = ddlRinseAndBlowClean.SelectedValue;
+                newModel.Reduction = ddlReduction.SelectedValue;
+                newModel.ElectricHeatTracing = ddlElectricHeatTracing.SelectedValue;
+                newModel.Insulation = ddlInsulation.SelectedValue;
+
                 newModel.FINALStatus = model.FINALStatus;
                 newModel.Descriptions = txtDescriptions.Text;
             }
-            else {
-                model.Id=Id = Guid.NewGuid().ToString();
+            else
+            {
+                model.Id = Id = Guid.NewGuid().ToString();
                 Funs.DB.Transfer_Piping.InsertOnSubmit(model);
             }
             Funs.DB.SubmitChanges();
@@ -152,5 +192,23 @@ namespace FineUIPro.Web.Transfer
         }
 
 
+        protected void TextBox_OnTextChanged(object sender, EventArgs e)
+        {
+            decimal num1 = 0, num2 = 0;
+            if (!string.IsNullOrEmpty(this.txtTotalFactor.Text.Trim()))
+            {
+                num1 = Convert.ToDecimal(this.txtTotalFactor.Text.Trim());
+            }
+            if (!string.IsNullOrEmpty(this.txtCompleteFactor.Text.Trim()))
+            {
+                num2 = Convert.ToDecimal(this.txtCompleteFactor.Text.Trim());
+            }
+            if (num1 > 0 && num2 > 0)
+            {
+                var dCompleteProportion = Math.Round(((num2 / num1) * 100), 2);
+                this.txtCompleteProportion.Text = dCompleteProportion.ToString();
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
index 88fbb641..8d516c3e 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
@@ -87,58 +87,76 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtDescriptions;
 
         /// <summary>
-        /// ddlPWD 鎺т欢銆�
+        /// txtTotalFactor 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPWD;
+        protected global::FineUIPro.NumberBox txtTotalFactor;
 
         /// <summary>
-        /// ddlHydrostaticTest 鎺т欢銆�
+        /// txtCompleteFactor 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlHydrostaticTest;
+        protected global::FineUIPro.NumberBox txtCompleteFactor;
 
         /// <summary>
-        /// ddlReport 鎺т欢銆�
+        /// txtCompleteProportion 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlReport;
+        protected global::FineUIPro.NumberBox txtCompleteProportion;
 
         /// <summary>
-        /// ddlBlowingflushing 鎺т欢銆�
+        /// ddlPressureTestCompleted 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlBlowingflushing;
+        protected global::FineUIPro.DropDownList ddlPressureTestCompleted;
 
         /// <summary>
-        /// ddlSystemreinstalled 鎺т欢銆�
+        /// ddlRinseAndBlowClean 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.DropDownList ddlSystemreinstalled;
+        protected global::FineUIPro.DropDownList ddlRinseAndBlowClean;
 
         /// <summary>
-        /// txtBlowingReport 鎺т欢銆�
+        /// ddlReduction 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtBlowingReport;
+        protected global::FineUIPro.DropDownList ddlReduction;
+
+        /// <summary>
+        /// ddlElectricHeatTracing 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlElectricHeatTracing;
+
+        /// <summary>
+        /// ddlInsulation 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlInsulation;
 
         /// <summary>
         /// Toolbar1 鎺т欢銆�
diff --git a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
index 7c37a156..50f21530 100644
--- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
@@ -50,34 +50,34 @@
                       
                           <f:GroupField HeaderText="Plumbing" TextAlign="Center" MinWidth="200px">
                             <Columns>
-                                <f:BoundField minWidth="140px"  TextAlign="Center"  ColumnID="Plumbing" DataField="Plumbing" HeaderText="Tag.No" />
+                                <f:BoundField MinWidth="140px"  TextAlign="Center"  ColumnID="Plumbing" DataField="Plumbing" HeaderText="Tag.No" />
                             </Columns>
                         </f:GroupField>
                        
                           <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="210px">
+                                    HeaderTextAlign="Center" MinWidth="210px">
                          </f:RenderField>
 
                          <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
                             <Columns>
-                                <f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
-                                <f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
-                                <f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
+                                <f:BoundField MinWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
+                                <f:BoundField MinWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
+                                <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
                             </Columns>
                         </f:GroupField>
                        
                          <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
                             <Columns>
                                <f:RenderField ColumnID="Ndt" DataField="Ndt" FieldType="String" HeaderText="NDT" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="100px">
+                                    HeaderTextAlign="Center" MinWidth="100px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="Flushing" DataField="Flushing" FieldType="String" HeaderText="Flushing" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="120px">
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
 
                                 <f:RenderField ColumnID="RunningTest" DataField="RunningTest" FieldType="String" HeaderText="Running Test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="120px">
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
index e6f120e5..63fd308d 100644
--- a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
@@ -342,9 +342,8 @@ namespace FineUIPro.Web.Transfer
                             continue;
                         }
 
-
-                        //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                        if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+                        //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
                         {
                             model.FINAL_Status = "Not Start";
                             list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
index ab730923..8a503e28 100644
--- a/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
@@ -88,8 +88,9 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
             {
                 model.FINAL_Status = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+            }
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.FINAL_Status = "Not Start";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index 7d45c29e..fc6e24b4 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -22,7 +22,7 @@
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Sub Sys No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
                                 <f:DropDownList ID="ddlCat" runat="server" Label="Cat." AutoPostBack="true" Width="80px" LabelWidth="40px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="A" Text="A"></f:ListItem>
@@ -32,18 +32,6 @@
                                 </f:DropDownList>
                                 <f:TextBox runat="server" ID="txtRaised_By" Label="Raised By" LabelWidth="90px" LabelAlign="Right" Width="150px"></f:TextBox>
                                 <f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
-                                <f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
-                                    <f:ListItem Value="N" Text="N"></f:ListItem>
-                                </f:DropDownList>
-                                <f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="80px" LabelWidth="40px">
-                                    <f:ListItem Value="" Text=""></f:ListItem>
-                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
-                                    <f:ListItem Value="Y1" Text="Y1"></f:ListItem>
-                                    <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
-                                    <f:ListItem Value="N" Text="N"></f:ListItem>
-                                </f:DropDownList>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="鏌ヨ">
                                 </f:Button>
@@ -52,33 +40,48 @@
 
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板" Hidden="true">
                                 </f:Button>
-                                <f:Button ID="btnImport" ToolTip="瀵煎叆" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="180px" LabelWidth="100px">
+                                <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="170px" LabelWidth="100px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
-                                    <f:ListItem Value="FWD" Text="FWD"></f:ListItem>
+                                    <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
+                                    <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
                                 </f:DropDownList>
-                                <f:TextBox runat="server" ID="txtAction_By" Label="Action By" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtAction_By" Label="Action By" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>--%>
                                 <f:TextBox runat="server" ID="txtPIC" Label="璐ｄ换浜篜IC" LabelWidth="90px" LabelAlign="Right" Width="180px"></f:TextBox>
-                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="璐ｄ换浜�-浜旂幆/PIC-WUH" LabelWidth="180px" LabelAlign="Right" Width="300px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtPIC_WUH" Label="璐ｄ换浜�-浜旂幆/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="260px"></f:TextBox>
                                 <f:DropDownList ID="ddlStatus" runat="server" Label="鐘舵��/Status" AutoPostBack="true" Width="200px" LabelWidth="100px">
                                     <f:ListItem Value="" Text=""></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
                                     <f:ListItem Value="In Progress" Text="In Progress"></f:ListItem>
                                 </f:DropDownList>
-                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="100px" LabelWidth="40px">
+                                    <f:ListItem Value="" Text=""></f:ListItem>
+                                    <%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
+                                    <f:ListItem Value="Y1" Text="Y1"></f:ListItem>
+                                    <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
+                                    <f:ListItem Value="N" Text="N"></f:ListItem>
+                                </f:DropDownList>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <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>
-                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                        <%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="100px"
                                     Width="220px">
@@ -102,7 +105,7 @@
                                 <f:DatePicker runat="server" ID="txtEndActual_Date" LabelAlign="Right" Width="110px">
                                 </f:DatePicker>
                             </Items>
-                        </f:Toolbar>
+                        </f:Toolbar>--%>
                     </Toolbars>
                     <Columns>
 
@@ -146,13 +149,13 @@
                        
                          <f:BoundField MinWidth="200px"  ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status"  TextAlign="Center"/>--%>
 
-                        <f:BoundField Width="100px" TextAlign="Center" ColumnID="Num_NO" DataField="Num_NO" HeaderText="No." />
+                        <f:BoundField Width="60px" TextAlign="Center" ColumnID="Num_NO" DataField="Num_NO" HeaderText="No." />
 
-                        <f:BoundField Width="120px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="绯荤粺鍙�<br>System No." />
+                        <f:BoundField Width="100px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="绯荤粺鍙�<br>System No." />
 
-                        <f:BoundField Width="120px" TextAlign="Center" ColumnID="Sub_Sys_No" DataField="Sub_Sys_No" HeaderText="瀛愮郴缁熷彿<br>Sub-sys. No." />
+                        <f:BoundField MinWidth="180px" TextAlign="Center" ColumnID="Sub_Sys_No" DataField="Sub_Sys_No" HeaderText="Turnover<br>System Code" />
 
-                        <f:BoundField Width="220px" TextAlign="left" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="灏鹃」鍐呭<br>Description" />
+                        <f:BoundField MinWidth="280px" TextAlign="left" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="灏鹃」鍐呭<br>Description" />
 
                         <f:TemplateField ColumnID="ImagePhotoes" Width="120px" HeaderText="Photoes" HeaderTextAlign="Center"
                             TextAlign="Left">
@@ -162,13 +165,13 @@
                         </f:TemplateField>
                         <%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Photoes" DataField="Photoes" HeaderText="Photoes" />--%>
 
-                        <f:BoundField Width="100px" TextAlign="Center" ColumnID="Cat" DataField="Cat" HeaderText="灏鹃」绛夌骇<br>Cat." />
+                        <f:BoundField Width="90px" TextAlign="Center" ColumnID="Cat" DataField="Cat" HeaderText="灏鹃」绛夌骇<br>Cat." />
 
                         <f:BoundField Width="100px" TextAlign="Center" ColumnID="Raised_By" DataField="Raised_By" HeaderText="鎻愬嚭浜�<br>Raised By" />
 
                         <f:RenderField Width="100px" TextAlign="Center" ColumnID="Date_Raised" DataField="Date_Raised" HeaderText="鎻愬嚭鏃堕棿<br>Date Raised" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
-                        <f:BoundField Width="100px" TextAlign="Center" ColumnID="Disc" DataField="Disc" HeaderText="涓撲笟<br>Disc." />
+                        <f:BoundField Width="80px" TextAlign="Center" ColumnID="Disc" DataField="Disc" HeaderText="涓撲笟<br>Disc." />
 
                         <f:BoundField Width="100px" TextAlign="Center" ColumnID="IsEng" DataField="IsEngStr" HeaderText="璁捐闇�姹�<br>Eng(Y/N)" />
 
@@ -176,7 +179,7 @@
 
                         <f:BoundField Width="100px" TextAlign="Center" ColumnID="Punch_Type" DataField="Punch_Type" HeaderText="灏鹃」绫诲埆<br>Punch Type" />
 
-                        <f:RenderField Width="150px" TextAlign="Center" ColumnID="Required_Date" DataField="Required_Date" HeaderText="瑕佹眰瀹屾垚鏃堕棿<br>Required Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
+                        <f:RenderField Width="120px" TextAlign="Center" ColumnID="Required_Date" DataField="Required_Date" HeaderText="瑕佹眰瀹屾垚鏃堕棿<br>Required Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
                         <f:BoundField Width="100px" TextAlign="Center" ColumnID="Action_By" DataField="Action_By" HeaderText="璐ｄ换鍗曚綅<br>Action By" />
 
@@ -195,7 +198,7 @@
                         <%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Corrected_Photos" DataField="Corrected_Photos" HeaderText="Corrected Photos" />--%>
 
 
-                        <f:RenderField Width="150px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="瀹為檯瀹屾垚鏃堕棿<br>Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
+                        <f:RenderField Width="120px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="瀹為檯瀹屾垚鏃堕棿<br>Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
 
                         <f:GroupField HeaderText="Cleared(PIC锛夌洃鐞嗘牳鏌�" TextAlign="Center" MinWidth="200px">
                             <Columns>
@@ -221,9 +224,9 @@
                             </Columns>
                         </f:GroupField>
 
-                        <f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="鐘舵��<br>Status" />
+                        <f:BoundField Width="120px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="鐘舵��<br>Status" />
 
-                        <f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="澶囨敞<br>Remark" />
+                        <f:BoundField Width="180px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="澶囨敞<br>Remark" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -252,7 +255,7 @@
         </f:Window>
         <f:Window ID="Window1" Title="灏鹃」绠＄悊" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1200px" OnClose="Window1_Close"
-            Height="600px">
+            Height="700px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 2c47563e..97e84cf7 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -62,36 +62,36 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Sub_Sys_No like @Sub_Sys_No";
                 listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%"));
             }
-            if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
-            {
-                strSql += " AND Date_Raised >= @StartDate_Raised";
-                listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
-            {
-                strSql += " AND Date_Raised <= @EndDate_Raised";
-                listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
-            {
-                strSql += " AND Required_Date >= @StartRequired_Date";
-                listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
-            {
-                strSql += " AND Required_Date <= @EndRequired_Date";
-                listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
-            {
-                strSql += " AND Actual_Date >= @StartActual_Date";
-                listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
-            }
-            if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
-            {
-                strSql += " AND Actual_Date <= @EndActual_Date";
-                listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
-            }
+            //if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
+            //{
+            //    strSql += " AND Date_Raised >= @StartDate_Raised";
+            //    listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
+            //{
+            //    strSql += " AND Date_Raised <= @EndDate_Raised";
+            //    listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
+            //{
+            //    strSql += " AND Required_Date >= @StartRequired_Date";
+            //    listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
+            //{
+            //    strSql += " AND Required_Date <= @EndRequired_Date";
+            //    listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
+            //{
+            //    strSql += " AND Actual_Date >= @StartActual_Date";
+            //    listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
+            //}
+            //if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
+            //{
+            //    strSql += " AND Actual_Date <= @EndActual_Date";
+            //    listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
+            //}
             if (!string.IsNullOrEmpty(txtDisc.Text.Trim()))
             {
                 strSql += " AND Disc = @Disc";
@@ -117,11 +117,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Cat = @Cat";
                 listStr.Add(new SqlParameter("@Cat", ddlCat.SelectedValue.Trim()));
             }
-            if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
-            {
-                strSql += " AND Action_By = @Action_By";
-                listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
-            }
+            //if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
+            //{
+            //    strSql += " AND Action_By = @Action_By";
+            //    listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
+            //}
             if (!string.IsNullOrEmpty(txtPIC.Text.Trim()))
             {
                 strSql += " AND PIC = @PIC";
@@ -306,6 +306,49 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        ///// <summary>
+        ///// 瀵煎嚭
+        ///// </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 = System.Text.Encoding.UTF8;
+        //    this.Grid1.PageSize = 100000;
+        //    this.BindGrid();
+        //    Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+        //    //Response.Write(GetGridTableHtml(Grid1));
+        //    Response.End();
+        //}
+
+        #endregion
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_PunchlistFrom where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -341,6 +384,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
@@ -515,7 +559,7 @@ namespace FineUIPro.Web.Transfer
                         IDrawing patriarch = sheet.CreateDrawingPatriarch();
                         // 绗洓姝ワ細璁剧疆閿氱偣
                         int rowline = 1; // y鏂瑰悜
-                       // 鍙傛暟璇存槑锛氾紙鍦ㄨ捣濮嬪崟鍏冩牸鐨刋鍧愭爣0-1023锛孻鐨勫潗鏍�0-255锛屽湪缁堟鍗曞厓鏍肩殑X鍧愭爣0-1023锛孻鐨勫潗鏍�0-255锛岃捣濮嬪崟鍏冩牸鍒楁暟锛岃鏁帮紝缁堟鍗曞厓鏍煎垪鏁帮紝琛屾暟锛�  
+                                         // 鍙傛暟璇存槑锛氾紙鍦ㄨ捣濮嬪崟鍏冩牸鐨刋鍧愭爣0-1023锛孻鐨勫潗鏍�0-255锛屽湪缁堟鍗曞厓鏍肩殑X鍧愭爣0-1023锛孻鐨勫潗鏍�0-255锛岃捣濮嬪崟鍏冩牸鍒楁暟锛岃鏁帮紝缁堟鍗曞厓鏍煎垪鏁帮紝琛屾暟锛�  
                         IClientAnchor anchor = patriarch.CreateAnchor(0, 0, 0, 0, 17, i, 18, i + 1);
                         // 绗簲姝ワ細鎶婂浘鐗囨彃鍒扮浉搴旂殑浣嶇疆+1
                         IPicture pict = patriarch.CreatePicture(anchor, pictureIdx);
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index 043fe382..a4598406 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -104,24 +104,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtDisc;
 
-        /// <summary>
-        /// ddlEng 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlEng;
-
-        /// <summary>
-        /// ddlMatI 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlMatI;
-
         /// <summary>
         /// btnSearch 鎺т欢銆�
         /// </summary>
@@ -141,13 +123,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.Button btnNew;
 
         /// <summary>
-        /// btnImport 鎺т欢銆�
+        /// btnClear 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.Button btnImport;
+        protected global::FineUIPro.Button btnClear;
 
         /// <summary>
         /// Toolbar2 鎺т欢銆�
@@ -167,15 +149,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPunchType;
 
-        /// <summary>
-        /// txtAction_By 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtAction_By;
-
         /// <summary>
         /// txtPIC 鎺т欢銆�
         /// </summary>
@@ -203,6 +176,33 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlStatus;
 
+        /// <summary>
+        /// ddlEng 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlEng;
+
+        /// <summary>
+        /// ddlMatI 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlMatI;
+
+        /// <summary>
+        /// btnImport 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+
         /// <summary>
         /// btnOut 鎺т欢銆�
         /// </summary>
@@ -212,96 +212,6 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
 
-        /// <summary>
-        /// Toolbar1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Toolbar Toolbar1;
-
-        /// <summary>
-        /// txtStartDate_Raised 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtStartDate_Raised;
-
-        /// <summary>
-        /// Label1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Label Label1;
-
-        /// <summary>
-        /// txtEndDate_Raised 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndDate_Raised;
-
-        /// <summary>
-        /// txtStartRequired_Date 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtStartRequired_Date;
-
-        /// <summary>
-        /// Label2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Label Label2;
-
-        /// <summary>
-        /// txtEndRequired_Date 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndRequired_Date;
-
-        /// <summary>
-        /// txtStartActual_Date 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtStartActual_Date;
-
-        /// <summary>
-        /// Label3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Label Label3;
-
-        /// <summary>
-        /// txtEndActual_Date 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndActual_Date;
-
         /// <summary>
         /// lbPhotoesImageUrl 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
index 8183ad5c..df04f1b5 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromEdit.aspx
@@ -17,17 +17,17 @@
             <Rows>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtNum_NO" runat="server" Label="No." LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtNum_NO" runat="server" Label="No." LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                         <f:TextBox ID="txtSystem_No" runat="server" Label="绯荤粺鍙�/System No." LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
                         </f:TextBox>
-                        <f:TextBox ID="txtSub_Sys_No" runat="server" Label="瀛愮郴缁熷彿/Sub-sys. No." LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtSub_Sys_No" runat="server" Label="瀛愮郴缁熷彿/Turnover System Code" LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlCat" runat="server" Label="Cat." LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="ddlCat" runat="server" Label="Cat." LabelWidth="160px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
                             <f:ListItem Value="A" Text="A"></f:ListItem>
                             <f:ListItem Value="B" Text="B"></f:ListItem>
@@ -42,7 +42,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtDisc" runat="server" Label="涓撲笟/Disc." LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtDisc" runat="server" Label="涓撲笟/Disc." LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                         <f:DropDownList ID="ddlIsEng" runat="server" Label="璁捐闇�姹�/Eng(Y/N)" LabelWidth="180px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
@@ -51,7 +51,7 @@
                         </f:DropDownList>
                         <f:DropDownList ID="ddlIsMatI" runat="server" Label="鏉愭枡闇�姹�/Mat鈥檒(Y/N)" LabelWidth="200px" Width="300px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
-                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                            <%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
                             <f:ListItem Value="Y1" Text="Y1"></f:ListItem>
                             <f:ListItem Value="Y2" Text="Y2"></f:ListItem>
                             <f:ListItem Value="N" Text="N"></f:ListItem>
@@ -60,10 +60,11 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="txtPunch_Type" runat="server" Label="灏鹃」绫诲埆/Punch Type" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:DropDownList ID="txtPunch_Type" runat="server" Label="灏鹃」绫诲埆/Punch Type" LabelWidth="160px" Required="true" ShowRedStar="true">
                             <f:ListItem Value="" Text=""></f:ListItem>
                             <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
-                            <f:ListItem Value="FWD" Text="FWD"></f:ListItem>
+                            <%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
+                            <f:ListItem Value="JWD" Text="JWD"></f:ListItem>
                         </f:DropDownList>
                         <f:DatePicker runat="server" Label="瑕佹眰瀹屾垚鏃堕棿/Required Date" ID="txtRequired_Date" LabelAlign="Right" LabelWidth="210px" Required="true" ShowRedStar="true">
                         </f:DatePicker>
@@ -73,22 +74,22 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextBox ID="txtPIC" runat="server" Label="璐ｄ换浜篜IC" LabelAlign="Right" LabelWidth="200px" Required="true" ShowRedStar="true">
+                        <f:TextBox ID="txtPIC" runat="server" Label="璐ｄ换浜篜IC" LabelAlign="Right" LabelWidth="160px" Required="true" ShowRedStar="true">
                         </f:TextBox>
                         <f:TextBox ID="txtPIC_WUH" runat="server" Label="璐ｄ换浜�-浜旂幆/PIC-WUH" LabelAlign="Right" LabelWidth="180px" Required="true" ShowRedStar="true">
                         </f:TextBox>
-                        <f:DatePicker runat="server" Label="瀹為檯瀹屾垚鏃堕棿/Actual Date" ID="txtActual_Date" LabelAlign="Right" LabelWidth="180px" Width="300px">
+                        <f:DatePicker runat="server" Label="瀹為檯瀹屾垚鏃堕棿/Actual Date" ID="txtActual_Date" LabelAlign="Right" LabelWidth="200px" Width="300px">
                         </f:DatePicker>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea ID="txtDESCRIPTION" runat="server" Label="灏鹃」鍐呭/Description" LabelAlign="Right" LabelWidth="180px"></f:TextArea>
+                        <f:TextArea ID="txtDESCRIPTION" runat="server" Label="灏鹃」鍐呭/Description" LabelAlign="Right" LabelWidth="160px"></f:TextArea>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea ID="txtCorrection_Action" runat="server" Label="鏁存敼鎺柦/Correction Action" LabelAlign="Right" LabelWidth="200px" Width="300px">
+                        <f:TextArea ID="txtCorrection_Action" runat="server" Label="鏁存敼鎺柦/Correction Action" LabelAlign="Right" LabelWidth="160px" Width="300px">
                         </f:TextArea>
                     </Items>
                 </f:FormRow>
@@ -134,7 +135,7 @@
                 </f:FormRow>
                 <f:FormRow>
                     <Items>
-                        <f:TextArea runat="server" ID="txtRemark" Label="澶囨敞/Remark" LabelWidth="200px" MarginTop="10px"></f:TextArea>
+                        <f:TextArea runat="server" ID="txtRemark" Label="澶囨敞/Remark" LabelWidth="160px" MarginTop="10px"></f:TextArea>
                     </Items>
                 </f:FormRow>
             </Rows>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
index fb503363..4cdc7d6e 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -12,28 +12,29 @@
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <Items>
+            <items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="璁惧鏉愭枡鎶ラ獙" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="RotatingEquipment"
                     SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true">
-                    <Toolbars>
+                    <toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
+                            <items>
                                 <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Tag. No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                 <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
-                                    <f:ListItem Value="" Text="All" Selected="true"/>
-                                    <f:ListItem Value="Not Start" Text="Not Start"/>
-                                    <f:ListItem Value="In progress" Text="In progress"/>
-                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                    <f:ListItem Value="" Text="All" Selected="true" />
+                                    <f:ListItem Value="Not Start" Text="Not Start" />
+                                    <f:ListItem Value="In progress" Text="In progress" />
+                                    <f:ListItem Value="Completed" Text="Completed" />
                                 </f:DropDownList>
 
-                              <%--  <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <%--  <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                     Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="鑷�">
@@ -46,64 +47,66 @@
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
                                 </f:Button>
-
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnImport" ToolTip="瀵煎叆" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
-                            </Items>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </items>
                         </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                        <%-- <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
+                    </toolbars>
+                    <columns>
+                        <%-- <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>--%>
                         <f:RenderField ColumnID="RotatingEquipment" DataField="RotatingEquipment" FieldType="String" HeaderText="Tag. No" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="140px">
+                            HeaderTextAlign="Center" MinWidth="220px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="210px">
-                         </f:RenderField>
+                            HeaderTextAlign="Center" MinWidth="300px">
+                        </f:RenderField>
 
                         <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="140px">
+                            HeaderTextAlign="Center" MinWidth="90px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="140px">
+                            HeaderTextAlign="Center" MinWidth="100px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="160px">
+                            HeaderTextAlign="Center" MinWidth="180px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="Alignment" DataField="Alignment" FieldType="String" HeaderText="Alignment" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="140px">
+                            HeaderTextAlign="Center" MinWidth="120px">
                         </f:RenderField>
 
-                         <f:RenderField ColumnID="Lubricatefilling" DataField="Lubricatefilling" FieldType="String" HeaderText="Lubricate filling" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="140px">
+                        <f:RenderField ColumnID="Lubricatefilling" DataField="Lubricatefilling" FieldType="String" HeaderText="Lubricate filling" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="120px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="Motorsoloruntest" DataField="Motorsoloruntest" FieldType="String" HeaderText="Motor solorun test" TextAlign="Center"
-                            HeaderTextAlign="Center" Width="140px">
+                            HeaderTextAlign="Center" MinWidth="140px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="Standalonetest" DataField="Standalonetest" FieldType="String" HeaderText="Standalone test" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="140px">
+                            HeaderTextAlign="Center" MinWidth="120px">
                         </f:RenderField>
 
-
                         <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
-                            HeaderTextAlign="Center" minWidth="200px">
+                            HeaderTextAlign="Center" MinWidth="120px">
                         </f:RenderField>
-                    </Columns>
-                    <Listeners>
+                    </columns>
+                    <listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
+                    </listeners>
+                    <pageitems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -113,9 +116,9 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="鎵�鏈夎" Value="100000" />
                         </f:DropDownList>
-                    </PageItems>
+                    </pageitems>
                 </f:Grid>
-            </Items>
+            </items>
         </f:Panel>
         <f:Window ID="Window1" Title="RotatingEquipment" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
@@ -130,14 +133,14 @@
             IsModal="true" Width="700px" Height="500px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <Items>
-                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
+            <items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
 
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="鍒犻櫎" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </Items>
+            </items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
index 8fc46b92..4c6a960b 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
@@ -57,10 +57,15 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND TestPackageSTART <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SYSTEM like @SYSTEM";
+            //    listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SYSTEM like @SYSTEM";
-                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND TestPackage like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -208,6 +213,50 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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 = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_RotatingEquipment where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -226,6 +275,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
index 115321fb..609beed2 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtRotatingEquipment;
 
         /// <summary>
-        /// txtSystem 鎺т欢銆�
+        /// txtSysSubNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 鎺т欢銆�
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
index a0f9db93..8c97a5f1 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
@@ -340,9 +340,8 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-
-                    //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                    if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+                    //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
                     {
                         model.MechanicalFINALStatus = "Not Start";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
index 4f37c6c1..2aa5c474 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
@@ -31,7 +31,10 @@
                         <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
-
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTestPackage" runat="server" Label="Turnover System Code"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
index 3a45e860..83f7a869 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
@@ -90,8 +90,9 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
             {
                 model.MechanicalFINALStatus = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+            }
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
             {
                 model.MechanicalFINALStatus = "Not Start";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index 530683ee..ad5e4d9a 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
@@ -22,11 +22,12 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox runat="server" ID="txtStaticEquipment" Label="Tag No" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtStaticEquipment" Label="Tag No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
-                               <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="鑷�">
@@ -34,26 +35,29 @@
                                 <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
                                 </f:DatePicker>--%>
 
-                                <f:DropDownList runat="server" ID="ddStatus" Label="Status"  LabelWidth="80px" LabelAlign="Right">
-                                    <f:ListItem Value="" Text="All" Selected="true"/>
-                                    <f:ListItem Value="Not Start" Text="Not Start"/>
-                                    <f:ListItem Value="In progress" Text="In progress"/>
-                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
+                                    <f:ListItem Value="" Text="All" Selected="true" />
+                                    <f:ListItem Value="Not Start" Text="Not Start" />
+                                    <f:ListItem Value="In progress" Text="In progress" />
+                                    <f:ListItem Value="Completed" Text="Completed" />
                                 </f:DropDownList>
 
                                 <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="鏌ヨ">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                  <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
+                                </f:Button>
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
                                 </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>
                     <Columns>
-                       <%-- <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
+                        <%-- <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center"
                             EnableLock="true" Locked="False">
                             <ItemTemplate>
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
@@ -62,47 +66,47 @@
                         <f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
                             <Columns>
                                 <f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="140px">
+                                    HeaderTextAlign="Center" MinWidth="220px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
 
-                          <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="210px">
-                         </f:RenderField>
+                        <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="300px">
+                        </f:RenderField>
 
                         <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
                             <Columns>
                                 <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="140px">
+                                    HeaderTextAlign="Center" MinWidth="90px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="140px">
+                                    HeaderTextAlign="Center" MinWidth="100px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="160px">
+                                    HeaderTextAlign="Center" MinWidth="180px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
                             <Columns>
-                               <f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="160px">
+                                <f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Construction" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="140px">
                                 </f:RenderField>
 
-                                 <f:RenderField ColumnID="InternalsPacking" DataField="InternalsPacking" FieldType="String" HeaderText="Internals/Packing<br/> installation " TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="160px">
+                                <f:RenderField ColumnID="InternalsPacking" DataField="InternalsPacking" FieldType="String" HeaderText="Internals/Packing<br/> installation " TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="130px">
                                 </f:RenderField>
 
-                                 <f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="160px">
+                                <f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="130px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="Mechanical FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="200px">
+                                <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="120px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
@@ -138,7 +142,7 @@
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
             <Items>
-                  <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
 
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="鍒犻櫎" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
index 0b4dd7eb..61ef26c8 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
@@ -51,10 +51,15 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND TestPackageSTART <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SYSTEM like @SYSTEM";
+            //    listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SYSTEM like @SYSTEM";
-                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND TestPackage like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
 
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
@@ -207,6 +212,49 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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 = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_StaticEquipment where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -225,6 +273,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
index 2c4495a0..7a4492e0 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtStaticEquipment;
 
         /// <summary>
-        /// txtSystem 鎺т欢銆�
+        /// txtSysSubNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 鎺т欢銆�
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// g1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
index 59873369..82e5ff7e 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
@@ -338,9 +338,8 @@ namespace FineUIPro.Web.Transfer
                         continue;
                     }
 
-
-                    //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                    if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+                    //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                    if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
                     {
                         model.MechanicalFINALStatus = "Not Start";
                         list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
index af8a07fa..868e9377 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
@@ -31,7 +31,10 @@
                         <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
-
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTestPackage" runat="server" Label="Turnover System Code"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
@@ -50,7 +53,7 @@
                     <Items>
                         <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
                             <Items>
-                                <f:DropDownList ID="ddlInternalinspection" runat="server" Label="Internal inspection" LabelWidth="180px">
+                                <f:DropDownList ID="ddlInternalinspection" runat="server" Label="Construction" LabelWidth="180px">
                                     <f:ListItem Value="NA" Text="NA"></f:ListItem>
                                     <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
                                     <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
index 5f183226..d6f8bf0a 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
@@ -89,8 +89,9 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
             {
                 model.MechanicalFINALStatus = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
+            }
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
             {
                 model.MechanicalFINALStatus = "Not Start";
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
index bad6b2c4..341571ab 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
@@ -4,35 +4,36 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
     <form id="form1" runat="server">
-      <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
-            <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false"  EnableCollapse="true"
+            <items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true"  OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
-                    EnableRowDoubleClickEvent="true"  EnableTextSelection="true">
-                    <Toolbars>
+                    EnableRowDoubleClickEvent="true" EnableTextSelection="true">
+                    <toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
-                            <Items>
-                                
-                                <f:TextBox runat="server" ID="txtTelecom" Label="Tag.No" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
+                            <items>
 
-                                <f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtTelecom" Label="Tag.No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
+
+                                <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
+                                 <f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
 
                                 <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
-                                    <f:ListItem Value="" Text="All" Selected="true"/>
-                                    <f:ListItem Value="Not Start" Text="Not Start"/>
-                                    <f:ListItem Value="In progress" Text="In progress"/>
-                                    <f:ListItem Value="Completed" Text="Completed"/>
+                                    <f:ListItem Value="" Text="All" Selected="true" />
+                                    <f:ListItem Value="Not Start" Text="Not Start" />
+                                    <f:ListItem Value="In progress" Text="In progress" />
+                                    <f:ListItem Value="Completed" Text="Completed" />
                                 </f:DropDownList>
-                               <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="鑷�">
@@ -44,62 +45,66 @@
                                 </f:Button>
 
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                 <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="鏂板">
                                 </f:Button>
-                               <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
+                                <%-- <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="鏂板" Hidden="true">
                                 </f:Button>--%>
+                                <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="娓呯┖鏁版嵁" OnClick="btnClear_Click" ConfirmText="纭畾娓呯┖鎵�鏈夋暟鎹紵" Hidden="true">
+                                </f:Button>
                                 <f:Button ID="btnImport" ToolTip="瀵煎叆" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
-                            </Items>
+                                   <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </items>
                         </f:Toolbar>
-                    </Toolbars>
-                    <Columns>
-                      
-                          <f:GroupField HeaderText="Telecom" TextAlign="Center" MinWidth="200px">
-                            <Columns>
-                                <f:BoundField minWidth="140px"  TextAlign="Center"  ColumnID="Telecom" DataField="Telecom" HeaderText="Tag.No" />
-                            </Columns>
+                    </toolbars>
+                    <columns>
+
+                        <f:GroupField HeaderText="Telecom" TextAlign="Center">
+                            <columns>
+                                <f:BoundField MinWidth="220px" TextAlign="Center" ColumnID="Telecom" DataField="Telecom" HeaderText="Tag.No" />
+                            </columns>
                         </f:GroupField>
-                       
-                         <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="210px">
-                         </f:RenderField>
 
-                         <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
-                            <Columns>
-                                <f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
-                                <f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
-                                <f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
-                            </Columns>
+                        <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="160px">
+                        </f:RenderField>
+
+                        <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
+                            <columns>
+                                <f:BoundField MinWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
+                                <f:BoundField MinWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center" />
+                                <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
+                            </columns>
                         </f:GroupField>
-                       
-                         <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
-                            <Columns>
-                                  <f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/> &Inspection Reocrd" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="160px">
+
+                        <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
+                            <columns>
+                                <f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/> &Inspection Reocrd" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="160px">
                                 </f:RenderField>
 
-                                  <f:RenderField ColumnID="Communication" DataField="Communication" FieldType="String" HeaderText="Communication<br/> test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="160px">
+                                <f:RenderField ColumnID="Communication" DataField="Communication" FieldType="String" HeaderText="Communication<br/> test" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="160px">
                                 </f:RenderField>
 
-                                  <f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/> Insulation Test<br/> Record" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="160px">
+                                <f:RenderField ColumnID="CableLaying" DataField="CableLaying" FieldType="String" HeaderText="Cable Laying and<br/> Insulation Test<br/> Record" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="160px">
                                 </f:RenderField>
 
-                                  <f:RenderField ColumnID="FunctionTest" DataField="FunctionTest" FieldType="String" HeaderText="Function Test" TextAlign="Center"
-                                    HeaderTextAlign="Center" minWidth="160px">
+                                <f:RenderField ColumnID="FunctionTest" DataField="FunctionTest" FieldType="String" HeaderText="Function Test" TextAlign="Center"
+                                    HeaderTextAlign="Center" MinWidth="160px">
                                 </f:RenderField>
-                            </Columns>
+                            </columns>
                         </f:GroupField>
-                       
-                         <f:BoundField MinWidth="200px"  ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status"  TextAlign="Center"/>
 
-                    </Columns>
-                    <Listeners>
+                        <f:BoundField MinWidth="120px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
+
+                    </columns>
+                    <listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                    </Listeners>
-                    <PageItems>
+                    </listeners>
+                    <pageitems>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
                         </f:ToolbarText>
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@@ -109,11 +114,11 @@
                             <f:ListItem Text="25" Value="25" />
                             <f:ListItem Text="鎵�鏈夎" Value="100000" />
                         </f:DropDownList>
-                    </PageItems>
+                    </pageitems>
                 </f:Grid>
-            </Items>
+            </items>
         </f:Panel>
-          <f:Window ID="Window1" Title="Telecom" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="Telecom" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
             Width="900px" Height="480px">
         </f:Window>
@@ -122,15 +127,15 @@
             Width="700px" Height="560px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
-            <Items>
-                 <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
+            <items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click">
                 </f:MenuButton>
                 <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="淇敼" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
                 </f:MenuButton>--%>
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="鍒犻櫎" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
                     OnClick="btnMenuDel_Click" Hidden="true">
                 </f:MenuButton>
-            </Items>
+            </items>
         </f:Menu>
     </form>
     <script type="text/javascript">
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
index 4f3a7afb..c110a2df 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
@@ -64,10 +64,15 @@ namespace FineUIPro.Web.Transfer
             //    strSql += " AND Test_Package_START <= @InspectionDateZ";
             //    listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             //}
-            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            //{
+            //    strSql += " AND SystemName like @SystemName";
+            //    listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            //}
+            if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
             {
-                strSql += " AND SystemName like @SystemName";
-                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+                strSql += " AND Test_Package like @SysSubNo";
+                listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
             }
             if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
             {
@@ -182,6 +187,50 @@ namespace FineUIPro.Web.Transfer
         }
         #endregion
 
+        #region 瀵煎嚭
+
+        /// <summary>
+        /// 瀵煎嚭
+        /// </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 = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = 100000;
+            this.BindGrid();
+            Response.Write(GetGridMultiHeaderTableHtml(Grid1));
+            //Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        #endregion
+
+        #region 娓呯┖鏁版嵁
+
+        /// <summary>
+        /// 娓呯┖鏁版嵁
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnClear_Click(object sender, EventArgs e)
+        {
+            var ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrWhiteSpace(ProjectId))
+            {
+                string strSql = $"delete from  Transfer_Telecom where ProjectId = '{ProjectId}';";
+                BLL.SQLHelper.ExecutSql(strSql);
+                BindGrid();
+            }
+        }
+
+        #endregion
+
+
         #region 鑾峰彇鎸夐挳鏉冮檺
         /// <summary>
         /// 鑾峰彇鎸夐挳鏉冮檺
@@ -213,6 +262,7 @@ namespace FineUIPro.Web.Transfer
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
                     this.btnMenuDel.Hidden = false;
+                    this.btnClear.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnSave))
                 {
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
index ea647151..ee966920 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
@@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
         protected global::FineUIPro.TextBox txtTelecom;
 
         /// <summary>
-        /// txtSystem 鎺т欢銆�
+        /// txtSysSubNo 鎺т欢銆�
         /// </summary>
         /// <remarks>
         /// 鑷姩鐢熸垚鐨勫瓧娈点��
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSystem;
+        protected global::FineUIPro.TextBox txtSysSubNo;
 
         /// <summary>
         /// ddStatus 鎺т欢銆�
@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
 
+        /// <summary>
+        /// btnClear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnClear;
+
         /// <summary>
         /// btnImport 鎺т欢銆�
         /// </summary>
@@ -113,6 +122,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
 
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
         /// <summary>
         /// ToolbarText1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
index c342b9a7..627f081d 100644
--- a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
@@ -336,7 +336,7 @@ namespace FineUIPro.Web.Transfer
                         listObj.Add(obj2);
                         listObj.Add(obj3);
                         listObj.Add(obj4);
-                        //鍏ㄦ槸NA鎴朇ompleted 鐘舵�佹槸Completed
+                        //濡傛灉鍏ㄦ槸NA鎴朇ompleted 鐘舵�佹槸Completed
                         if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
                         {
                             model.FINAL_Status = "Completed";
@@ -344,9 +344,8 @@ namespace FineUIPro.Web.Transfer
                             continue;
                         }
 
-
-                        //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-                        if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+                        //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+                        if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
                         {
                             model.FINAL_Status = "Not Start";
                             list.Add(model);
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
index 8a7a7ced..149dd1c0 100644
--- a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
@@ -31,7 +31,10 @@
                         <f:TextBox ID="txtSubsystem" runat="server" Label="Subsystem"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
-
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
                         <f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
                             LabelAlign="Right" LabelWidth="180px">
                         </f:TextBox>
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
index c2aacfd0..a389378f 100644
--- a/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
@@ -91,8 +91,9 @@ namespace FineUIPro.Web.Transfer
             if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count ==4)
             {
                 model.FINAL_Status = "Completed";
-            } //濡傛灉鍏ㄦ槸Not Start 灏辨槸 Not Start
-            else if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
+            }
+            //濡傛灉鍏ㄦ槸NA鎴朜ot Start 灏辨槸 Not Start
+            else if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 4)
             {
                 model.FINAL_Status = "Not Start";
             }
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index f50b26d3..904c5d67 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -1,4 +1,4 @@
-锘�<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
   鏈夊叧濡備綍閰嶇疆 ASP.NET 搴旂敤绋嬪簭鐨勮缁嗘秷鎭紝璇疯闂�
 
@@ -12,8 +12,8 @@
   <appSettings>
     <!--杩炴帴瀛楃涓�-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
-    <!--绯荤粺鍚嶇О-->
+	  <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+	  <!--绯荤粺鍚嶇О-->
     <add key="SystemName" value="鏅烘収鏂藉伐绠＄悊淇℃伅绯荤粺V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
     <add key="aspnet:MaxHttpCollectionKeys" value="50000"/>
@@ -178,13 +178,17 @@
   </system.serviceModel>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<dependentAssembly>
+				<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
+				<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
+			</dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Apache.NMS" publicKeyToken="82756feee3957618" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-1.8.0.0" newVersion="1.8.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
@@ -196,4 +200,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
index 1db3c6e5..b1ba052f 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
@@ -1093,11 +1093,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[0].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()), 2).ToString() + "%";
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E20 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E20 != 0)
             {
                 this.Grid1.Rows[14].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E20, 4);
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F20 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F20 != 0)
             {
                 this.Grid1.Rows[14].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F20, 4);
             }
@@ -1105,11 +1105,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[14].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[14].Values[4].ToString()), 2).ToString() + "%";
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E22 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E22 != 0)
             {
                 this.Grid1.Rows[16].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E22, 4);
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F22 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F22 != 0)
             {
                 this.Grid1.Rows[16].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F22, 4);
             }
@@ -1117,11 +1117,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[16].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[16].Values[4].ToString()), 2).ToString() + "%";
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E24 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E24 != 0)
             {
                 this.Grid1.Rows[18].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E24, 4);
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F24 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F24 != 0)
             {
                 this.Grid1.Rows[18].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F24, 4);
             }
@@ -1129,11 +1129,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[18].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[18].Values[4].ToString()), 2).ToString() + "%";
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E26 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E26 != 0)
             {
                 this.Grid1.Rows[20].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E26, 4);
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F26 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F26 != 0)
             {
                 this.Grid1.Rows[20].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F26, 4);
             }
@@ -1141,11 +1141,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[20].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[20].Values[4].ToString()), 2).ToString() + "%";
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E28 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E28 != 0)
             {
                 this.Grid1.Rows[22].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E28, 4);
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F28 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F28 != 0)
             {
                 this.Grid1.Rows[22].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F28, 4);
             }
@@ -1153,11 +1153,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[22].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[22].Values[4].ToString()), 2).ToString() + "%";
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E42 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[4].ToString()) && E42 != 0)
             {
                 this.Grid1.Rows[36].Values[4] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[4].ToString()) * 10000 / E42, 4);
             }
-            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F42 > 0)
+            if (!string.IsNullOrEmpty(this.Grid1.Rows[0].Values[5].ToString()) && F42 != 0)
             {
                 this.Grid1.Rows[36].Values[5] = decimal.Round(Funs.GetNewDecimalOrZero(this.Grid1.Rows[0].Values[5].ToString()) * 10000 / F42, 4);
             }
@@ -1165,11 +1165,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 this.Grid1.Rows[36].Values[6] = decimal.Round((Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[5].ToString()) - Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[4].ToString())) * 100 / Funs.GetNewDecimalOrZero(this.Grid1.Rows[36].Values[4].ToString()), 2).ToString() + "%";
             }
-            if (E64 > 0 && E65 > 0 && E20 > 0)
+            if (E64 != 0 && E65 != 0 && E20 != 0)
             {
                 this.Grid1.Rows[58].Values[4] = decimal.Round((E64 + E65) / E20, 4);
             }
-            if (F64 > 0 && F65 > 0 && F20 > 0)
+            if (F64 != 0 && F65 != 0 && F20 != 0)
             {
                 this.Grid1.Rows[58].Values[5] = decimal.Round((F64 + F65) / F20, 4);
             }
@@ -1265,6 +1265,10 @@ namespace FineUIPro.Web.ZHGL.Environmental
                         PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                         return;
                     }
+                    else if (code=="3")
+                    {
+                        Alert.ShowInParent("闆嗗洟褰撳墠瀛ｅ害鏁版嵁宸查攣瀹氾紝鏃犳硶涓婁紶锛�", MessageBoxIcon.Error);
+                    }
                     else
                     {
                         Alert.ShowInParent("鍚屾寮傚父锛岃閫�鍑哄悗閲嶈瘯锛�", MessageBoxIcon.Error);
@@ -1280,7 +1284,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            bool isEmpty = false;
+           /* bool isEmpty = false;
             foreach (JObject mergedRow in Grid1.GetMergedData())
             {
                 JObject values = mergedRow.Value<JObject>("values");
@@ -1299,7 +1303,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 ShowNotify("钀ヤ笟鏀跺叆(鍙瘮浠�)銆佷竾鍏冩敹鍏ヤ簩姘у寲纰虫帓鏀�(鍙瘮浠�)鍜屼簩姘у寲纰虫帓鏀鹃噺涓嶈兘涓虹┖锛屽繀椤诲～鎶ユ暟鎹紒", MessageBoxIcon.Warning);
                 return;
-            }
+            }*/
             Save("add");
             ShowNotify("淇濆瓨鎴愬姛锛�", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
index 9c54e727..5dddd492 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
@@ -1887,6 +1887,10 @@ namespace FineUIPro.Web.ZHGL.Environmental
                         PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                         return;
                     }
+                    else if (code == "3")
+                    {
+                        Alert.ShowInParent("闆嗗洟褰撳墠瀛ｅ害鏁版嵁宸查攣瀹氾紝鏃犳硶涓婁紶锛�", MessageBoxIcon.Error);
+                    }
                     else
                     {
                         Alert.ShowInParent("鍚屾寮傚父锛岃閫�鍑哄悗閲嶈瘯锛�", MessageBoxIcon.Error);
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx
index d84c07bb..3542c4d8 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx
@@ -161,6 +161,8 @@
     <script type="text/jscript">
         function renderIndexName(value) {
             return value.replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;").replace("\t\t", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp")
+                .replace("A", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;")
+                .replace("B", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;")
         }
     </script>
 </body>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs
index abad4c6f..a71cd23c 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs
@@ -86,35 +86,35 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 var businessCategorys = EnergyreportItemService.GetItems("Template");
                 //涔嬪墠鏈堝害鍚堣鍊奸泦鍚�
                 List<Model.Environmental_EnergyReportItem> reportItems = BLL.EnergyreportItemService.GetItems(report.EnergyReportId);
-                List<Model.Environmental_EnergyReportItem> newItemList = new List<Model.Environmental_EnergyReportItem>();
-                foreach (var item in reportItems)
-                {
-                    Model.Environmental_EnergyReportItem newItem = new Model.Environmental_EnergyReportItem();
-                    newItem.EnergyReportItemId = item.EnergyReportItemId;
-                    newItem.EnergyReportId = item.EnergyReportId;
-                    newItem.SortIndex = item.SortIndex;
-                    newItem.BusinessCategory = item.BusinessCategory;
-                    newItem.Throughput_BasePeriod = item.Throughput_BasePeriod;
-                    newItem.Throughput_LastPeriod = item.Throughput_LastPeriod;
-                    newItem.Throughput_ThisPeriod = item.Throughput_ThisPeriod;
-                    newItem.Throughput_UnitOfMeasurement = item.Throughput_UnitOfMeasurement;
-                    newItem.Yield_BasePeriod = item.Yield_BasePeriod;
-                    newItem.Yield_LastPeriod = item.Yield_LastPeriod;
-                    newItem.Yield_ThisPeriod = item.Yield_ThisPeriod;
-                    newItem.Yield_UnitOfMeasurement = item.Yield_UnitOfMeasurement;
-                    newItem.OutputValue_BasePeriod = item.OutputValue_BasePeriod;
-                    newItem.OutputValue_LastYear = item.OutputValue_LastYear;
-                    newItem.OutputValue_ThisYear = item.OutputValue_ThisYear;
-                    newItem.OperationScale_BasePeriod = item.OperationScale_BasePeriod;
-                    newItem.OperationScale_LastYear = item.OperationScale_LastYear;
-                    newItem.OperationScale_ThisYear = item.OperationScale_ThisYear;
-                    newItem.OperationScale_UnitOfMeasurement = item.OperationScale_UnitOfMeasurement;
-                    newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
-                    newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
-                    newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
-                    newItemList.Add(item);
-                }
-                Grid1.DataSource = newItemList;
+                //List<Model.Environmental_EnergyReportItem> newItemList = new List<Model.Environmental_EnergyReportItem>();
+                //foreach (var item in reportItems)
+                //{
+                //    Model.Environmental_EnergyReportItem newItem = new Model.Environmental_EnergyReportItem();
+                //    newItem.EnergyReportItemId = item.EnergyReportItemId;
+                //    newItem.EnergyReportId = item.EnergyReportId;
+                //    newItem.SortIndex = item.SortIndex;
+                //    newItem.BusinessCategory = item.BusinessCategory;
+                //    newItem.Throughput_BasePeriod = item.Throughput_BasePeriod;
+                //    newItem.Throughput_LastPeriod = item.Throughput_LastPeriod;
+                //    newItem.Throughput_ThisPeriod = item.Throughput_ThisPeriod;
+                //    newItem.Throughput_UnitOfMeasurement = item.Throughput_UnitOfMeasurement;
+                //    newItem.Yield_BasePeriod = item.Yield_BasePeriod;
+                //    newItem.Yield_LastPeriod = item.Yield_LastPeriod;
+                //    newItem.Yield_ThisPeriod = item.Yield_ThisPeriod;
+                //    newItem.Yield_UnitOfMeasurement = item.Yield_UnitOfMeasurement;
+                //    newItem.OutputValue_BasePeriod = item.OutputValue_BasePeriod;
+                //    newItem.OutputValue_LastYear = item.OutputValue_LastYear;
+                //    newItem.OutputValue_ThisYear = item.OutputValue_ThisYear;
+                //    newItem.OperationScale_BasePeriod = item.OperationScale_BasePeriod;
+                //    newItem.OperationScale_LastYear = item.OperationScale_LastYear;
+                //    newItem.OperationScale_ThisYear = item.OperationScale_ThisYear;
+                //    newItem.OperationScale_UnitOfMeasurement = item.OperationScale_UnitOfMeasurement;
+                //    newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
+                //    newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
+                //    newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
+                //    newItemList.Add(item);
+                //}
+                Grid1.DataSource = reportItems;
                 Grid1.DataBind();
             }
             else
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx
index 7c96db24..748535a4 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx
@@ -48,8 +48,9 @@
                         <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
                             BoxFlex="1" DataKeyNames="EnergyReportItemId" AllowCellEditing="true" ForceFit="false"
                             ClicksToEdit="1" DataIDField="EnergyReportItemId" EnableColumnLines="true"   OnRowDataBound="Grid1_RowDataBound"
-                            EnableHeaderMenu="false" Height="380px">
+                            EnableHeaderMenu="false" Height="700px">
                             <Columns>
+                               
                                 <f:RenderField Width="400px" ColumnID="BusinessCategory" DataField="BusinessCategory" FieldType="String"
                                     HeaderText="涓氬姟绫诲埆" HeaderTextAlign="Center" TextAlign="Left" RendererFunction="renderIndexName">
                                 </f:RenderField>
@@ -191,6 +192,12 @@
                                                 </f:RenderField>
                                             </Columns>
                                         </f:GroupField>
+
+                                         <f:RenderField Width="100px" ColumnID="SortUnit" DataField="SortUnit" FieldType="String" Hidden="true"
+                                                HeaderText="鎺掑簭" HeaderTextAlign="Center" TextAlign="Center">
+                                            </f:RenderField>
+
+
                                     </Columns>
                                 </f:GroupField>
                             </Columns>
@@ -209,7 +216,7 @@
                             ValidateForms="SimpleForm1" OnClick="btnCopy_Click" Hidden="true">
                         </f:Button>--%>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
-                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Hidden="true" Text="淇濆瓨"
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Hidden="true" Text="璁＄畻鍚堣骞朵繚瀛�"
                             ValidateForms="SimpleForm1" OnClick="btnSave_Click">
                         </f:Button>
                         <f:Button ID="btnUpdata" Icon="PageSave" runat="server" ConfirmText="纭畾涓婃姤锛�" Text="涓婃姤" Hidden="true"
@@ -227,6 +234,8 @@
     <script type="text/jscript">
         function renderIndexName(value) {
             return value.replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;").replace("\t\t", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp")
+                .replace("A", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;")
+                .replace("B", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;")
         }
 
         function onGridAfterEdit(event, value, params) {
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx.cs
index f919b842..e59bdff3 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx.cs
@@ -5,6 +5,7 @@ using Org.BouncyCastle.Asn1.Ocsp;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
 using System.Web.UI.WebControls;
 
@@ -114,11 +115,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
             }
             else
             {
-                string arg = GetRequestEventArgument(); // 姝ゅ嚱鏁版墍鍦ㄦ枃浠讹細PageBase.cs
-                if (arg == "UPDATE_SUMMARY")
-                {
-                    SaveData();
-                }
+                //string arg = GetRequestEventArgument(); // 姝ゅ嚱鏁版墍鍦ㄦ枃浠讹細PageBase.cs
+                //if (arg == "UPDATE_SUMMARY")
+                //{
+                //    SaveData();
+                //}
             }
 
         }
@@ -130,7 +131,8 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 JObject values = mergedRow.Value<JObject>("values");
                 string sortIndex = values.Value<string>("SortIndex");
-                var newItem = items.FirstOrDefault(x => x.SortIndex == sortIndex);
+                var SortUnit = values.Value<int>("SortUnit");
+                var newItem = items.FirstOrDefault(x => x.SortIndex == sortIndex && x.SortUnit == SortUnit);
                 if (newItem != null)
                 {
                     newItem.EnergyReportItemId = SQLHelper.GetNewID();
@@ -138,17 +140,17 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     newItem.SortIndex = values.Value<string>("SortIndex");
                     newItem.BusinessCategory = values.Value<string>("BusinessCategory");
                     newItem.Throughput_BasePeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Throughput_BasePeriod")).ToString();
-                    newItem.Throughput_LastPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Throughput_LastPeriod")).ToString(); 
-                    newItem.Throughput_ThisPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Throughput_ThisPeriod")).ToString(); 
+                    newItem.Throughput_LastPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Throughput_LastPeriod")).ToString();
+                    newItem.Throughput_ThisPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Throughput_ThisPeriod")).ToString();
                     newItem.Throughput_UnitOfMeasurement = values.Value<string>("Throughput_UnitOfMeasurement");
-                    newItem.Yield_BasePeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Yield_BasePeriod")).ToString(); 
-                    newItem.Yield_LastPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Yield_LastPeriod")).ToString(); 
-                    newItem.Yield_ThisPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Yield_ThisPeriod")).ToString(); 
+                    newItem.Yield_BasePeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Yield_BasePeriod")).ToString();
+                    newItem.Yield_LastPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Yield_LastPeriod")).ToString();
+                    newItem.Yield_ThisPeriod = Funs.GetNewDecimalOrZero(values.Value<string>("Yield_ThisPeriod")).ToString();
                     newItem.Yield_UnitOfMeasurement = values.Value<string>("Yield_UnitOfMeasurement");
-                    newItem.OutputValue_BasePeriod = Funs.GetNewDecimalOrZero(values.Value<string>("OutputValue_BasePeriod")).ToString(); 
-                    newItem.OutputValue_LastYear = Funs.GetNewDecimalOrZero(values.Value<string>("OutputValue_LastYear")).ToString(); 
-                    newItem.OutputValue_ThisYear = Funs.GetNewDecimalOrZero(values.Value<string>("OutputValue_ThisYear")).ToString(); 
-                    newItem.OperationScale_BasePeriod = Funs.GetNewDecimalOrZero(values.Value<string>("OperationScale_BasePeriod")).ToString(); 
+                    newItem.OutputValue_BasePeriod = Funs.GetNewDecimalOrZero(values.Value<string>("OutputValue_BasePeriod")).ToString();
+                    newItem.OutputValue_LastYear = Funs.GetNewDecimalOrZero(values.Value<string>("OutputValue_LastYear")).ToString();
+                    newItem.OutputValue_ThisYear = Funs.GetNewDecimalOrZero(values.Value<string>("OutputValue_ThisYear")).ToString();
+                    newItem.OperationScale_BasePeriod = Funs.GetNewDecimalOrZero(values.Value<string>("OperationScale_BasePeriod")).ToString();
                     newItem.OperationScale_LastYear = Funs.GetNewDecimalOrZero(values.Value<string>("OperationScale_LastYear")).ToString();
                     newItem.OperationScale_ThisYear = Funs.GetNewDecimalOrZero(values.Value<string>("OperationScale_ThisYear")).ToString();
                     newItem.OperationScale_UnitOfMeasurement = values.Value<string>("OperationScale_UnitOfMeasurement");
@@ -204,18 +206,27 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
         protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
         {
-             Model.Environmental_EnergyReportItem a = (Model.Environmental_EnergyReportItem)e.DataItem;
+            Model.Environmental_EnergyReportItem a = (Model.Environmental_EnergyReportItem)e.DataItem;
             e.DataItem.ToString();
 
             //string SortIndex = Convert.ToString(row["SortIndex"]);
             if (a.SortIndex == "01")
             {
-                
+
+                for (int i = 0; i < e.CellCssClasses.Count(); i++)
+                {
+                    e.CellCssClasses[i] = "f-grid-cell-uneditable";
+                }
+
+            }
+
+            //鍚堣琛屽叏閮ㄧ姝㈣緭鍏�
+            if (a.SortUnit == 1)
+            {
                 for (int i = 0; i < e.CellCssClasses.Count(); i++)
                 {
                     e.CellCssClasses[i] = "f-grid-cell-uneditable";
                 }
-                
             }
         }
 
@@ -282,35 +293,14 @@ namespace FineUIPro.Web.ZHGL.Environmental
             EnergyReportId = report.EnergyReportId;
             BLL.EnergyreportItemService.DeleteEnergyReportItemByChemicalReportId(report.EnergyReportId);
             GetItems(report.EnergyReportId);
-            List<Model.Environmental_EnergyReportItem> mReportItemList = new List<Environmental_EnergyReportItem>();
-            foreach (var item in items)
+            if (items.Count > 0)
             {
-                Model.Environmental_EnergyReportItem newItem = new Environmental_EnergyReportItem();
-                newItem.EnergyReportItemId = item.EnergyReportItemId;
-                newItem.EnergyReportId = item.EnergyReportId;
-                newItem.SortIndex = item.SortIndex;
-                newItem.BusinessCategory = item.BusinessCategory;
-                newItem.Throughput_BasePeriod = item.Throughput_BasePeriod;
-                newItem.Throughput_LastPeriod = item.Throughput_LastPeriod;
-                newItem.Throughput_ThisPeriod = item.Throughput_ThisPeriod;
-                newItem.Throughput_UnitOfMeasurement = item.Throughput_UnitOfMeasurement;
-                newItem.Yield_BasePeriod = item.Yield_BasePeriod;
-                newItem.Yield_LastPeriod = item.Yield_LastPeriod;
-                newItem.Yield_ThisPeriod = item.Yield_ThisPeriod;
-                newItem.Yield_UnitOfMeasurement = item.Yield_UnitOfMeasurement;
-                newItem.OutputValue_BasePeriod = item.OutputValue_BasePeriod;
-                newItem.OutputValue_LastYear = item.OutputValue_LastYear;
-                newItem.OutputValue_ThisYear = item.OutputValue_ThisYear;
-                newItem.OperationScale_BasePeriod = item.OperationScale_BasePeriod;
-                newItem.OperationScale_LastYear = item.OperationScale_LastYear;
-                newItem.OperationScale_ThisYear = item.OperationScale_ThisYear;
-                newItem.OperationScale_UnitOfMeasurement = item.OperationScale_UnitOfMeasurement;
-                newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
-                newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
-                newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
-                EnergyreportItemService.AddEnvironmental_EnergyReportItem(newItem);
-                mReportItemList.Add(newItem);
+                Funs.DB.Environmental_EnergyReportItem.InsertAllOnSubmit(items);
+                Funs.DB.SubmitChanges();
+                ////璁＄畻鍚堣
+                //UpdateEnvironmental_EnergyReportItem(EnergyReportId);
             }
+
             if (type == "updata")     //鏁版嵁鍚屾
             {
                 if (report.UpState == BLL.Const.UpState_2)
@@ -322,6 +312,10 @@ namespace FineUIPro.Web.ZHGL.Environmental
                         PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                         return;
                     }
+                    else if (code == "3")
+                    {
+                        Alert.ShowInParent("闆嗗洟褰撳墠瀛ｅ害鏁版嵁宸查攣瀹氾紝鏃犳硶涓婁紶锛�", MessageBoxIcon.Error);
+                    }
                     else
                     {
                         Alert.ShowInParent("鍚屾寮傚父锛岃閫�鍑哄悗閲嶈瘯锛�", MessageBoxIcon.Error);
@@ -362,7 +356,8 @@ namespace FineUIPro.Web.ZHGL.Environmental
             {
                 JObject values = mergedRow.Value<JObject>("values");
                 string sortIndex = values.Value<string>("SortIndex");
-                var newItem = items.FirstOrDefault(x => x.SortIndex == sortIndex);
+                var SortUnit = values.Value<int>("SortUnit");
+                var newItem = items.FirstOrDefault(x => x.SortIndex == sortIndex && x.SortUnit == SortUnit);
                 if (newItem != null)
                 {
                     newItem.EnergyReportItemId = SQLHelper.GetNewID();
@@ -391,11 +386,63 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 }
             }
             items = newItemLists;
+            //璁＄畻鍚堣
+            getAllSum();
+        }
+        #endregion
+
+        #region 淇濆瓨鏄庣粏涔嬪墠璁＄畻鍚堣
+        private void getAllSum()
+        {
+            items.ForEach(x =>
+            {
+                //闇�瑕佸悎璁＄殑鏃跺��
+                if (x.SortUnit == 1)
+                {
+                    if (x.BusinessCategory == "鍚堣")
+                    {
+                        x.Throughput_BasePeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.Throughput_BasePeriod)).ToString();
+                        x.Throughput_LastPeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.Throughput_LastPeriod)).ToString();
+                        x.Throughput_ThisPeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.Throughput_ThisPeriod)).ToString();
+                        x.Yield_BasePeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.Yield_BasePeriod)).ToString();
+                        x.Yield_LastPeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.Yield_LastPeriod)).ToString();
+                        x.Yield_ThisPeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.Yield_ThisPeriod)).ToString();
+                        x.OutputValue_BasePeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.OutputValue_BasePeriod)).ToString();
+                        x.OutputValue_LastYear = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.OutputValue_LastYear)).ToString();
+                        x.OutputValue_ThisYear = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.OutputValue_ThisYear)).ToString();
+                        x.OperationScale_BasePeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.OperationScale_BasePeriod)).ToString();
+                        x.OperationScale_LastYear = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.OperationScale_LastYear)).ToString();
+                        x.OperationScale_ThisYear = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.OperationScale_ThisYear)).ToString();
+                        x.ServiceOperatingIncome_BasePeriod = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.ServiceOperatingIncome_BasePeriod)).ToString();
+                        x.ServiceOperatingIncome_LastYear = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.ServiceOperatingIncome_LastYear)).ToString();
+                        x.ServiceOperatingIncome_ThisYear = items.Where(y => y.SortUnit != 1).Sum(y => Funs.GetNewDecimalOrZero(y.ServiceOperatingIncome_ThisYear)).ToString();
+
+                    }
+                    else
+                    {
+                        x.Throughput_BasePeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.Throughput_BasePeriod)).ToString();
+                        x.Throughput_LastPeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.Throughput_LastPeriod)).ToString();
+                        x.Throughput_ThisPeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.Throughput_ThisPeriod)).ToString();
+                        x.Yield_BasePeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.Yield_BasePeriod)).ToString();
+                        x.Yield_LastPeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.Yield_LastPeriod)).ToString();
+                        x.Yield_ThisPeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.Yield_ThisPeriod)).ToString();
+                        x.OutputValue_BasePeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.OutputValue_BasePeriod)).ToString();
+                        x.OutputValue_LastYear = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.OutputValue_LastYear)).ToString();
+                        x.OutputValue_ThisYear = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.OutputValue_ThisYear)).ToString();
+                        x.OperationScale_BasePeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.OperationScale_BasePeriod)).ToString();
+                        x.OperationScale_LastYear = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.OperationScale_LastYear)).ToString();
+                        x.OperationScale_ThisYear = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.OperationScale_ThisYear)).ToString();
+                        x.ServiceOperatingIncome_BasePeriod = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.ServiceOperatingIncome_BasePeriod)).ToString();
+                        x.ServiceOperatingIncome_LastYear = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.ServiceOperatingIncome_LastYear)).ToString();
+                        x.ServiceOperatingIncome_ThisYear = items.Where(y => y.SortUnit != 1 && y.SortIndex == x.SortIndex).Sum(y => Funs.GetNewDecimalOrZero(y.ServiceOperatingIncome_ThisYear)).ToString();
+                    }
+                }
+            });
         }
         #endregion
 
         #region 鑾峰彇鏄庣粏
-        private void GetNewItems(int  year, int Quarters)
+        private void GetNewItems(int year, int Quarters)
         {
             var indexNames = EnergyreportItemService.GetItems("Template");
             foreach (var indexName in indexNames)
@@ -406,11 +453,48 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     EnergyReportItemId = SQLHelper.GetNewID(typeof(Model.Environmental_EnergyReportItem)),
                     BusinessCategory = indexName.BusinessCategory,
                     SortIndex = indexName.SortIndex,
+                    SortUnit = indexName.SortUnit
                 };
 
                 items.Add(item);
+
+                //淇敼2024-10-23 14:15:06
+                #region 寰幆鍐嶆澧炲姞鍚勫垎鍗曚綅
+                if (item.BusinessCategory != "鍚堣")
+                {
+                    //绗竴涓湰鍗曚綅
+                    var isthisUnit = CommonService.GetIsThisUnit();
+
+                    var model = new Environmental_EnergyReportItem
+                    {
+                        EnergyReportItemId = SQLHelper.GetNewID(typeof(Model.Environmental_EnergyReportItem)),
+                        BusinessCategory = getLenthSpace(indexName.SortIndex) +isthisUnit.UnitName,
+                        SortIndex = item.SortIndex,
+                        SortUnit = 2,
+                    };
+                    items.Add(model);
+                    //鍔犺浇鍒嗗崟浣�
+                    var unitList = Funs.DB.Base_Unit.Where(x => x.IsBranch == true).ToList();
+                    var j = 3;
+                    foreach (var unitItem in unitList)
+                    {
+                        model = new Environmental_EnergyReportItem
+                        {
+                            EnergyReportItemId = SQLHelper.GetNewID(typeof(Model.Environmental_EnergyReportItem)),
+                            BusinessCategory = getLenthSpace(indexName.SortIndex) +unitItem.UnitName,
+                            SortIndex = item.SortIndex,
+                            SortUnit = j,
+                        };
+                        items.Add(model);
+                        j++;
+                    }
+                }
+                #endregion
+
+
             }
-            var ListProjectEnergyItemReport= ProjectEnergyreportItemService.GetItemsByDate(year, Quarters);
+
+            var ListProjectEnergyItemReport = ProjectEnergyreportItemService.GetItemsByDate(year, Quarters);
             var q = from x in ListProjectEnergyItemReport
                     group x by x.SortIndex into g
                     select new
@@ -568,5 +652,20 @@ namespace FineUIPro.Web.ZHGL.Environmental
             }
         }
         #endregion
+
+        #region 鍙栧叿浣撴暟閲忕殑绌烘牸
+        private string getLenthSpace(string SortIndex) {
+            string returnVal = "";
+            if (SortIndex == "02" || SortIndex == "16" || SortIndex == "44")
+            {
+                returnVal += "A";
+            }
+            else {
+                returnVal += "B";
+            }
+           
+            return returnVal;
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx
index dded2399..c2bd44f7 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx
@@ -21,8 +21,7 @@
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="涓ぎ浼佷笟鑺傝兘鐜繚鍜岀粡钀ョ姸鍐靛鎶�" EnableCollapse="true"
                     runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="BusinessReportId"
                     DataIDField="BusinessReportId" AllowSorting="true" ForceFit="true"
-                    SortField="FillingDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
-                    IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    SortField="FillingDate"  AllowPaging="true"
                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
@@ -49,7 +48,10 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:RenderField Width="60px" ColumnID="Code" DataField="Code" SortField="Code"
+                         <f:RenderField Width="120px" ColumnID="UnitName" DataField="UnitName"
+                                    FieldType="String" HeaderText="浼佷笟鍚嶇О" HeaderTextAlign="Center" TextAlign="Left" />
+
+                        <f:RenderField Width="60px" ColumnID="Code" DataField="Code" 
                             FieldType="String" HeaderText="浠ｇ爜" HeaderTextAlign="Center" TextAlign="Center" />
 
                         <f:GroupField EnableLock="true" HeaderText="浼佷笟鍩烘湰鎯呭喌" TextAlign="Center">
@@ -86,7 +88,7 @@
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
                     </Listeners>
-                    <PageItems>
+                   <%-- <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                         </f:ToolbarSeparator>
                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="姣忛〉璁板綍鏁帮細">
@@ -94,14 +96,14 @@
                         <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
                             OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                         </f:DropDownList>
-                    </PageItems>
+                    </PageItems>--%>
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="缂栬緫瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px" Height="560px">
+        <f:Window ID="Window1" Title="缂栬緫涓ぎ浼佷笟鑺傝兘鐜繚浼佷笟鍩烘湰鎯呭喌鍜岀粡钀ョ姸鍐�" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" PercentWidth="100%" PercentHeight="100%">
         </f:Window>
-        <f:Window ID="Window2" Title="鎵撳嵃瀹夊叏鐢熶骇鏁版嵁瀛ｆ姤" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window2" Title="鎵撳嵃涓ぎ浼佷笟鑺傝兘鐜繚浼佷笟鍩烘湰鎯呭喌鍜岀粡钀ョ姸鍐�" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px" Height="560px">
         </f:Window>
         <f:Menu ID="Menu1" runat="server">
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.cs
index 3b46341c..508b370b 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.cs
@@ -18,7 +18,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
         {
             if (!IsPostBack)
             {
-                Funs.DropDownPageSize(this.ddlPageSize);
+                //Funs.DropDownPageSize(this.ddlPageSize);
                 //鏉冮檺鎸夐挳鏂规硶
                 this.GetButtonPower();
 
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 {
                     Grid1.PageSize = this.CurrUser.PageSize.Value;
                 }
-                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                //this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 缁戝畾琛ㄦ牸
                 this.BindGrid();
             }
@@ -52,7 +52,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
         {
             string strSql = "select * from Environmental_OperationReport where 1=1 ";
 
-            strSql += " AND UnitId = '" + BLL.Const.UnitId_CWCEC + "'";
+            strSql += " AND UnitId = '" + CommonService.GetThisUnitId() + "'";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
 
@@ -67,18 +67,25 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 listStr.Add(new SqlParameter("@Quarters", Funs.GetNewInt(this.drpQuarters.SelectedValue)));
             }
 
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            //SqlParameter[] parameter = listStr.ToArray();
+            //DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
-            Grid1.RecordCount = tb.Rows.Count;
+            //Grid1.RecordCount = tb.Rows.Count;
 
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
-            Grid1.DataBind();
+            //var table = this.GetPagedDataTable(Grid1, tb);
+            //Grid1.DataSource = table;
+            //Grid1.DataBind();
 
             Model.Environmental_OperationReport report = Funs.DB.Environmental_OperationReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Quarters == Funs.GetNewInt(this.drpQuarters.SelectedValue) && e.Year == Funs.GetNewInt(this.drpYear.SelectedValue));
             if (report != null)
             {
+                //鏍规嵁涓昏〃id鍔犺浇瀛愯〃
+                var reportItem = Funs.DB.Environmental_OperationReportItem.Where(x => x.BusinessReportId == report.BusinessReportId)
+                    .OrderBy(x => x.SortIndex).ToList();
+
+                Grid1.DataSource = reportItem;
+                Grid1.DataBind();
+
                 string upState = string.Empty;
                 if (report.UpState == BLL.Const.UpState_3)
                 {
@@ -90,6 +97,14 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 }
                 this.Grid1.Title = "涓ぎ浼佷笟鑺傝兘鐜繚鍜岀粡钀ョ姸鍐靛鎶�" + this.drpQuarters.SelectedItem.Text + this.drpYear.SelectedItem.Text + upState;
             }
+            else {
+
+                var upState = "(鏈笂鎶�)";
+
+                this.Grid1.Title = "涓ぎ浼佷笟鑺傝兘鐜繚鍜岀粡钀ョ姸鍐靛鎶�" + this.drpQuarters.SelectedItem.Text + this.drpYear.SelectedItem.Text + upState;
+                this.Grid1.DataSource = null;
+                this.Grid1.DataBind();
+            }
         }
         #endregion
 
@@ -123,8 +138,8 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// <param name="e"></param>
         protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
         {
-            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
-            BindGrid();
+            //this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            //BindGrid();
         }
 
         /// <summary>
@@ -163,7 +178,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// <param name="e"></param>
         protected void btnNew_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OperationReportEdit.aspx?UnitId={0}&&Year={1}&&Quarter={2}", BLL.Const.UnitId_CWCEC, this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, "缂栬緫 - ")));
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OperationReportEdit.aspx?UnitId={0}&&Year={1}&&Quarter={2}", CommonService.GetThisUnitId(), this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, "缂栬緫 - ")));
         }
         /// <summary>
         /// 鍙屽嚮浜嬩欢
@@ -199,7 +214,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
             var operationReport = Funs.DB.Environmental_OperationReport.FirstOrDefault(s => s.BusinessReportId == id);
             if (operationReport != null)
             {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OperationReportEdit.aspx?UnitId={0}&&Year={1}&&Quarter={2}&&BusinessReportId={3}", BLL.Const.UnitId_CWCEC, this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, id, "缂栬緫 - ")));
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OperationReportEdit.aspx?UnitId={0}&&Year={1}&&Quarter={2}&&BusinessReportId={3}", CommonService.GetThisUnitId(), this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, id, "缂栬緫 - ")));
             }
         }
 
@@ -210,14 +225,19 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// <param name="e"></param>
         protected void btnUpdata_Click(object sender, EventArgs e)
         {
-            var currUnitId = BLL.Const.UnitId_CWCEC;
+            var currUnitId = CommonService.GetThisUnitId();
             var year = this.drpYear.SelectedValue;
             var quarter = this.drpQuarters.SelectedValue;
 
             Model.Environmental_OperationReport report = Funs.DB.Environmental_OperationReport.Where(s => s.UnitId == currUnitId && s.Year.ToString() == year && s.Quarters.ToString() == quarter).FirstOrDefault();
             if (report != null)
             {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OperationReportEdit.aspx?UnitId={0}&&Year={1}&&Quarter={2}&&BusinessReportId={3}&type=Update", BLL.Const.UnitId_CWCEC, this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, report.BusinessReportId, "缂栬緫 - ")));
+                if (report.UpState=="3")
+                {
+                    ShowNotify("褰撳墠鎶ヨ〃宸茬粡涓婃姤锛佷笉鑳介噸澶嶄笂鎶ャ��", MessageBoxIcon.Warning);
+                    return;
+                }
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("OperationReportEdit.aspx?UnitId={0}&&Year={1}&&Quarter={2}&&BusinessReportId={3}&type=Update", CommonService.GetThisUnitId(), this.drpYear.SelectedValue, this.drpQuarters.SelectedValue, report.BusinessReportId, "缂栬緫 - ")));
             }
             else
             {
@@ -264,15 +284,22 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     var getD = Funs.DB.Environmental_OperationReport.FirstOrDefault(s => s.BusinessReportId == rowID);
                     if (getD != null)
                     {
+                        //鍏堝垹瀛愯〃
+                        var list = Funs.DB.Environmental_OperationReportItem.Where(x => x.BusinessReportId == getD.BusinessReportId).ToList();
+                        if (list.Count > 0)
+                        {
+                            Funs.DB.Environmental_OperationReportItem.DeleteAllOnSubmit(list);
+                            Funs.DB.SubmitChanges();
+                        }
+
                         BLL.LogService.AddSys_Log(this.CurrUser, null, getD.BusinessReportId, BLL.Const.OperationReportMenuId, BLL.Const.BtnDelete);
 
                         Funs.DB.Environmental_OperationReport.DeleteOnSubmit(getD);
                         Funs.DB.SubmitChanges();
                     }
                 }
-
-                this.BindGrid();
                 ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+                this.BindGrid();
             }
         }
         #endregion
@@ -322,7 +349,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 }
             }
 
-            var unitId = BLL.Const.UnitId_CWCEC;
+            var unitId = CommonService.GetThisUnitId();
             var year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
             var quarter = Funs.GetNewIntOrZero(drpQuarters.SelectedValue);
 
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.designer.cs
index 8509bf42..a5a5423f 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.designer.cs
@@ -113,33 +113,6 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// </remarks>
         protected global::FineUIPro.Button btnUpdata;
 
-        /// <summary>
-        /// ToolbarSeparator1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-
-        /// <summary>
-        /// ToolbarText1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.ToolbarText ToolbarText1;
-
-        /// <summary>
-        /// ddlPageSize 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPageSize;
-
         /// <summary>
         /// Window1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx
index 13fbea7c..f023f466 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx
@@ -16,7 +16,7 @@
     <form id="form1" runat="server">
         <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
         <f:Panel ID="Panel1" BodyPadding="5px" runat="server" ShowHeader="false" EnableCollapse="True"
-            Title="缂栬緫鐜繚涓庣粡钀ョ姸鍐垫暟鎹鎶�" AutoScroll="true">
+            Title="缂栬緫涓ぎ浼佷笟鑺傝兘鐜繚浼佷笟鍩烘湰鎯呭喌鍜岀粡钀ョ姸鍐�" AutoScroll="true">
             <Items>
                 <f:Form ID="Form2" runat="server" ShowHeader="false" BodyPadding="5px" RedStarPosition="BeforeText">
                     <Items>
@@ -35,7 +35,132 @@
                     </Items>
                 </f:Form>
 
+                
+
+                <f:Form ID="Form11" runat="server" ShowHeader="false" BodyPadding="5px">
+                    <Items>
+                        <f:FormRow>
+                            <Items>
+                                <f:TextBox ID="txtCompileMan" runat="server" Label="濉姤浜�" LabelAlign="Right" LabelWidth="140px">
+                                </f:TextBox>
+                                <f:TextBox ID="txtStatisticsDutyPerson" runat="server" Label="缁熻璐熻矗浜�" LabelAlign="Right" LabelWidth="140px">
+                                </f:TextBox>
+                            </Items>
+                        </f:FormRow>
+                        <f:FormRow>
+                            <Items>
+                                <f:TextBox ID="txtUnitDutyPerson" runat="server" Label="鍗曚綅璐熻矗浜�" LabelAlign="Right" LabelWidth="140px">
+                                </f:TextBox>
+                                <f:DatePicker ID="txtFillingDate" runat="server" Label="濉姤鏃ユ湡" LabelAlign="Right" LabelWidth="140px"
+                                    EnableEdit="true">
+                                </f:DatePicker>
+                            </Items>
+                        </f:FormRow>
+                    </Items>
+                </f:Form>
+
+                <f:Form ID="Form6" runat="server" ShowHeader="false" BodyPadding="5px">
+                    <Items>
+                        <f:FormRow>
+                            <Items>
+                                <f:TextBox ID="txtRemark" runat="server" Label="澶囨敞" LabelAlign="Right" LabelWidth="140px">
+                                </f:TextBox>
+                            </Items>
+                        </f:FormRow>
+                    </Items>
+                </f:Form>
+
                 <f:Form ID="Form4" runat="server" ShowHeader="false" BodyPadding="5px">
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="BusinessReportItemId"
+                            DataKeyNames="BusinessReportItemId" ShowGridHeader="true" SortField="SortIndex" SortDirection="ASC"
+                            AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                            EnableTextSelection="True">
+                            <Columns>
+                                <f:RenderField minWidth="300px" ColumnID="UnitName" DataField="UnitName"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="鍗曚綅鍚嶇О">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox1" runat="server">
+                                        </f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="100px" ColumnID="Code" DataField="Code"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="浠ｇ爜">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox2" runat="server">
+                                        </f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="100px" ColumnID="UnitLevel" DataField="UnitLevel"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="浼佷笟灞傜骇">
+                                    <Editor>
+                                        <f:TextBox ID="TextBox3" runat="server">
+                                        </f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="120px" ColumnID="CreateDate" DataField="CreateDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                                   HeaderTextAlign="Center" TextAlign="Left" HeaderText="鎴愮珛鏃堕棿">
+                                    <Editor>
+                                        <f:DatePicker ID="DatePicker1" DateFormatString="yyyy-MM-dd" runat="server">
+                                        </f:DatePicker>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="160px" ColumnID="Place" DataField="Place"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="鎵�鍦ㄥ湴">
+                                     <Editor>
+                                        <f:TextBox ID="TextBox4" runat="server">
+                                        </f:TextBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="120px" ColumnID="PersonNum" DataField="PersonNum"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="鑱屽伐浜烘暟">
+                                    <Editor>
+                                        <f:NumberBox ID="txtPersonNum" runat="server" NoDecimal="false"
+                                            NoNegative="false" EmptyText="0">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="160px" ColumnID="TotalAssets" DataField="TotalAssets"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="璧勪骇鎬婚锛堜竾鍏冿級">
+                                    <Editor>
+                                        <f:NumberBox ID="txtTotalAssets" runat="server"
+                                            NoDecimal="false" NoNegative="false" EmptyText="0" DecimalPrecision="4">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="160px" ColumnID="TotalValue" DataField="TotalValue"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="鎬讳骇鍊硷紙涓囧厓锛�">
+                                    <Editor>
+                                        <f:NumberBox ID="NumberBox1" runat="server"
+                                            NoDecimal="false" NoNegative="false" EmptyText="0" DecimalPrecision="4">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+
+                                <f:RenderField minWidth="160px" ColumnID="NewInvestment" DataField="NewInvestment"
+                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="鏂板鎶曡祫锛堜竾鍏冿級">
+                                    <Editor>
+                                        <f:NumberBox ID="NumberBox2" runat="server"
+                                            NoDecimal="false" NoNegative="false" EmptyText="0" DecimalPrecision="4">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:Form>
+
+
+
+
+                <%--<f:Form ID="Form4" runat="server" ShowHeader="false" BodyPadding="5px">
                     <Items>
                         <f:FormRow>
                             <Items>
@@ -90,41 +215,7 @@
                             </Rows>
                         </f:Form>
                     </Items>
-                </f:GroupPanel>
-
-                <f:Form ID="Form6" runat="server" ShowHeader="false" BodyPadding="5px">
-                    <Items>
-                        <f:FormRow>
-                            <Items>
-                                <f:TextBox ID="txtRemark" runat="server" Label="澶囨敞" LabelAlign="Right" LabelWidth="140px">
-                                </f:TextBox>
-                            </Items>
-                        </f:FormRow>
-                    </Items>
-                </f:Form>
-
-                <f:Form ID="Form11" runat="server" ShowHeader="false" BodyPadding="5px">
-                    <Items>
-                        <f:FormRow>
-                            <Items>
-                                <f:TextBox ID="txtCompileMan" runat="server" Label="濉姤浜�" LabelAlign="Right" LabelWidth="140px">
-                                </f:TextBox>
-                                <f:TextBox ID="txtStatisticsDutyPerson" runat="server" Label="缁熻璐熻矗浜�" LabelAlign="Right" LabelWidth="140px">
-                                </f:TextBox>
-                            </Items>
-                        </f:FormRow>
-                        <f:FormRow>
-                            <Items>
-                                <f:TextBox ID="txtUnitDutyPerson" runat="server" Label="鍗曚綅璐熻矗浜�" LabelAlign="Right" LabelWidth="140px">
-                                </f:TextBox>
-                                <f:DatePicker ID="txtFillingDate" runat="server" Label="濉姤鏃ユ湡" LabelAlign="Right" LabelWidth="140px"
-                                    EnableEdit="true">
-                                </f:DatePicker>
-                            </Items>
-                        </f:FormRow>
-                    </Items>
-                </f:Form>
-
+                </f:GroupPanel>--%>
             </Items>
             <Toolbars>
                 <f:Toolbar ID="Toolbar2" Position="Bottom" ToolbarAlign="Right" runat="server">
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.cs
index aa84cda6..647f10d3 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.cs
@@ -1,5 +1,7 @@
 锘縰sing BLL;
+using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.UI.WebControls;
 
@@ -61,8 +63,10 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     this.btnSave.Hidden = false;
                     this.btnUpdata.Hidden = true;
                 }
-
+                ddlUnitId.SelectedValue = CommonService.GetThisUnitId();
                 BindGrid(year, quarter, unitId);
+
+                
             }
         }
 
@@ -88,53 +92,59 @@ namespace FineUIPro.Web.ZHGL.Environmental
                     {
                         this.txtCompileMan.Text = operationReport.FillingMan.ToString();
                     }
-                    if (!string.IsNullOrWhiteSpace(operationReport.UnitLevel))
-                    {
-                        this.txtUnitLevel.Text = operationReport.UnitLevel;
-                    }
-                    if (!string.IsNullOrWhiteSpace(operationReport.Place))
-                    {
-                        this.txtPlace.Text = operationReport.Place;
-                    }
+                    //if (!string.IsNullOrWhiteSpace(operationReport.UnitLevel))
+                    //{
+                    //    this.txtUnitLevel.Text = operationReport.UnitLevel;
+                    //}
+                    //if (!string.IsNullOrWhiteSpace(operationReport.Place))
+                    //{
+                    //    this.txtPlace.Text = operationReport.Place;
+                    //}
                     if (operationReport.FillingDate != null)
                     {
                         this.txtFillingDate.Text = operationReport.FillingDate.Value.ToString("yyyy-MM-dd");
                     }
-                    if (operationReport.CreateDate != null)
-                    {
-                        this.txtCreateDate.Text = operationReport.CreateDate.Value.ToString("yyyy-MM-dd");
-                    }
-                    if (!string.IsNullOrWhiteSpace(operationReport.Code))
-                    {
-                        this.txtCode.Text = operationReport.Code;
-                    }
-                    if (operationReport.PersonNum != null)
-                    {
-                        this.txtPersonNum.Text = operationReport.PersonNum.ToString();
-                    }
-                    if (operationReport.TotalAssets != null)
-                    {
-                        this.txtTotalAssets.Text = operationReport.TotalAssets.ToString();
-                    }
-                    if (operationReport.TotalValue != null)
-                    {
-                        this.txtTotalValue.Text = operationReport.TotalValue.ToString();
-                    }
-                    if (operationReport.NewInvestment != null)
-                    {
-                        this.txtNewInvestment.Text = operationReport.NewInvestment.ToString();
-                    }
+                    //if (operationReport.CreateDate != null)
+                    //{
+                    //    this.txtCreateDate.Text = operationReport.CreateDate.Value.ToString("yyyy-MM-dd");
+                    //}
+                    //if (!string.IsNullOrWhiteSpace(operationReport.Code))
+                    //{
+                    //    this.txtCode.Text = operationReport.Code;
+                    //}
+                    //if (operationReport.PersonNum != null)
+                    //{
+                    //    this.txtPersonNum.Text = operationReport.PersonNum.ToString();
+                    //}
+                    //if (operationReport.TotalAssets != null)
+                    //{
+                    //    this.txtTotalAssets.Text = operationReport.TotalAssets.ToString();
+                    //}
+                    //if (operationReport.TotalValue != null)
+                    //{
+                    //    this.txtTotalValue.Text = operationReport.TotalValue.ToString();
+                    //}
+                    //if (operationReport.NewInvestment != null)
+                    //{
+                    //    this.txtNewInvestment.Text = operationReport.NewInvestment.ToString();
+                    //}
                     this.txtStatisticsDutyPerson.Text = operationReport.StatisticsDutyPerson;
                     this.txtUnitDutyPerson.Text = operationReport.UnitDutyPerson;
                     this.txtRemark.Text = operationReport.Remark;
 
+                    //鏍规嵁涓昏〃id鍔犺浇瀛愯〃
+                    var reportItem = Funs.DB.Environmental_OperationReportItem.Where(x => x.BusinessReportId == operationReport.BusinessReportId)
+                        .OrderBy(x => x.SortIndex).ToList();
+
+                    Grid1.DataSource = reportItem;
+                    Grid1.DataBind();
                     #endregion
                 }
             }
             else
             {
                 #region 涓嶅瓨鍦ㄥ垯鏍规嵁椤圭洰缁熻鐢熸垚
-                this.ddlUnitId.SelectedValue = unitId;
+                //this.ddlUnitId.SelectedValue = unitId;
                 this.drpYear.SelectedValue = year;
                 this.ddlQuarter.SelectedValue = quarter;
                 this.txtFillingDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
@@ -147,15 +157,57 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
                 if (items.Any())
                 {
-                    this.txtPersonNum.Text = items.Sum(s => s.PersonNum ?? 0).ToString();
-                    this.txtTotalAssets.Text = items.Sum(s => s.TotalAssets ?? 0).ToString();
-                    this.txtTotalValue.Text = items.Sum(s => s.TotalValue ?? 0).ToString();
-                    this.txtNewInvestment.Text = items.Sum(s => s.NewInvestment ?? 0).ToString();
+                    //this.txtPersonNum.Text = items.Sum(s => s.PersonNum ?? 0).ToString();
+                    //this.txtTotalAssets.Text = items.Sum(s => s.TotalAssets ?? 0).ToString();
+                    //this.txtTotalValue.Text = items.Sum(s => s.TotalValue ?? 0).ToString();
+                    //this.txtNewInvestment.Text = items.Sum(s => s.NewInvestment ?? 0).ToString();
                 }
                 this.txtCompileMan.Text = this.CurrUser.UserName;
                 this.txtStatisticsDutyPerson.Text = this.CurrUser.UserName;
                 this.txtUnitDutyPerson.Text = this.CurrUser.UserName;
 
+                //鍔犺浇瀛愯〃
+                var reportItemlist = new List<Model.Environmental_OperationReportItem>();
+                //绗竴涓湰鍗曚綅
+                var isthisUnit = CommonService.GetIsThisUnit();
+                var reportItemModel = new Model.Environmental_OperationReportItem() {
+                    BusinessReportItemId = Guid.NewGuid().ToString(),
+                    SortIndex = 1,
+                    UnitName = isthisUnit.UnitName,
+                    SortUnitName= isthisUnit.UnitName,
+                    Code = isthisUnit.UnitCode,
+                    UnitLevel = "",
+                    CreateDate=null,
+                    Place= isthisUnit.Address,
+                    PersonNum=0,
+                    TotalAssets=0,
+                    TotalValue=0,
+                    NewInvestment=0,
+                };
+                reportItemlist.Add(reportItemModel);
+                //鍔犺浇鍒嗗崟浣�
+                var unitList = Funs.DB.Base_Unit.Where(x => x.IsBranch == true).ToList();
+                foreach (var item in unitList)
+                {
+                    var reportItemModelb = new Model.Environmental_OperationReportItem()
+                    {
+                        BusinessReportItemId = Guid.NewGuid().ToString(),
+                        SortIndex = 1,
+                        UnitName = item.UnitName,
+                        SortUnitName = isthisUnit.UnitName,
+                        Code = item.UnitCode,
+                        UnitLevel = "",
+                        CreateDate = null,
+                        Place = item.Address,
+                        PersonNum = 0,
+                        TotalAssets = 0,
+                        TotalValue = 0,
+                        NewInvestment = 0,
+                    };
+                    reportItemlist.Add(reportItemModelb);
+                }
+                Grid1.DataSource = reportItemlist;
+                Grid1.DataBind();
                 #endregion
             }
         }
@@ -216,14 +268,14 @@ namespace FineUIPro.Web.ZHGL.Environmental
             operationReport.StatisticsDutyPerson = this.txtStatisticsDutyPerson.Text.Trim();
             operationReport.UnitDutyPerson = this.txtUnitDutyPerson.Text.Trim();
             operationReport.FillingDate = Funs.GetNewDateTime(this.txtFillingDate.Text);
-            operationReport.Code = this.txtCode.Text.Trim();
-            operationReport.PersonNum = Funs.GetNewInt(this.txtPersonNum.Text.Trim());
-            operationReport.TotalAssets = Funs.GetNewDecimalOrZero(this.txtTotalAssets.Text.Trim());
-            operationReport.TotalValue = Funs.GetNewDecimalOrZero(this.txtTotalValue.Text.Trim());
-            operationReport.NewInvestment = Funs.GetNewDecimalOrZero(this.txtNewInvestment.Text.Trim());
-            operationReport.UnitLevel = this.txtUnitLevel.Text.Trim();
-            operationReport.CreateDate = Funs.GetNewDateTime(this.txtCreateDate.Text);
-            operationReport.Place = this.txtPlace.Text.Trim();
+            //operationReport.Code = this.txtCode.Text.Trim();
+            //operationReport.PersonNum = Funs.GetNewInt(this.txtPersonNum.Text.Trim());
+            //operationReport.TotalAssets = Funs.GetNewDecimalOrZero(this.txtTotalAssets.Text.Trim());
+            //operationReport.TotalValue = Funs.GetNewDecimalOrZero(this.txtTotalValue.Text.Trim());
+            //operationReport.NewInvestment = Funs.GetNewDecimalOrZero(this.txtNewInvestment.Text.Trim());
+            //operationReport.UnitLevel = this.txtUnitLevel.Text.Trim();
+            //operationReport.CreateDate = Funs.GetNewDateTime(this.txtCreateDate.Text);
+            //operationReport.Place = this.txtPlace.Text.Trim();
             operationReport.Remark = this.txtRemark.Text.Trim();
 
             if (!string.IsNullOrEmpty(this.BusinessReportId))
@@ -231,17 +283,17 @@ namespace FineUIPro.Web.ZHGL.Environmental
                 var model = Funs.DB.Environmental_OperationReport.FirstOrDefault(s => s.BusinessReportId == this.BusinessReportId);
                 if (model != null)
                 {
-                    model.Code = operationReport.Code;
-                    model.PersonNum = operationReport.PersonNum;
-                    model.TotalAssets = operationReport.TotalAssets;
-                    model.TotalValue = operationReport.TotalValue;
-                    model.NewInvestment = operationReport.NewInvestment;
+                    //model.Code = operationReport.Code;
+                    //model.PersonNum = operationReport.PersonNum;
+                    //model.TotalAssets = operationReport.TotalAssets;
+                    //model.TotalValue = operationReport.TotalValue;
+                    //model.NewInvestment = operationReport.NewInvestment;
                     model.Quarters = operationReport.Quarters;
                     model.Year = operationReport.Year;
                     model.FillingMan = operationReport.FillingMan;
                     model.FillingDate = operationReport.FillingDate;
-                    model.CreateDate = operationReport.CreateDate;
-                    model.Place = operationReport.Place;
+                    //model.CreateDate = operationReport.CreateDate;
+                    //model.Place = operationReport.Place;
                     model.Remark = operationReport.Remark;
                     model.StatisticsDutyPerson = operationReport.StatisticsDutyPerson;
                     model.UnitDutyPerson = operationReport.UnitDutyPerson;
@@ -251,6 +303,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
                     BLL.LogService.AddSys_Log(this.CurrUser, operationReport.Year.ToString() + "-" + operationReport.Quarters.ToString(), operationReport.BusinessReportId, BLL.Const.OperationReportMenuId, BLL.Const.BtnModify);
                     Funs.DB.SubmitChanges();
+                    saveReportItem(operationReport.BusinessReportId);
                 }
             }
             else
@@ -270,6 +323,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
                         BLL.Const.OperationReportMenuId, BLL.Const.BtnAdd);
 
                     Funs.DB.SubmitChanges();
+                    saveReportItem(operationReport.BusinessReportId);
                 }
                 else
                 {
@@ -289,6 +343,10 @@ namespace FineUIPro.Web.ZHGL.Environmental
                         PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
                         return;
                     }
+                    else if (code == "3")
+                    {
+                        Alert.ShowInParent("闆嗗洟褰撳墠瀛ｅ害鏁版嵁宸查攣瀹氾紝鏃犳硶涓婁紶锛�", MessageBoxIcon.Error);
+                    }
                     else
                     {
                         Alert.ShowInParent("鍚屾寮傚父锛岃閫�鍑哄悗閲嶈瘯锛�", MessageBoxIcon.Error);
@@ -304,6 +362,49 @@ namespace FineUIPro.Web.ZHGL.Environmental
 
         #endregion
 
+        #region 淇濆瓨瀛愯〃
+        private void saveReportItem(string BusinessReportId) {
+            var list = Funs.DB.Environmental_OperationReportItem.Where(x => x.BusinessReportId == BusinessReportId).ToList();
+            //鍏堝垹闄�
+            if (list.Count>0)
+            {
+                Funs.DB.Environmental_OperationReportItem.DeleteAllOnSubmit(list);
+                Funs.DB.SubmitChanges();
+            }
+            //鍐嶄繚瀛�
+            JArray mergedData = Grid1.GetMergedData();
+            var reportItemlist = new List<Model.Environmental_OperationReportItem>();
+            var isthisUnit = CommonService.GetIsThisUnit();
+            foreach (var item in mergedData)
+            {
+                JObject values = item.Value<JObject>("values");
+                int i = item.Value<int>("index");
+                var model = new Model.Environmental_OperationReportItem() { 
+                    BusinessReportItemId= Grid1.Rows[i].DataKeys[0].ToString(),
+                    BusinessReportId= BusinessReportId,
+                    SortIndex= i+1,
+                    UnitName = values.Value<string>("UnitName").ToString(),
+                    SortUnitName= isthisUnit.UnitName,
+                    Code= values.Value<string>("Code").ToString(),
+                    UnitLevel= values.Value<string>("UnitLevel").ToString(),
+                    Place= values.Value<string>("Place").ToString(),
+                    PersonNum= values.Value<int>("PersonNum"),
+                    TotalAssets= values.Value<decimal>("TotalAssets"),
+                    TotalValue = values.Value<decimal>("TotalValue"),
+                    NewInvestment = values.Value<decimal>("NewInvestment"),
+
+                };
+                if (!string.IsNullOrEmpty(values.Value<string>("CreateDate").ToString()))
+                {
+                    model.CreateDate = Convert.ToDateTime(values.Value<string>("CreateDate").ToString());
+                }
+                reportItemlist.Add(model);
+            }
+            Funs.DB.Environmental_OperationReportItem.InsertAllOnSubmit(reportItemlist);
+            Funs.DB.SubmitChanges();
+        }
+        #endregion
+
         #region 骞村搴﹀彉鍖栦簨浠�
         /// <summary>
         /// 骞村搴﹀彉鍖栦簨浠�
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.designer.cs
index ccfbb7d9..e9a931de 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.designer.cs
@@ -77,141 +77,6 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlQuarter;
 
-        /// <summary>
-        /// Form4 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Form Form4;
-
-        /// <summary>
-        /// txtCode 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtCode;
-
-        /// <summary>
-        /// GroupPanel1 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.GroupPanel GroupPanel1;
-
-        /// <summary>
-        /// Form3 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Form Form3;
-
-        /// <summary>
-        /// txtUnitLevel 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtUnitLevel;
-
-        /// <summary>
-        /// txtCreateDate 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.DatePicker txtCreateDate;
-
-        /// <summary>
-        /// txtPlace 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtPlace;
-
-        /// <summary>
-        /// txtPersonNum 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.NumberBox txtPersonNum;
-
-        /// <summary>
-        /// GroupPanel2 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.GroupPanel GroupPanel2;
-
-        /// <summary>
-        /// Form5 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Form Form5;
-
-        /// <summary>
-        /// txtTotalAssets 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.NumberBox txtTotalAssets;
-
-        /// <summary>
-        /// txtTotalValue 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.NumberBox txtTotalValue;
-
-        /// <summary>
-        /// txtNewInvestment 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.NumberBox txtNewInvestment;
-
-        /// <summary>
-        /// Form6 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.Form Form6;
-
-        /// <summary>
-        /// txtRemark 鎺т欢銆�
-        /// </summary>
-        /// <remarks>
-        /// 鑷姩鐢熸垚鐨勫瓧娈点��
-        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtRemark;
-
         /// <summary>
         /// Form11 鎺т欢銆�
         /// </summary>
@@ -257,6 +122,123 @@ namespace FineUIPro.Web.ZHGL.Environmental
         /// </remarks>
         protected global::FineUIPro.DatePicker txtFillingDate;
 
+        /// <summary>
+        /// Form6 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form Form6;
+
+        /// <summary>
+        /// txtRemark 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemark;
+
+        /// <summary>
+        /// Form4 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form Form4;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// TextBox1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox1;
+
+        /// <summary>
+        /// TextBox2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+
+        /// <summary>
+        /// TextBox3 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox3;
+
+        /// <summary>
+        /// DatePicker1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DatePicker DatePicker1;
+
+        /// <summary>
+        /// TextBox4 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox4;
+
+        /// <summary>
+        /// txtPersonNum 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtPersonNum;
+
+        /// <summary>
+        /// txtTotalAssets 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtTotalAssets;
+
+        /// <summary>
+        /// NumberBox1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox1;
+
+        /// <summary>
+        /// NumberBox2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.NumberBox NumberBox2;
+
         /// <summary>
         /// Toolbar2 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx
new file mode 100644
index 00000000..6e2464f6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx
@@ -0,0 +1,159 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionWorkLedger.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Information.ActionWorkLedger" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style>
+        .f-grid-row-summary .f-grid-cell-inner {
+            font-weight: bold;
+            color: red;
+        }
+
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" />
+        <f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
+            <Regions>
+                <f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
+                    BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server" Title="">
+                    <Items>
+                        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="true" AutoScroll="true" BodyPadding="10px"
+                            runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="350px"
+                                            LabelWidth="70px" Label="鍗曚綅" EnableEdit="true" ForceSelection="false" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpYear" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="150px"
+                                            LabelWidth="50px" Label="骞村害" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpQuarter" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="150px"
+                                            LabelWidth="50px" Label="瀛ｅ害" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:Button ID="BtnBulletLeft" ToolTip="鍓嶄竴瀛ｅ害" Icon="BulletLeft" runat="server" EnablePostBack="true"
+                                            OnClick="BtnBulletLeft_Click">
+                                        </f:Button>
+                                        <f:Button ID="BtnBulletRight" ToolTip="鍚庝竴瀛ｅ害" Icon="BulletRight" runat="server" EnablePostBack="true"
+                                            OnClick="BulletRight_Click">
+                                        </f:Button>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSee" ToolTip="鏌ョ湅瀹℃壒娴佺▼" Icon="Find" runat="server" OnClick="btnSee_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="鏂板" Hidden="true" Icon="Add" runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnGet" ToolTip="鑾峰彇" Icon="Add" Hidden="true" runat="server"
+                                            OnClick="btnGet_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnEdit" ToolTip="缂栬緫" Hidden="true" Icon="Pencil" runat="server" OnClick="btnEdit_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnDelete" ToolTip="鍒犻櫎" Hidden="true" Icon="Delete" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
+                                            OnClick="btnDelete_Click" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnAudit1" ToolTip="瀹℃牳" Icon="Pencil" Hidden="true" runat="server" OnClick="btnAudit1_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnAudit2" ToolTip="瀹℃壒" Icon="Pencil" Hidden="true" runat="server" OnClick="btnAudit2_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnUpdata" ToolTip="涓婃姤" Icon="PageSave" Hidden="true" runat="server" OnClick="btnUpdata_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                        <%--<f:Button ID="btnPrint" ToolTip="鎵撳嵃" Icon="Printer" Hidden="true" runat="server"
+                                            OnClick="btnPrint_Click">
+                                        </f:Button>--%>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Rows>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:Label ID="txtUnitName" runat="server" Hidden="true">
+                                        </f:Label>
+                                        <f:Label ID="txtQuarter" runat="server">
+                                        </f:Label>
+                                        <f:Label ID="txtCompileDate" runat="server">
+                                        </f:Label>
+                                        <f:Label ID="lbHandleMan" runat="server">
+                                        </f:Label>
+                                    </Items>
+                                </f:FormRow>
+                            </Rows>
+                        </f:Form>
+                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="ActionWorkLedgerItemId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="ActionWorkLedgerItemId"
+                            AllowSorting="true" SortField="SortIndex" SortDirection="ASC" OnSort="Grid1_Sort"
+                            AllowPaging="false" PageSize="1000" OnPageIndexChange="Grid1_PageIndexChange"
+                            AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableColumnLines="true">
+                            <Columns>
+                                <f:RenderField Width="55px" ColumnID="SortIndex" DataField="SortIndex" FieldType="String"
+                                    HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Focus" DataField="Focus" FieldType="String"
+                                    HeaderText="閲嶇偣宸ヤ綔" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SpecialTask" DataField="SpecialTask"
+                                    FieldType="String" HeaderText="涓撻」浠诲姟" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="WorkPoints" DataField="WorkPoints"
+                                    FieldType="String" HeaderText="宸ヤ綔瑕佺偣" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="350px" ColumnID="FillingRequirements" DataField="FillingRequirements"
+                                    FieldType="String" HeaderText="濉姤瑕佹眰" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompletionDeadline" DataField="CompletionDeadline"
+                                    FieldType="String" HeaderText="瀹屾垚鏈熼檺" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="ImplementationStatus" DataField="ImplementationStatus" ExpandUnusedSpace="true"
+                                    FieldType="String" HeaderText="钀藉疄鎯呭喌" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                            <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                        </Listeners>
+                        </f:Grid>
+                    </Items>
+                </f:Region>
+            </Regions>
+        </f:RegionPanel>
+        <f:Window ID="Window1" Title="缂栬緫瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="false"
+            CloseAction="HidePostBack" Width="1300px" Height="540px">
+        </f:Window>
+        <f:Window ID="Window2" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window2_Close"
+            Title="瀵煎叆瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处" CloseAction="HidePostBack" EnableIFrame="true" Height="600px"
+            Width="900px">
+        </f:Window>
+        <f:Window ID="Window3" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true"
+            Title="鎵撳嵃瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处" CloseAction="HidePostBack" EnableIFrame="true" Height="768px"
+            Width="1024px">
+        </f:Window>
+        <f:Window ID="Window4" Title="鏌ョ湅瀹℃牳淇℃伅" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="true" runat="server" IsModal="true" OnClose="Window4_Close"
+            Width="1024px" Height="500px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        function onGridDataLoad(event) {
+            this.mergeColumns(['Focus','SpecialTask'], {
+                depends: true
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs
new file mode 100644
index 00000000..965e7d1f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.cs
@@ -0,0 +1,619 @@
+锘縰sing BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.ZHGL.Information
+{
+    public partial class ActionWorkLedger : PageBase
+    {
+        #region 瀹氫箟鍙橀噺
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        public string ActionWorkLedgerId
+        {
+            get
+            {
+                return (string)ViewState["ActionWorkLedgerId"];
+            }
+            set
+            {
+                ViewState["ActionWorkLedgerId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 瀹氫箟闆嗗悎
+        /// </summary>
+        private static List<Model.Information_ActionWorkLedgerItem> ActionWorkLedgerItems = new List<Model.Information_ActionWorkLedgerItem>();
+        #endregion
+
+        #region 鍔犺浇椤甸潰
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BLL.ConstValue.InitConstValueDropDownList(this.drpQuarter, ConstValue.Group_0011, false);
+                BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false);
+                this.drpUnit.DataTextField = "UnitName";
+                drpUnit.DataValueField = "UnitId";
+                drpUnit.DataSource = BLL.UnitService.GetThisUnitDropDownList();
+                drpUnit.DataBind();
+                this.drpUnit.Readonly = true;
+                DateTime showDate = System.DateTime.Now.AddMonths(-3);
+                this.drpQuarter.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString();
+                this.drpYear.SelectedValue = showDate.Year.ToString();
+                GetValue();
+            }
+        }
+        #endregion
+
+        #region 娓呯┖鏂囨湰妗�
+        private void SetEmpty()
+        {
+            this.SimpleForm1.Title = string.Empty;
+            txtUnitName.Text = string.Empty;
+            txtQuarter.Text = string.Empty;
+            txtCompileDate.Text = string.Empty;
+            this.lbHandleMan.Text = string.Empty;
+            Grid1.DataSource = null;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 鑾峰彇璁板綍鍊�
+        private void GetValue()
+        {
+            int year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
+            int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
+            this.ActionWorkLedgerId = string.Empty;
+            Model.View_Information_ActionWorkLedger report = Funs.DB.View_Information_ActionWorkLedger.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Quarter == quarter && e.YearId == year);
+            if (report != null)
+            {
+                string state = string.Empty;
+                if (report.UpState == BLL.Const.UpState_3)
+                {
+                    state = "(宸蹭笂鎶�)";
+                }
+                else
+                {
+                    if (report.HandleState == BLL.Const.HandleState_1)
+                    {
+                        state = "(寰呮彁浜�)";
+                    }
+                    else if (report.HandleState == BLL.Const.HandleState_2)
+                    {
+                        state = "(寰呭鏍�)";
+                    }
+                    else if (report.HandleState == BLL.Const.HandleState_3)
+                    {
+                        state = "(寰呭鎵�)";
+                    }
+                    else if (report.HandleState == BLL.Const.HandleState_4)
+                    {
+                        state = "(寰呬笂鎶�)";
+                    }
+                }
+                this.SimpleForm1.Title = "瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处" + state;
+                this.ActionWorkLedgerId = report.ActionWorkLedgerId;
+                txtUnitName.Text = "鍗曚綅锛�" + report.UnitName;
+                txtQuarter.Text = "瀛ｅ害锛�" + report.Quarters;
+                if (report.HandleState == BLL.Const.HandleState_1 || report.UpState == BLL.Const.UpState_3)
+                {
+                    this.lbHandleMan.Hidden = true;
+                }
+                else
+                {
+                    this.lbHandleMan.Hidden = false;
+                    this.lbHandleMan.Text = "涓嬩竴姝ュ姙鐞嗕汉锛�" + report.UserName;
+                }
+                if (report.ReportDate != null)
+                {
+                    txtCompileDate.Text = "鍒惰〃鏃堕棿锛�" + string.Format("{0:yyyy-MM-dd}", report.ReportDate);
+                }
+                BindGrid1();
+            }
+            else
+            {
+                SetEmpty();
+            }
+            this.GetButtonPower();
+        }
+        #endregion
+
+        #region 鍔犺浇Grid
+        private void BindGrid1()
+        {
+            string strSql = "select * from dbo.Information_ActionWorkLedgerItem where ActionWorkLedgerId = @ActionWorkLedgerId order by SortIndex";
+            SqlParameter[] parameter = new SqlParameter[]
+                    {
+                        new SqlParameter("@ActionWorkLedgerId",this.ActionWorkLedgerId),
+                    };
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 澧炲姞銆佷慨鏀广�佸垹闄ゃ�佸鏍搞�佸鎵广�佷笂鎶ユ寜閽簨浠�
+        /// <summary>
+        /// Tree澧炲姞鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionWorkLedgerAdd.aspx?UnitId={0}&&Year={1}&&Quarter={2}", this.CurrUser.UnitId, this.drpYear.SelectedValue, this.drpQuarter.SelectedValue, "缂栬緫 - ")));
+        }
+
+        /// <summary>
+        /// 鏄剧ず缂栬緫椤甸潰
+        /// </summary>
+        private void ShowEdit()
+        {
+            Model.Information_ActionWorkLedger report = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report == null)
+            {
+                Alert.ShowInTop("鎵�閫夋椂闂存棤鎶ヨ〃璁板綍锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ActionWorkLedgerAdd.aspx?ActionWorkLedgerId={0}", report.ActionWorkLedgerId, "缂栬緫 - ")));
+        }
+
+        /// <summary>
+        /// Tree缂栬緫鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// 瀹℃牳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit1_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// 瀹℃壒
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit2_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// 涓婃姤
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUpdata_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// Tree鍒犻櫎鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            Model.Information_ActionWorkLedger report = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report != null)
+            {
+                BLL.LogService.AddSys_Log(this.CurrUser, report.YearId.ToString() + "-" + report.Quarter.ToString(),
+                        report.ActionWorkLedgerId, BLL.Const.ActionWorkLedgerMenuId, BLL.Const.BtnDelete);
+                BLL.ProjectDataFlowSetService.DeleteFlowSetByDataId(report.ActionWorkLedgerId);
+                BLL.ActionWorkLedgerItemService.DeleteActionWorkLedgerItemList(report.ActionWorkLedgerId);
+                BLL.ActionWorkLedgerService.DeleteActionWorkLedgerById(report.ActionWorkLedgerId);
+
+                SetEmpty();
+                //this.btnNew.Hidden = false;
+                ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+            }
+            else
+            {
+                ShowNotify("鎵�閫夋椂闂存棤鎶ヨ〃璁板綍锛�", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 杩囨护銆佸垎椤点�佹帓搴忋�佸叧闂獥鍙�
+        /// <summary>
+        /// 琛ㄥご杩囨护
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 鍒嗛〉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// Grid1鎺掑簭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 鍒嗛〉鍒楄〃鏄剧ず鏉℃暟涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// 鍏抽棴Grid1寮瑰嚭绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            GetValue();
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActionWorkLedgerMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    //this.btnNew.Hidden = false;
+                    this.btnGet.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnDelete.Hidden = false;
+                }
+                //if (buttonList.Contains(BLL.Const.BtnPrint))
+                //{
+                //    this.btnPrint.Hidden = false;
+                //}
+                int year = Funs.GetNewIntOrZero(this.drpYear.SelectedValue);
+                int quarter = Funs.GetNewIntOrZero(this.drpQuarter.SelectedValue);
+                var report = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdAndYearAndQuarters(this.drpUnit.SelectedValue, year, quarter);
+                this.btnAudit1.Hidden = true;
+                this.btnAudit2.Hidden = true;
+                this.btnUpdata.Hidden = true;
+                if (report != null)
+                {
+                    this.btnNew.Hidden = true;
+                    if (report.HandleMan == this.CurrUser.UserId)   //褰撳墠浜烘槸涓嬩竴姝ュ姙鐞嗗叆
+                    {
+                        if (report.HandleState == BLL.Const.HandleState_2)
+                        {
+                            this.btnAudit1.Hidden = false;
+                        }
+                        else if (report.HandleState == BLL.Const.HandleState_3)
+                        {
+                            this.btnAudit2.Hidden = false;
+                        }
+                        else if (report.HandleState == BLL.Const.HandleState_4)
+                        {
+                            this.btnDelete.Hidden = true;
+                            this.btnUpdata.Hidden = false;
+                        }
+                    }
+                    if (report.UpState == BLL.Const.UpState_3)
+                    {
+                        this.btnUpdata.Hidden = true;
+                        this.btnEdit.Hidden = true;
+                        this.btnDelete.Hidden = true;
+                    }
+                    if (report.HandleMan == this.CurrUser.UserId || report.CompileMan == this.CurrUser.UserName)
+                    {
+                        this.btnEdit.Hidden = false;
+                    }
+                    else
+                    {
+                        this.btnEdit.Hidden = true;
+                    }
+                }
+            }
+
+            if (this.CurrUser.UserId == BLL.Const.sysglyId)
+            {
+                this.btnDelete.Hidden = false;
+            }
+        }
+        #endregion
+
+        #region 鍗曚綅涓嬫媺妗嗚仈鍔ㄤ簨浠�
+        /// <summary>
+        /// 鍗曚綅涓嬫媺妗嗚仈鍔ㄤ簨浠�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GetValue();
+        }
+        #endregion
+
+        #region 鑾峰彇
+        /// <summary>
+        /// 鑾峰彇鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnGet_Click(object sender, EventArgs e)
+        {
+            Model.Information_ActionWorkLedger report = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report == null)
+            {
+                var returnValue = getActionWorkLedgerToSUB();
+                if (returnValue.code == 1)
+                {
+                    ShowNotify(returnValue.message, MessageBoxIcon.Success);
+                    GetValue();
+                }
+                else
+                {
+                    Alert.ShowInTop(returnValue.message, MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("璇ュ搴﹁褰曞凡瀛樺湪锛屾棤闇�鑾峰彇锛�", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        ///  鑾峰彇
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public Model.ResponeData getActionWorkLedgerToSUB()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                string unitId = CommonService.GetThisUnitId();
+                string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getActionWorkLedger?year=" + this.drpYear.SelectedValue + "&quarter=" + this.drpQuarter.SelectedValue;
+                string contenttype = "application/json;charset=unicode";
+                Hashtable newToken = new Hashtable
+                {
+                    { "token", ServerService.GetToken().Token }
+                };
+
+                var strJosn = APIGetHttpService.Http(baseurl, "GET", contenttype, newToken, null);
+                if (!string.IsNullOrEmpty(strJosn))
+                {
+                    JObject obj = JObject.Parse(strJosn);
+                    responeData.code = Funs.GetNewIntOrZero(obj["code"].ToString());
+                    responeData.message = obj["message"].ToString();
+                    if (responeData.code == 1)
+                    {
+                        JArray getData = JArray.Parse(obj["data"].ToString());
+                        if (getData.Count() > 0)
+                        {
+                            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                            {
+                                int i = 0;
+                                string actionWorkLedgerId = SQLHelper.GetNewID();
+                                foreach (var item in getData)
+                                {
+                                    if (i == 0)
+                                    {
+                                        Model.Information_ActionWorkLedger actionWorkLedger = new Model.Information_ActionWorkLedger();
+                                        actionWorkLedger.ActionWorkLedgerId = actionWorkLedgerId;
+                                        actionWorkLedger.UnitId = BLL.CommonService.GetThisUnitId();
+                                        actionWorkLedger.ReportDate = DateTime.Now;
+                                        actionWorkLedger.Quarter = Funs.GetNewInt(this.drpQuarter.SelectedValue);
+                                        actionWorkLedger.YearId = Funs.GetNewInt(this.drpYear.SelectedValue);
+                                        actionWorkLedger.CompileMan = this.CurrUser.UserName;
+                                        actionWorkLedger.UpState = BLL.Const.UpState_2;
+                                        actionWorkLedger.HandleState = BLL.Const.HandleState_1;
+                                        actionWorkLedger.HandleMan = this.CurrUser.UserId;
+                                        BLL.ActionWorkLedgerService.AddActionWorkLedger(actionWorkLedger);
+                                    }
+                                    Model.Information_ActionWorkLedgerItem newItem = new Model.Information_ActionWorkLedgerItem();
+                                    newItem.ActionWorkLedgerItemId = SQLHelper.GetNewID();
+                                    newItem.ActionWorkLedgerId = actionWorkLedgerId;
+                                    newItem.SortIndex = Funs.GetNewInt(item["SortIndex"].ToString());
+                                    newItem.Focus = item["Focus"].ToString();
+                                    newItem.SpecialTask = item["SpecialTask"].ToString();
+                                    newItem.WorkPoints = item["WorkPoints"].ToString();
+                                    newItem.FillingRequirements = item["FillingRequirements"].ToString();
+                                    newItem.CompletionDeadline = item["CompletionDeadline"].ToString();
+                                    BLL.ActionWorkLedgerItemService.AddActionWorkLedgerItem(newItem);
+                                    i++;
+                                }
+                            }
+                            responeData.message = "鑾峰彇鎴愬姛!";
+                        }
+                        else
+                        {
+                            responeData.code = 0;
+                            responeData.message = "闆嗗洟璁板綍灏氭湭鐢熸垚!";
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = "鑾峰彇澶辫触锛�" + ex.Message;
+                ErrLogInfo.WriteLog("瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处鑾峰彇锛�", ex);
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鍏抽棴瀵煎叆寮瑰嚭绐楀彛
+        /// <summary>
+        /// 鍏抽棴瀵煎叆寮瑰嚭绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window2_Close(object sender, WindowCloseEventArgs e)
+        {
+            GetValue();
+        }
+
+        /// <summary>
+        /// 鍏抽棴鏌ョ湅瀹℃壒淇℃伅寮瑰嚭绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window4_Close(object sender, WindowCloseEventArgs e)
+        {
+
+        }
+        #endregion
+
+        #region 鎵撳嵃
+        /// <summary>
+        /// 鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPrint_Click(object sender, EventArgs e)
+        {
+            //Model.Information_ActionWorkLedger report = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            //if (report != null)
+            //{
+            //    PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?reportId={0}&&replaceParameter={1}&&varValue={2}", Const.Information_ActionWorkLedgerId, report.ActionWorkLedgerId, "", "鎵撳嵃 - ")));
+            //}
+        }
+        #endregion
+
+        #region 瀛ｅ害鍚戝墠/鍚戝悗
+        /// <summary>
+        /// 鍓嶄竴瀛ｅ害
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnBulletLeft_Click(object sender, EventArgs e)
+        {
+            SetMonthChange("-");
+        }
+
+        /// <summary>
+        /// 鍚庝竴瀛ｅ害
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BulletRight_Click(object sender, EventArgs e)
+        {
+            SetMonthChange("+");
+        }
+
+        /// <summary>
+        /// 瀛ｅ害鍔犲噺鍙樺寲
+        /// </summary>
+        /// <param name="type"></param>
+        private void SetMonthChange(string type)
+        {
+            DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + (Funs.GetNewIntOrZero(this.drpQuarter.SelectedValue) * 3).ToString());
+            if (nowDate.HasValue)
+            {
+                DateTime showDate = new DateTime();
+                if (type == "+")
+                {
+                    showDate = nowDate.Value.AddMonths(3);
+                }
+                else
+                {
+                    showDate = nowDate.Value.AddMonths(-3);
+                }
+
+                this.drpYear.SelectedValue = showDate.Year.ToString();
+                this.drpQuarter.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString();
+                ///鍊煎彉鍖�
+                GetValue();
+            }
+        }
+        #endregion
+
+        #region 鏌ョ湅瀹℃壒淇℃伅
+        /// <summary>
+        /// 鏌ョ湅瀹℃壒淇℃伅
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSee_Click(object sender, EventArgs e)
+        {
+            Model.Information_ActionWorkLedger report = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report != null)
+            {
+                PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("ReportAuditSee.aspx?Id={0}", report.ActionWorkLedgerId, "鏌ョ湅 - ")));
+            }
+            else
+            {
+                ShowNotify("鎵�閫夋湀浠芥棤璁板綍锛�", MessageBoxIcon.Warning);
+            }
+        }
+        #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 = System.Text.Encoding.UTF8;
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.designer.cs
new file mode 100644
index 00000000..76d23bcb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedger.aspx.designer.cs
@@ -0,0 +1,276 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Information {
+    
+    
+    public partial class ActionWorkLedger {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// RegionPanel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.RegionPanel RegionPanel1;
+        
+        /// <summary>
+        /// Region2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Region Region2;
+        
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// drpUnit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+        
+        /// <summary>
+        /// drpYear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpYear;
+        
+        /// <summary>
+        /// drpQuarter 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpQuarter;
+        
+        /// <summary>
+        /// BtnBulletLeft 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button BtnBulletLeft;
+        
+        /// <summary>
+        /// BtnBulletRight 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button BtnBulletRight;
+        
+        /// <summary>
+        /// btnSee 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSee;
+        
+        /// <summary>
+        /// btnNew 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// btnGet 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnGet;
+        
+        /// <summary>
+        /// btnEdit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnEdit;
+        
+        /// <summary>
+        /// btnDelete 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+        
+        /// <summary>
+        /// btnAudit1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit1;
+        
+        /// <summary>
+        /// btnAudit2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit2;
+        
+        /// <summary>
+        /// btnUpdata 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnUpdata;
+        
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
+        /// <summary>
+        /// txtUnitName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label txtUnitName;
+        
+        /// <summary>
+        /// txtQuarter 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label txtQuarter;
+        
+        /// <summary>
+        /// txtCompileDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label txtCompileDate;
+        
+        /// <summary>
+        /// lbHandleMan 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label lbHandleMan;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// Window3 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+        
+        /// <summary>
+        /// Window4 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx
new file mode 100644
index 00000000..2e0c1ddb
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx
@@ -0,0 +1,108 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionWorkLedgerAdd.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Information.ActionWorkLedgerAdd" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>缂栬緫瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="ddlUnitId" runat="server" Label="鍗曚綅" Required="True" ShowRedStar="True">
+                        </f:DropDownList>
+                        <f:DropDownList ID="ddlYearId" runat="server" Label="骞村害" Required="True" ShowRedStar="True">
+                        </f:DropDownList>
+                        <f:DropDownList ID="ddlQuarter" runat="server" Label="瀛ｅ害" Required="True" ShowRedStar="True">
+                        </f:DropDownList>
+                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="鍒惰〃鏃堕棿" ID="dpkCompileDate"
+                            Required="True" ShowRedStar="True">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
+                            BoxFlex="1" DataKeyNames="ActionWorkLedgerItemId" AllowCellEditing="true"
+                            ClicksToEdit="1" DataIDField="ActionWorkLedgerItemId" EnableColumnLines="true"
+                            OnRowCommand="Grid1_RowCommand" EnableHeaderMenu="false" Width="1200px" Height="360px">
+                            <Columns>
+                                <f:RenderField Width="55px" ColumnID="SortIndex" DataField="SortIndex" FieldType="String"
+                                    HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Focus" DataField="Focus" FieldType="String"
+                                    HeaderText="閲嶇偣宸ヤ綔" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="SpecialTask" DataField="SpecialTask"
+                                    FieldType="String" HeaderText="涓撻」浠诲姟" HeaderTextAlign="Center"
+                                    TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="WorkPoints" DataField="WorkPoints"
+                                    FieldType="String" HeaderText="宸ヤ綔瑕佺偣" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="350px" ColumnID="FillingRequirements" DataField="FillingRequirements"
+                                    FieldType="String" HeaderText="濉姤瑕佹眰" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompletionDeadline" DataField="CompletionDeadline"
+                                    FieldType="String" HeaderText="瀹屾垚鏈熼檺" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="ImplementationStatus" DataField="ImplementationStatus" ExpandUnusedSpace="true"
+                                    FieldType="String" HeaderText="钀藉疄鎯呭喌" HeaderTextAlign="Center" TextAlign="Left">
+                                    <Editor>
+                                        <f:TextArea ID="txtImplementationStatus" Text='<%# Eval("ImplementationStatus")%>' runat="server" AutoGrowHeight="true">
+                                        </f:TextArea>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="55px" ColumnID="ActionWorkLedgerItemId" DataField="ActionWorkLedgerItemId" FieldType="String"
+                                    HeaderText="涓婚敭" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                            <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                        </Listeners>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnCopy" Icon="Database" runat="server" ToolTip="澶嶅埗涓婂搴︽暟鎹�" ValidateForms="SimpleForm1"
+                            OnClick="btnCopy_Click" Hidden="true" MarginLeft="10px">
+                        </f:Button>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Hidden="true"
+                            ValidateForms="SimpleForm1" OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Hidden="true" ToolTip="鎻愪氦"
+                            ValidateForms="SimpleForm1" OnClick="btnSubmit_Click">
+                        </f:Button>
+                        <f:Button ID="btnUpdata" Icon="PageSave" runat="server" Hidden="true" ConfirmText="纭畾涓婃姤锛�"
+                            ToolTip="涓婃姤" ValidateForms="SimpleForm1" OnClick="btnUpdata_Click" MarginRight="10px">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+            Title="鍔炵悊娴佺▼" CloseAction="HidePostBack" EnableIFrame="true" Height="520px" Width="800px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        function onGridDataLoad(event) {
+            this.mergeColumns(['Focus','SpecialTask'], {
+                depends: true
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.cs
new file mode 100644
index 00000000..ecddad4c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.cs
@@ -0,0 +1,534 @@
+锘縰sing BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.ZHGL.Information
+{
+    public partial class ActionWorkLedgerAdd : PageBase
+    {
+        #region 瀹氫箟鍙橀噺
+        public string ActionWorkLedgerId
+        {
+            get
+            {
+                return (string)ViewState["ActionWorkLedgerId"];
+            }
+            set
+            {
+                ViewState["ActionWorkLedgerId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 瀹氫箟闆嗗悎
+        /// </summary>
+        private static List<Model.Information_ActionWorkLedgerItem> items = new List<Model.Information_ActionWorkLedgerItem>();
+        #endregion
+
+        #region 鍔犺浇椤甸潰
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.GetButtonPower();
+                items.Clear();
+                this.ddlUnitId.DataTextField = "UnitName";
+                this.ddlUnitId.DataValueField = "UnitId";
+                this.ddlUnitId.DataSource = BLL.UnitService.GetThisUnitDropDownList();
+                this.ddlUnitId.DataBind();
+
+                this.ddlYearId.DataTextField = "ConstText";
+                ddlYearId.DataValueField = "ConstValue";
+                ddlYearId.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_0008);
+                ddlYearId.DataBind();
+
+                this.ddlQuarter.DataTextField = "ConstText";
+                ddlQuarter.DataValueField = "ConstValue";
+                ddlQuarter.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_0011);
+                ddlQuarter.DataBind();
+                this.ddlUnitId.Readonly = true;
+                string unitId = Request.Params["UnitId"];
+                string year = Request.QueryString["Year"];
+                string quarter = Request.QueryString["Quarter"];
+                this.ActionWorkLedgerId = Request.Params["ActionWorkLedgerId"];
+                if (!string.IsNullOrEmpty(this.ActionWorkLedgerId))
+                {
+                    items = BLL.ActionWorkLedgerItemService.GetActionWorkLedgerItemList(this.ActionWorkLedgerId);
+                    this.Grid1.DataSource = items;
+                    this.Grid1.DataBind();
+
+                    var ActionWorkLedger = BLL.ActionWorkLedgerService.GetActionWorkLedgerById(this.ActionWorkLedgerId);
+                    if (ActionWorkLedger != null)
+                    {
+                        this.btnCopy.Hidden = true;
+                        this.btnSave.Hidden = true;
+                        this.btnSubmit.Hidden = true;
+                        if (ActionWorkLedger.HandleState == BLL.Const.HandleState_4)
+                        {
+                            this.btnUpdata.Hidden = false;
+                        }
+                        else
+                        {
+                            if (ActionWorkLedger.HandleMan == this.CurrUser.UserId)
+                            {
+                                this.btnSave.Hidden = false;
+                                this.btnSubmit.Hidden = false;
+                            }
+                        }
+                        if (ActionWorkLedger.UpState == BLL.Const.UpState_3)  //宸蹭笂鎶�
+                        {
+                            this.btnSave.Hidden = true;
+                            this.btnUpdata.Hidden = true;
+                        }
+                        if (!string.IsNullOrEmpty(ActionWorkLedger.UnitId))
+                        {
+                            this.ddlUnitId.SelectedValue = ActionWorkLedger.UnitId;
+                        }
+                        if (ActionWorkLedger.YearId.HasValue)
+                        {
+                            this.ddlYearId.SelectedValue = ActionWorkLedger.YearId.ToString();
+                        }
+                        if (ActionWorkLedger.Quarter.HasValue)
+                        {
+                            this.ddlQuarter.SelectedValue = ActionWorkLedger.Quarter.ToString();
+                        }
+                        if (ActionWorkLedger.ReportDate != null)
+                        {
+                            this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", ActionWorkLedger.ReportDate);
+                        }
+                    }
+                }
+                else
+                {
+                    //this.btnCopy.Hidden = false;
+                    this.ddlUnitId.SelectedValue = unitId;
+                    this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                    this.ddlYearId.SelectedValue = year;
+                    this.ddlQuarter.SelectedValue = quarter;
+                    ////鑾峰彇椤圭洰鎶ュ憡闆嗗悎
+                    //List<Model.InformationProject_ActionWorkLedgerItem> projectItems = (from x in Funs.DB.InformationProject_ActionWorkLedger
+                    //                                                                                 join y in Funs.DB.InformationProject_ActionWorkLedgerItem
+                    //                                                                                 on x.ActionWorkLedgerId equals y.ActionWorkLedgerId
+                    //                                                                                 where x.YearId.ToString() == year && x.Quarter.ToString() == quarter && x.States == BLL.Const.State_2
+                    //                                                                                 select y).Distinct().ToList();
+                    //if (projectItems.Count > 0)
+                    //{
+                    //    int i = 0;
+                    //    foreach (var projectItem in projectItems)
+                    //    {
+                    //        i += 10;
+                    //        Model.Information_ActionWorkLedgerItem item = new Model.Information_ActionWorkLedgerItem
+                    //        {
+                    //            ActionWorkLedgerItemId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedgerItem)),
+                    //            SortIndex = i
+                    //        };
+                    //        Model.Base_Project project = (from x in Funs.DB.Base_Project
+                    //                                      join y in Funs.DB.InformationProject_ActionWorkLedger
+                    //                                      on x.ProjectId equals y.ProjectId
+                    //                                      join z in Funs.DB.InformationProject_ActionWorkLedgerItem
+                    //                                      on y.ActionWorkLedgerId equals z.ActionWorkLedgerId
+                    //                                      where z.ActionWorkLedgerItemId == projectItem.ActionWorkLedgerItemId
+                    //                                      select x).FirstOrDefault();
+                    //        if (project != null)
+                    //        {
+                    //            item.IndustryType = project.ProjectName;
+                    //        }
+                    //        item.TotalConductCount = projectItem.TotalConductCount;
+                    //        item.TotalPeopleCount = projectItem.TotalPeopleCount;
+                    //        item.TotalInvestment = projectItem.TotalInvestment;
+                    //        item.HQConductCount = projectItem.HQConductCount;
+                    //        item.HQPeopleCount = projectItem.HQPeopleCount;
+                    //        item.HQInvestment = projectItem.HQInvestment;
+                    //        item.BasicConductCount = projectItem.BasicConductCount;
+                    //        item.BasicPeopleCount = projectItem.BasicPeopleCount;
+                    //        item.BasicInvestment = projectItem.BasicInvestment;
+                    //        item.ComprehensivePractice = projectItem.ComprehensivePractice;
+                    //        item.CPScene = projectItem.CPScene;
+                    //        item.CPDesktop = projectItem.CPDesktop;
+                    //        item.SpecialDrill = projectItem.SpecialDrill;
+                    //        item.SDScene = projectItem.SDScene;
+                    //        item.SDDesktop = projectItem.SDDesktop;
+                    //        items.Add(item);
+                    //    }
+                    //}
+                    //else
+                    //{
+                    //    for (int i = 0; i < 100; i++)
+                    //    {
+                    //        i += 10;
+                    //        Model.Information_ActionWorkLedgerItem newItem = new Model.Information_ActionWorkLedgerItem
+                    //        {
+                    //            ActionWorkLedgerItemId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedgerItem)),
+                    //            SortIndex = i
+                    //        };
+                    //        items.Add(newItem);
+                    //    }
+                    //}
+                    Grid1.DataSource = items;
+                    Grid1.DataBind();
+
+
+                }
+            }
+        }
+
+        #endregion
+
+        #region 淇濆瓨銆佹彁浜ゃ�佷笂鎶�
+        /// <summary>
+        /// 淇濆瓨鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Save("add");
+        }
+
+        /// <summary>
+        /// 涓婃姤鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUpdata_Click(object sender, EventArgs e)
+        {
+            Save("updata");
+        }
+
+        /// <summary>
+        /// 鎻愪氦鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            Save("submit");
+        }
+
+        /// <summary>
+        /// 淇濆瓨鏁版嵁
+        /// </summary>
+        /// <param name="type"></param>
+        private void Save(string type)
+        {
+            if (this.ddlUnitId.SelectedValue == BLL.Const._Null)
+            {
+                ShowNotify("璇烽�夋嫨鍗曚綅锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            var drill = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdDate(this.ddlUnitId.SelectedValue, Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue), Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue), this.ActionWorkLedgerId);
+            if (drill != null)
+            {
+                ShowNotify("鏈崟浣嶆湰瀛ｅ害鎶ヨ〃宸插瓨鍦紝涓嶈兘閲嶅缂栧埗", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var ActionWorkLedger = new Model.Information_ActionWorkLedger();
+            if (this.ddlUnitId.SelectedValue != BLL.Const._Null)
+            {
+                ActionWorkLedger.UnitId = this.ddlUnitId.SelectedValue;
+            }
+            if (!string.IsNullOrEmpty(this.dpkCompileDate.Text.Trim()))
+            {
+                ActionWorkLedger.ReportDate = Convert.ToDateTime(this.dpkCompileDate.Text.Trim());
+            }
+            ActionWorkLedger.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
+            ActionWorkLedger.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
+            if (string.IsNullOrEmpty(this.ActionWorkLedgerId))
+            {
+                this.ActionWorkLedgerId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedger)); ActionWorkLedger.ActionWorkLedgerId = this.ActionWorkLedgerId;
+                ActionWorkLedger.CompileMan = this.CurrUser.UserName;
+                ActionWorkLedger.UpState = BLL.Const.UpState_2;
+                ActionWorkLedger.HandleMan = this.CurrUser.UserId;
+                ActionWorkLedger.HandleState = BLL.Const.HandleState_1;
+                BLL.ActionWorkLedgerService.AddActionWorkLedger(ActionWorkLedger);
+                BLL.LogService.AddSys_Log(this.CurrUser, ActionWorkLedger.YearId.ToString() + "-" + ActionWorkLedger.Quarter.ToString(),
+                        ActionWorkLedger.ActionWorkLedgerId, BLL.Const.ActionWorkLedgerMenuId, BLL.Const.BtnAdd);
+            }
+            else
+            {
+                Model.Information_ActionWorkLedger oldReport = BLL.ActionWorkLedgerService.GetActionWorkLedgerById(this.ActionWorkLedgerId);
+                if (oldReport != null)
+                {
+                    ActionWorkLedger.HandleMan = oldReport.HandleMan;
+                    ActionWorkLedger.HandleState = oldReport.HandleState;
+                }
+                ActionWorkLedger.ActionWorkLedgerId = this.ActionWorkLedgerId;
+                ActionWorkLedger.UpState = BLL.Const.UpState_2;
+                BLL.ActionWorkLedgerService.UpdateActionWorkLedger(ActionWorkLedger);
+                BLL.LogService.AddSys_Log(this.CurrUser, ActionWorkLedger.YearId.ToString() + "-" + ActionWorkLedger.Quarter.ToString(),
+                        ActionWorkLedger.ActionWorkLedgerId, BLL.Const.ActionWorkLedgerMenuId, BLL.Const.BtnModify);
+                BLL.ActionWorkLedgerItemService.DeleteActionWorkLedgerItemList(ActionWorkLedger.ActionWorkLedgerId);
+            }
+            GetItems(ActionWorkLedger.ActionWorkLedgerId);
+            foreach (var item in items)
+            {
+                BLL.ActionWorkLedgerItemService.AddActionWorkLedgerItem(item);
+            }
+            if (type == "updata")     //淇濆瓨骞朵笂鎶�
+            {
+                if (ActionWorkLedger.UpState == BLL.Const.UpState_2)
+                {
+                    string code = CNCECHSSEWebService.UpActionWorkLedger(ActionWorkLedger.ActionWorkLedgerId, this.CurrUser);
+                    if (code == "1")
+                    {
+                        ShowNotify("鍚屾鎴愬姛锛�", MessageBoxIcon.Success);
+                        PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInParent("鍚屾寮傚父锛岃閫�鍑哄悗閲嶈瘯锛�", MessageBoxIcon.Error);
+                    }
+                }
+                else
+                {
+                    ShowNotify("褰撳墠鍗曟嵁鐘舵�佷笉鑳藉悓姝ワ紒", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            if (type == "submit")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReportSubmit.aspx?Type=ActionWorkLedger&Id={0}", ActionWorkLedger.ActionWorkLedgerId, "缂栬緫 - ")));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏄庣粏鍊�
+        /// </summary>
+        /// <param name="ActionWorkLedgerId"></param>
+        private void GetItems(string ActionWorkLedgerId)
+        {
+            items.Clear();
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                Model.Information_ActionWorkLedgerItem item = new Model.Information_ActionWorkLedgerItem();
+                if (values["ActionWorkLedgerItemId"].ToString() != "")
+                {
+                    item.ActionWorkLedgerItemId = values.Value<string>("ActionWorkLedgerItemId");
+                }
+                item.ActionWorkLedgerId = ActionWorkLedgerId;
+                item.SortIndex = Funs.GetNewInt(values.Value<string>("SortIndex"));
+                if (values["Focus"].ToString() != "")
+                {
+                    item.Focus = values.Value<string>("Focus");
+                }
+                if (values["SpecialTask"].ToString() != "")
+                {
+                    item.SpecialTask = values.Value<string>("SpecialTask");
+                }
+                if (values["WorkPoints"].ToString() != "")
+                {
+                    item.WorkPoints = values.Value<string>("WorkPoints");
+                }
+                if (values["FillingRequirements"].ToString() != "")
+                {
+                    item.FillingRequirements = values.Value<string>("FillingRequirements");
+                }
+                if (values["CompletionDeadline"].ToString() != "")
+                {
+                    item.CompletionDeadline = values.Value<string>("CompletionDeadline");
+                }
+                if (values["ImplementationStatus"].ToString() != "")
+                {
+                    item.ImplementationStatus = values.Value<string>("ImplementationStatus");
+                }
+                items.Add(item);
+            }
+        }
+        #endregion
+
+        #region 鍏抽棴鍔炵悊娴佺▼绐楀彛
+        /// <summary>
+        /// 鍏抽棴鍔炵悊娴佺▼绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            Model.Information_ActionWorkLedger report = BLL.ActionWorkLedgerService.GetActionWorkLedgerById(this.ActionWorkLedgerId);
+            if (report.HandleMan == this.CurrUser.UserId)
+            {
+                this.btnSave.Hidden = false;
+                this.btnSubmit.Hidden = false;
+            }
+            else
+            {
+                this.btnSave.Hidden = true;
+                this.btnSubmit.Hidden = true;
+            }
+        }
+        #endregion
+
+        #region Grid琛屼簨浠�
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            string rowID = Grid1.DataKeys[e.RowIndex][0].ToString();
+            GetItems(string.Empty);
+            if (e.CommandName == "Add")
+            {
+                Model.Information_ActionWorkLedgerItem oldItem = items.FirstOrDefault(x => x.ActionWorkLedgerItemId == rowID);
+                Model.Information_ActionWorkLedgerItem newItem = new Model.Information_ActionWorkLedgerItem
+                {
+                    ActionWorkLedgerItemId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedgerItem))
+                };
+                if (oldItem != null)
+                {
+                    newItem.SortIndex = oldItem.SortIndex + 1;
+                }
+                else
+                {
+                    newItem.SortIndex = 0;
+                }
+                items.Add(newItem);
+                items = items.OrderBy(x => x.SortIndex).ToList();
+                Grid1.DataSource = items;
+                Grid1.DataBind();
+            }
+            if (e.CommandName == "Delete")
+            {
+                if (Grid1.Rows.Count == 1)
+                {
+                    ShowNotify("鍙湁涓�鏉℃暟鎹紝鏃犳硶鍒犻櫎", MessageBoxIcon.Warning);
+                    return;
+                }
+                foreach (var item in items)
+                {
+                    if (item.ActionWorkLedgerItemId == rowID)
+                    {
+                        items.Remove(item);
+                        break;
+                    }
+                }
+                Grid1.DataSource = items;
+                Grid1.DataBind();
+                ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ActionWorkLedgerMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                    this.btnCopy.Hidden = false;
+                }
+                //if (buttonList.Contains(BLL.Const.BtnSaveUp))
+                //{
+                //    this.btnUpdata.Hidden = false;
+
+                //}
+                if (buttonList.Contains(BLL.Const.BtnSubmit))
+                {
+                    this.btnSubmit.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 澶嶅埗涓婁釜瀛ｅ害鏁版嵁
+        /// <summary>
+        /// 澶嶅埗涓婁釜瀛ｅ害鐨勬暟鎹�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnCopy_Click(object sender, EventArgs e)
+        {
+            int lastYear = 0, lastQuarter = 0;
+            int year = Convert.ToInt32(this.ddlYearId.SelectedValue);
+            int quarter = Convert.ToInt32(this.ddlQuarter.SelectedValue);
+            if (quarter == 1)
+            {
+                lastYear = year - 1;
+                lastQuarter = 4;
+            }
+            else
+            {
+                lastYear = year;
+                lastQuarter = quarter - 1;
+            }
+            Model.Information_ActionWorkLedger ActionWorkLedger = BLL.ActionWorkLedgerService.GetActionWorkLedgerByUnitIdAndYearAndQuarters(this.ddlUnitId.SelectedValue, lastYear, lastQuarter);
+            if (ActionWorkLedger != null)
+            {
+                Model.Information_ActionWorkLedger newActionWorkLedger = new Model.Information_ActionWorkLedger();
+                this.ActionWorkLedgerId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedger));
+                newActionWorkLedger.ActionWorkLedgerId = this.ActionWorkLedgerId;
+                newActionWorkLedger.UnitId = this.ddlUnitId.SelectedValue;
+                newActionWorkLedger.ReportDate = DateTime.Now;
+                newActionWorkLedger.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
+                newActionWorkLedger.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
+                newActionWorkLedger.CompileMan = this.CurrUser.UserName;
+                newActionWorkLedger.UpState = BLL.Const.UpState_2;
+                newActionWorkLedger.HandleState = BLL.Const.HandleState_1;
+                newActionWorkLedger.HandleMan = this.CurrUser.UserId;
+                BLL.ActionWorkLedgerService.AddActionWorkLedger(newActionWorkLedger);
+
+                items = BLL.ActionWorkLedgerItemService.GetActionWorkLedgerItemList(ActionWorkLedger.ActionWorkLedgerId);
+                if (items.Count > 0)
+                {
+                    foreach (var item in items)
+                    {
+                        Model.Information_ActionWorkLedgerItem newItem = new Model.Information_ActionWorkLedgerItem
+                        {
+                            ActionWorkLedgerItemId = SQLHelper.GetNewID(typeof(Model.Information_ActionWorkLedgerItem)),
+                            ActionWorkLedgerId = this.ActionWorkLedgerId,
+                            SortIndex = item.SortIndex
+                        };
+                        BLL.ActionWorkLedgerItemService.AddActionWorkLedgerItem(newItem);
+                    }
+                }
+                GetValues(newActionWorkLedger.ActionWorkLedgerId);
+            }
+
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏁版嵁
+        /// </summary>
+        private void GetValues(string ActionWorkLedgerId)
+        {
+            var report = BLL.ActionWorkLedgerService.GetActionWorkLedgerById(ActionWorkLedgerId);
+            if (report != null)
+            {
+                if (!string.IsNullOrEmpty(report.UnitId))
+                {
+                    this.ddlUnitId.SelectedValue = report.UnitId;
+                }
+                if (report.YearId.HasValue)
+                {
+                    this.ddlYearId.SelectedValue = report.YearId.ToString();
+                }
+                if (report.Quarter.HasValue)
+                {
+                    this.ddlQuarter.SelectedValue = report.Quarter.ToString();
+                }
+                if (report.ReportDate != null)
+                {
+                    this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", report.ReportDate);
+                }
+                items = BLL.ActionWorkLedgerItemService.GetActionWorkLedgerItemList(ActionWorkLedgerId);
+                this.Grid1.DataSource = items;
+                this.Grid1.DataBind();
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs
new file mode 100644
index 00000000..ffe225da
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/ActionWorkLedgerAdd.aspx.designer.cs
@@ -0,0 +1,150 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Information {
+    
+    
+    public partial class ActionWorkLedgerAdd {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// ddlUnitId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlUnitId;
+        
+        /// <summary>
+        /// ddlYearId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlYearId;
+        
+        /// <summary>
+        /// ddlQuarter 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlQuarter;
+        
+        /// <summary>
+        /// dpkCompileDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpkCompileDate;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// txtImplementationStatus 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtImplementationStatus;
+        
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// btnCopy 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnCopy;
+        
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// btnSubmit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSubmit;
+        
+        /// <summary>
+        /// btnUpdata 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnUpdata;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs
index c4559a86..873881e6 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs
@@ -59,7 +59,7 @@ namespace FineUIPro.Web.ZHGL.Information
         /// </summary>
         private void BindGrid()
         {
-            string unitId = BLL.Const.UnitId_CWCEC;
+            string unitId = Const.UnitId_CWCEC;
 
             string strSql = @"SELECT UserId,UserName,UserCode,role.RoleName"
                     + @" FROM Sys_User AS users"
@@ -205,6 +205,34 @@ namespace FineUIPro.Web.ZHGL.Information
                 //}
                 #endregion
 
+                #region 涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+                if (Type == "ActionWorkLedger")//涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处
+                {
+                    var report = BLL.ActionWorkLedgerService.GetActionWorkLedgerById(Id);
+                    if (report != null)
+                    {
+                        SetFlowData(Const.ActionWorkLedgerMenuId, this.Id, handleMan);
+                        report.HandleState = handleStates;
+                        report.HandleMan = handleMan;
+                        BLL.ActionWorkLedgerService.UpdateActionWorkLedger(report);
+                    }
+                }
+                #endregion
+
+                #region 涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+                if (Type == "SafetyProductionEvaluation")//涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处
+                {
+                    var report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationById(Id);
+                    if (report != null)
+                    {
+                        SetFlowData(Const.SafetyProductionEvaluationMenuId, this.Id, handleMan);
+                        report.HandleState = handleStates;
+                        report.HandleMan = handleMan;
+                        BLL.SafetyProductionEvaluationService.UpdateSafetyProductionEvaluation(report);
+                    }
+                }
+                #endregion
+
                 ShowNotify("鎻愪氦鎴愬姛锛�", MessageBoxIcon.Success);
                 PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx
new file mode 100644
index 00000000..a1af3485
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx
@@ -0,0 +1,163 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyProductionEvaluation.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Information.SafetyProductionEvaluation" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+    <style>
+        .f-grid-row-summary .f-grid-cell-inner {
+            font-weight: bold;
+            color: red;
+        }
+
+        .f-grid-row .f-grid-cell-inner {
+            white-space: normal;
+            word-break: break-all;
+        }
+    </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" />
+        <f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
+            <Regions>
+                <f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
+                    BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server" Title="">
+                    <Items>
+                        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="true" AutoScroll="true" BodyPadding="10px"
+                            runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                            <Toolbars>
+                                <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
+                                    <Items>
+                                        <f:DropDownList ID="drpUnit" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="350px"
+                                            LabelWidth="70px" Label="鍗曚綅" EnableEdit="true" ForceSelection="false" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpYear" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="150px"
+                                            LabelWidth="50px" Label="骞村害" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:DropDownList ID="drpQuarter" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="150px"
+                                            LabelWidth="50px" Label="瀛ｅ害" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
+                                        </f:DropDownList>
+                                        <f:Button ID="BtnBulletLeft" ToolTip="鍓嶄竴瀛ｅ害" Icon="BulletLeft" runat="server" EnablePostBack="true"
+                                            OnClick="BtnBulletLeft_Click">
+                                        </f:Button>
+                                        <f:Button ID="BtnBulletRight" ToolTip="鍚庝竴瀛ｅ害" Icon="BulletRight" runat="server" EnablePostBack="true"
+                                            OnClick="BulletRight_Click">
+                                        </f:Button>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSee" ToolTip="鏌ョ湅瀹℃壒娴佺▼" Icon="Find" runat="server" OnClick="btnSee_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnNew" ToolTip="鏂板" Hidden="true" Icon="Add" runat="server" OnClick="btnNew_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnGet" ToolTip="鑾峰彇" Icon="Add" Hidden="true" runat="server"
+                                            OnClick="btnGet_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnEdit" ToolTip="缂栬緫" Hidden="true" Icon="Pencil" runat="server" OnClick="btnEdit_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnDelete" ToolTip="鍒犻櫎" Hidden="true" Icon="Delete" ConfirmText="纭畾鍒犻櫎褰撳墠鏁版嵁锛�"
+                                            OnClick="btnDelete_Click" runat="server">
+                                        </f:Button>
+                                        <f:Button ID="btnAudit1" ToolTip="瀹℃牳" Icon="Pencil" Hidden="true" runat="server" OnClick="btnAudit1_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnAudit2" ToolTip="瀹℃壒" Icon="Pencil" Hidden="true" runat="server" OnClick="btnAudit2_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnUpdata" ToolTip="涓婃姤" Icon="PageSave" Hidden="true" runat="server" OnClick="btnUpdata_Click">
+                                        </f:Button>
+                                        <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="瀵煎嚭" Icon="FolderUp"
+                                            EnableAjax="false" DisableControlBeforePostBack="false">
+                                        </f:Button>
+                                        <%--<f:Button ID="btnPrint" ToolTip="鎵撳嵃" Icon="Printer" Hidden="true" runat="server"
+                                            OnClick="btnPrint_Click">
+                                        </f:Button>--%>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Rows>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:Label ID="txtUnitName" runat="server" Hidden="true">
+                                        </f:Label>
+                                        <f:Label ID="txtQuarter" runat="server">
+                                        </f:Label>
+                                        <f:Label ID="txtCompileDate" runat="server">
+                                        </f:Label>
+                                        <f:Label ID="lbHandleMan" runat="server">
+                                        </f:Label>
+                                    </Items>
+                                </f:FormRow>
+                            </Rows>
+                        </f:Form>
+                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="SafetyProductionEvaluationItemId"
+                            AllowCellEditing="true" ClicksToEdit="2" DataIDField="SafetyProductionEvaluationItemId"
+                            AllowSorting="true" SortField="SortIndex" SortDirection="ASC" OnSort="Grid1_Sort"
+                            AllowPaging="false" PageSize="1000" OnPageIndexChange="Grid1_PageIndexChange"
+                            AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableColumnLines="true">
+                            <Columns>
+                                <f:RenderField Width="55px" ColumnID="SortIndex" DataField="SortIndex" FieldType="String"
+                                    HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Type" DataField="Type" FieldType="String"
+                                    HeaderText="绫诲瀷" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="EvaluateWork" DataField="EvaluateWork"
+                                    FieldType="String" HeaderText="璇勪环宸ヤ綔" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="EvaluationContent" DataField="EvaluationContent"
+                                    FieldType="String" HeaderText="璇勪环鍐呭" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="350px" ColumnID="FillingRequirements" DataField="FillingRequirements"
+                                    FieldType="String" HeaderText="濉姤瑕佹眰" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompletionDeadline" DataField="CompletionDeadline"
+                                    FieldType="String" HeaderText="瀹屾垚鏈熼檺" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="ImplementationStatus" DataField="ImplementationStatus" ExpandUnusedSpace="true"
+                                    FieldType="String" HeaderText="钀藉疄鎯呭喌" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                                <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                            </Listeners>
+                        </f:Grid>
+                    </Items>
+                </f:Region>
+            </Regions>
+        </f:RegionPanel>
+        <f:Window ID="Window1" Title="缂栬緫瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="false"
+            CloseAction="HidePostBack" Width="1300px" Height="540px">
+        </f:Window>
+        <f:Window ID="Window2" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window2_Close"
+            Title="瀵煎叆瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处" CloseAction="HidePostBack" EnableIFrame="true" Height="600px"
+            Width="900px">
+        </f:Window>
+        <f:Window ID="Window3" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true"
+            Title="鎵撳嵃瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处" CloseAction="HidePostBack" EnableIFrame="true" Height="768px"
+            Width="1024px">
+        </f:Window>
+        <f:Window ID="Window4" Title="鏌ョ湅瀹℃牳淇℃伅" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Self" EnableResize="true" runat="server" IsModal="true" OnClose="Window4_Close"
+            Width="1024px" Height="500px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        function onGridDataLoad(event) {
+            this.mergeColumns(['Type','EvaluateWork','EvaluationContent','FillingRequirements'], {
+                depends: true
+            });
+
+            this.mergeColumns(['FillingRequirements'], {
+                depends: true
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs
new file mode 100644
index 00000000..4f20906e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.cs
@@ -0,0 +1,619 @@
+锘縰sing BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.ZHGL.Information
+{
+    public partial class SafetyProductionEvaluation : PageBase
+    {
+        #region 瀹氫箟鍙橀噺
+        /// <summary>
+        /// 涓婚敭
+        /// </summary>
+        public string SafetyProductionEvaluationId
+        {
+            get
+            {
+                return (string)ViewState["SafetyProductionEvaluationId"];
+            }
+            set
+            {
+                ViewState["SafetyProductionEvaluationId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 瀹氫箟闆嗗悎
+        /// </summary>
+        private static List<Model.Information_SafetyProductionEvaluationItem> SafetyProductionEvaluationItems = new List<Model.Information_SafetyProductionEvaluationItem>();
+        #endregion
+
+        #region 鍔犺浇椤甸潰
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BLL.ConstValue.InitConstValueDropDownList(this.drpQuarter, ConstValue.Group_0011, false);
+                BLL.ConstValue.InitConstValueDropDownList(this.drpYear, ConstValue.Group_0008, false);
+                this.drpUnit.DataTextField = "UnitName";
+                drpUnit.DataValueField = "UnitId";
+                drpUnit.DataSource = BLL.UnitService.GetThisUnitDropDownList();
+                drpUnit.DataBind();
+                this.drpUnit.Readonly = true;
+                DateTime showDate = System.DateTime.Now.AddMonths(-3);
+                this.drpQuarter.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString();
+                this.drpYear.SelectedValue = showDate.Year.ToString();
+                GetValue();
+            }
+        }
+        #endregion
+
+        #region 娓呯┖鏂囨湰妗�
+        private void SetEmpty()
+        {
+            this.SimpleForm1.Title = string.Empty;
+            txtUnitName.Text = string.Empty;
+            txtQuarter.Text = string.Empty;
+            txtCompileDate.Text = string.Empty;
+            this.lbHandleMan.Text = string.Empty;
+            Grid1.DataSource = null;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 鑾峰彇璁板綍鍊�
+        private void GetValue()
+        {
+            int year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
+            int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
+            this.SafetyProductionEvaluationId = string.Empty;
+            Model.View_Information_SafetyProductionEvaluation report = Funs.DB.View_Information_SafetyProductionEvaluation.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.Quarter == quarter && e.YearId == year);
+            if (report != null)
+            {
+                string state = string.Empty;
+                if (report.UpState == BLL.Const.UpState_3)
+                {
+                    state = "(宸蹭笂鎶�)";
+                }
+                else
+                {
+                    if (report.HandleState == BLL.Const.HandleState_1)
+                    {
+                        state = "(寰呮彁浜�)";
+                    }
+                    else if (report.HandleState == BLL.Const.HandleState_2)
+                    {
+                        state = "(寰呭鏍�)";
+                    }
+                    else if (report.HandleState == BLL.Const.HandleState_3)
+                    {
+                        state = "(寰呭鎵�)";
+                    }
+                    else if (report.HandleState == BLL.Const.HandleState_4)
+                    {
+                        state = "(寰呬笂鎶�)";
+                    }
+                }
+                this.SimpleForm1.Title = "涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处" + state;
+                this.SafetyProductionEvaluationId = report.SafetyProductionEvaluationId;
+                txtUnitName.Text = "鍗曚綅锛�" + report.UnitName;
+                txtQuarter.Text = "瀛ｅ害锛�" + report.Quarters;
+                if (report.HandleState == BLL.Const.HandleState_1 || report.UpState == BLL.Const.UpState_3)
+                {
+                    this.lbHandleMan.Hidden = true;
+                }
+                else
+                {
+                    this.lbHandleMan.Hidden = false;
+                    this.lbHandleMan.Text = "涓嬩竴姝ュ姙鐞嗕汉锛�" + report.UserName;
+                }
+                if (report.ReportDate != null)
+                {
+                    txtCompileDate.Text = "鍒惰〃鏃堕棿锛�" + string.Format("{0:yyyy-MM-dd}", report.ReportDate);
+                }
+                BindGrid1();
+            }
+            else
+            {
+                SetEmpty();
+            }
+            this.GetButtonPower();
+        }
+        #endregion
+
+        #region 鍔犺浇Grid
+        private void BindGrid1()
+        {
+            string strSql = "select * from dbo.Information_SafetyProductionEvaluationItem where SafetyProductionEvaluationId = @SafetyProductionEvaluationId order by SortIndex";
+            SqlParameter[] parameter = new SqlParameter[]
+                    {
+                        new SqlParameter("@SafetyProductionEvaluationId",this.SafetyProductionEvaluationId),
+                    };
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 澧炲姞銆佷慨鏀广�佸垹闄ゃ�佸鏍搞�佸鎵广�佷笂鎶ユ寜閽簨浠�
+        /// <summary>
+        /// Tree澧炲姞鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SafetyProductionEvaluationAdd.aspx?UnitId={0}&&Year={1}&&Quarter={2}", this.CurrUser.UnitId, this.drpYear.SelectedValue, this.drpQuarter.SelectedValue, "缂栬緫 - ")));
+        }
+
+        /// <summary>
+        /// 鏄剧ず缂栬緫椤甸潰
+        /// </summary>
+        private void ShowEdit()
+        {
+            Model.Information_SafetyProductionEvaluation report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report == null)
+            {
+                Alert.ShowInTop("鎵�閫夋椂闂存棤鎶ヨ〃璁板綍锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("SafetyProductionEvaluationAdd.aspx?SafetyProductionEvaluationId={0}", report.SafetyProductionEvaluationId, "缂栬緫 - ")));
+        }
+
+        /// <summary>
+        /// Tree缂栬緫鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// 瀹℃牳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit1_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// 瀹℃壒
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit2_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// 涓婃姤
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUpdata_Click(object sender, EventArgs e)
+        {
+            ShowEdit();
+        }
+
+        /// <summary>
+        /// Tree鍒犻櫎鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            Model.Information_SafetyProductionEvaluation report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report != null)
+            {
+                BLL.LogService.AddSys_Log(this.CurrUser, report.YearId.ToString() + "-" + report.Quarter.ToString(),
+                        report.SafetyProductionEvaluationId, BLL.Const.SafetyProductionEvaluationMenuId, BLL.Const.BtnDelete);
+                BLL.ProjectDataFlowSetService.DeleteFlowSetByDataId(report.SafetyProductionEvaluationId);
+                BLL.SafetyProductionEvaluationItemService.DeleteSafetyProductionEvaluationItemList(report.SafetyProductionEvaluationId);
+                BLL.SafetyProductionEvaluationService.DeleteSafetyProductionEvaluationById(report.SafetyProductionEvaluationId);
+
+                SetEmpty();
+                //this.btnNew.Hidden = false;
+                ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+            }
+            else
+            {
+                ShowNotify("鎵�閫夋椂闂存棤鎶ヨ〃璁板綍锛�", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 杩囨护銆佸垎椤点�佹帓搴忋�佸叧闂獥鍙�
+        /// <summary>
+        /// 琛ㄥご杩囨护
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 鍒嗛〉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// Grid1鎺掑簭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid1();
+        }
+
+        /// <summary>
+        /// 鍒嗛〉鍒楄〃鏄剧ず鏉℃暟涓嬫媺閫夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// 鍏抽棴Grid1寮瑰嚭绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            GetValue();
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SafetyProductionEvaluationMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    //this.btnNew.Hidden = false;
+                    this.btnGet.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnDelete.Hidden = false;
+                }
+                //if (buttonList.Contains(BLL.Const.BtnPrint))
+                //{
+                //    this.btnPrint.Hidden = false;
+                //}
+                int year = Funs.GetNewIntOrZero(this.drpYear.SelectedValue);
+                int quarter = Funs.GetNewIntOrZero(this.drpQuarter.SelectedValue);
+                var report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(this.drpUnit.SelectedValue, year, quarter);
+                this.btnAudit1.Hidden = true;
+                this.btnAudit2.Hidden = true;
+                this.btnUpdata.Hidden = true;
+                if (report != null)
+                {
+                    this.btnNew.Hidden = true;
+                    if (report.HandleMan == this.CurrUser.UserId)   //褰撳墠浜烘槸涓嬩竴姝ュ姙鐞嗗叆
+                    {
+                        if (report.HandleState == BLL.Const.HandleState_2)
+                        {
+                            this.btnAudit1.Hidden = false;
+                        }
+                        else if (report.HandleState == BLL.Const.HandleState_3)
+                        {
+                            this.btnAudit2.Hidden = false;
+                        }
+                        else if (report.HandleState == BLL.Const.HandleState_4)
+                        {
+                            this.btnDelete.Hidden = true;
+                            this.btnUpdata.Hidden = false;
+                        }
+                    }
+                    if (report.UpState == BLL.Const.UpState_3)
+                    {
+                        this.btnUpdata.Hidden = true;
+                        this.btnEdit.Hidden = true;
+                        this.btnDelete.Hidden = true;
+                    }
+                    if (report.HandleMan == this.CurrUser.UserId || report.CompileMan == this.CurrUser.UserName)
+                    {
+                        this.btnEdit.Hidden = false;
+                    }
+                    else
+                    {
+                        this.btnEdit.Hidden = true;
+                    }
+                }
+            }
+
+            if (this.CurrUser.UserId == BLL.Const.sysglyId)
+            {
+                this.btnDelete.Hidden = false;
+            }
+        }
+        #endregion
+
+        #region 鍗曚綅涓嬫媺妗嗚仈鍔ㄤ簨浠�
+        /// <summary>
+        /// 鍗曚綅涓嬫媺妗嗚仈鍔ㄤ簨浠�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            GetValue();
+        }
+        #endregion
+
+        #region 鑾峰彇
+        /// <summary>
+        /// 鑾峰彇鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnGet_Click(object sender, EventArgs e)
+        {
+            Model.Information_SafetyProductionEvaluation report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report == null)
+            {
+                var returnValue = getSafetyProductionEvaluationToSUB();
+                if (returnValue.code == 1)
+                {
+                    ShowNotify(returnValue.message, MessageBoxIcon.Success);
+                    GetValue();
+                }
+                else
+                {
+                    Alert.ShowInTop(returnValue.message, MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("璇ュ搴﹁褰曞凡瀛樺湪锛屾棤闇�鑾峰彇锛�", MessageBoxIcon.Warning);
+            }
+        }
+
+        /// <summary>
+        ///  鑾峰彇
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        public Model.ResponeData getSafetyProductionEvaluationToSUB()
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                string unitId = CommonService.GetThisUnitId();
+                string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getSafetyProductionEvaluation?year=" + this.drpYear.SelectedValue + "&quarter=" + this.drpQuarter.SelectedValue;
+                string contenttype = "application/json;charset=unicode";
+                Hashtable newToken = new Hashtable
+                {
+                    { "token", ServerService.GetToken().Token }
+                };
+
+                var strJosn = APIGetHttpService.Http(baseurl, "GET", contenttype, newToken, null);
+                if (!string.IsNullOrEmpty(strJosn))
+                {
+                    JObject obj = JObject.Parse(strJosn);
+                    responeData.code = Funs.GetNewIntOrZero(obj["code"].ToString());
+                    responeData.message = obj["message"].ToString();
+                    if (responeData.code == 1)
+                    {
+                        JArray getData = JArray.Parse(obj["data"].ToString());
+                        if (getData.Count() > 0)
+                        {
+                            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+                            {
+                                int i = 0;
+                                string SafetyProductionEvaluationId = SQLHelper.GetNewID();
+                                foreach (var item in getData)
+                                {
+                                    if (i == 0)
+                                    {
+                                        Model.Information_SafetyProductionEvaluation SafetyProductionEvaluation = new Model.Information_SafetyProductionEvaluation();
+                                        SafetyProductionEvaluation.SafetyProductionEvaluationId = SafetyProductionEvaluationId;
+                                        SafetyProductionEvaluation.UnitId = BLL.CommonService.GetThisUnitId();
+                                        SafetyProductionEvaluation.ReportDate = DateTime.Now;
+                                        SafetyProductionEvaluation.Quarter = Funs.GetNewInt(this.drpQuarter.SelectedValue);
+                                        SafetyProductionEvaluation.YearId = Funs.GetNewInt(this.drpYear.SelectedValue);
+                                        SafetyProductionEvaluation.CompileMan = this.CurrUser.UserName;
+                                        SafetyProductionEvaluation.UpState = BLL.Const.UpState_2;
+                                        SafetyProductionEvaluation.HandleState = BLL.Const.HandleState_1;
+                                        SafetyProductionEvaluation.HandleMan = this.CurrUser.UserId;
+                                        BLL.SafetyProductionEvaluationService.AddSafetyProductionEvaluation(SafetyProductionEvaluation);
+                                    }
+                                    Model.Information_SafetyProductionEvaluationItem newItem = new Model.Information_SafetyProductionEvaluationItem();
+                                    newItem.SafetyProductionEvaluationItemId = SQLHelper.GetNewID();
+                                    newItem.SafetyProductionEvaluationId = SafetyProductionEvaluationId;
+                                    newItem.SortIndex = Funs.GetNewInt(item["SortIndex"].ToString());
+                                    newItem.Type = item["Type"].ToString();
+                                    newItem.EvaluateWork = item["EvaluateWork"].ToString();
+                                    newItem.EvaluationContent = item["EvaluationContent"].ToString();
+                                    newItem.FillingRequirements = item["FillingRequirements"].ToString();
+                                    newItem.CompletionDeadline = item["CompletionDeadline"].ToString();
+                                    BLL.SafetyProductionEvaluationItemService.AddSafetyProductionEvaluationItem(newItem);
+                                    i++;
+                                }
+                            }
+                            responeData.message = "鑾峰彇鎴愬姛!";
+                        }
+                        else
+                        {
+                            responeData.code = 0;
+                            responeData.message = "闆嗗洟璁板綍灏氭湭鐢熸垚!";
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = "鑾峰彇澶辫触锛�" + ex.Message;
+                ErrLogInfo.WriteLog("涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处鑾峰彇锛�", ex);
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鍏抽棴瀵煎叆寮瑰嚭绐楀彛
+        /// <summary>
+        /// 鍏抽棴瀵煎叆寮瑰嚭绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window2_Close(object sender, WindowCloseEventArgs e)
+        {
+            GetValue();
+        }
+
+        /// <summary>
+        /// 鍏抽棴鏌ョ湅瀹℃壒淇℃伅寮瑰嚭绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window4_Close(object sender, WindowCloseEventArgs e)
+        {
+
+        }
+        #endregion
+
+        #region 鎵撳嵃
+        /// <summary>
+        /// 鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPrint_Click(object sender, EventArgs e)
+        {
+            //Model.Information_SafetyProductionEvaluation report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            //if (report != null)
+            //{
+            //    PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("../../ReportPrint/ExReportPrint.aspx?reportId={0}&&replaceParameter={1}&&varValue={2}", Const.Information_SafetyProductionEvaluationId, report.SafetyProductionEvaluationId, "", "鎵撳嵃 - ")));
+            //}
+        }
+        #endregion
+
+        #region 瀛ｅ害鍚戝墠/鍚戝悗
+        /// <summary>
+        /// 鍓嶄竴瀛ｅ害
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnBulletLeft_Click(object sender, EventArgs e)
+        {
+            SetMonthChange("-");
+        }
+
+        /// <summary>
+        /// 鍚庝竴瀛ｅ害
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BulletRight_Click(object sender, EventArgs e)
+        {
+            SetMonthChange("+");
+        }
+
+        /// <summary>
+        /// 瀛ｅ害鍔犲噺鍙樺寲
+        /// </summary>
+        /// <param name="type"></param>
+        private void SetMonthChange(string type)
+        {
+            DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + (Funs.GetNewIntOrZero(this.drpQuarter.SelectedValue) * 3).ToString());
+            if (nowDate.HasValue)
+            {
+                DateTime showDate = new DateTime();
+                if (type == "+")
+                {
+                    showDate = nowDate.Value.AddMonths(3);
+                }
+                else
+                {
+                    showDate = nowDate.Value.AddMonths(-3);
+                }
+
+                this.drpYear.SelectedValue = showDate.Year.ToString();
+                this.drpQuarter.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString();
+                ///鍊煎彉鍖�
+                GetValue();
+            }
+        }
+        #endregion
+
+        #region 鏌ョ湅瀹℃壒淇℃伅
+        /// <summary>
+        /// 鏌ョ湅瀹℃壒淇℃伅
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSee_Click(object sender, EventArgs e)
+        {
+            Model.Information_SafetyProductionEvaluation report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpQuarter.SelectedValue));
+            if (report != null)
+            {
+                PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("ReportAuditSee.aspx?Id={0}", report.SafetyProductionEvaluationId, "鏌ョ湅 - ")));
+            }
+            else
+            {
+                ShowNotify("鎵�閫夋湀浠芥棤璁板綍锛�", MessageBoxIcon.Warning);
+            }
+        }
+        #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 = System.Text.Encoding.UTF8;
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.designer.cs
new file mode 100644
index 00000000..f11c0aea
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluation.aspx.designer.cs
@@ -0,0 +1,276 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Information {
+    
+    
+    public partial class SafetyProductionEvaluation {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// RegionPanel1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.RegionPanel RegionPanel1;
+        
+        /// <summary>
+        /// Region2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Region Region2;
+        
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// drpUnit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+        
+        /// <summary>
+        /// drpYear 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpYear;
+        
+        /// <summary>
+        /// drpQuarter 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpQuarter;
+        
+        /// <summary>
+        /// BtnBulletLeft 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button BtnBulletLeft;
+        
+        /// <summary>
+        /// BtnBulletRight 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button BtnBulletRight;
+        
+        /// <summary>
+        /// btnSee 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSee;
+        
+        /// <summary>
+        /// btnNew 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// btnGet 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnGet;
+        
+        /// <summary>
+        /// btnEdit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnEdit;
+        
+        /// <summary>
+        /// btnDelete 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+        
+        /// <summary>
+        /// btnAudit1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit1;
+        
+        /// <summary>
+        /// btnAudit2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit2;
+        
+        /// <summary>
+        /// btnUpdata 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnUpdata;
+        
+        /// <summary>
+        /// btnOut 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+        
+        /// <summary>
+        /// txtUnitName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label txtUnitName;
+        
+        /// <summary>
+        /// txtQuarter 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label txtQuarter;
+        
+        /// <summary>
+        /// txtCompileDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label txtCompileDate;
+        
+        /// <summary>
+        /// lbHandleMan 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Label lbHandleMan;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// Window3 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window3;
+        
+        /// <summary>
+        /// Window4 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window4;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx
new file mode 100644
index 00000000..54865c79
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx
@@ -0,0 +1,112 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SafetyProductionEvaluationAdd.aspx.cs" Inherits="FineUIPro.Web.ZHGL.Information.SafetyProductionEvaluationAdd" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>缂栬緫瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处</title>
+    <link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="ddlUnitId" runat="server" Label="鍗曚綅" Required="True" ShowRedStar="True">
+                        </f:DropDownList>
+                        <f:DropDownList ID="ddlYearId" runat="server" Label="骞村害" Required="True" ShowRedStar="True">
+                        </f:DropDownList>
+                        <f:DropDownList ID="ddlQuarter" runat="server" Label="瀛ｅ害" Required="True" ShowRedStar="True">
+                        </f:DropDownList>
+                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="鍒惰〃鏃堕棿" ID="dpkCompileDate"
+                            Required="True" ShowRedStar="True">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
+                            BoxFlex="1" DataKeyNames="SafetyProductionEvaluationItemId" AllowCellEditing="true"
+                            ClicksToEdit="1" DataIDField="SafetyProductionEvaluationItemId" EnableColumnLines="true"
+                            OnRowCommand="Grid1_RowCommand" EnableHeaderMenu="false" Width="1200px" Height="360px">
+                            <Columns>
+                                <f:RenderField Width="55px" ColumnID="SortIndex" DataField="SortIndex" FieldType="String"
+                                    HeaderText="搴忓彿" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="90px" ColumnID="Type" DataField="Type" FieldType="String"
+                                    HeaderText="绫诲瀷" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="150px" ColumnID="EvaluateWork" DataField="EvaluateWork"
+                                    FieldType="String" HeaderText="璇勪环宸ヤ綔" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="250px" ColumnID="EvaluationContent" DataField="EvaluationContent"
+                                    FieldType="String" HeaderText="璇勪环鍐呭" HeaderTextAlign="Center"
+                                    TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="350px" ColumnID="FillingRequirements" DataField="FillingRequirements"
+                                    FieldType="String" HeaderText="濉姤瑕佹眰" HeaderTextAlign="Center" TextAlign="Left">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="CompletionDeadline" DataField="CompletionDeadline"
+                                    FieldType="String" HeaderText="瀹屾垚鏈熼檺" HeaderTextAlign="Center" TextAlign="Center">
+                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="ImplementationStatus" DataField="ImplementationStatus" ExpandUnusedSpace="true"
+                                    FieldType="String" HeaderText="钀藉疄鎯呭喌" HeaderTextAlign="Center" TextAlign="Left">
+                                    <Editor>
+                                        <f:TextArea ID="txtImplementationStatus" Text='<%# Eval("ImplementationStatus")%>' runat="server" AutoGrowHeight="true">
+                                        </f:TextArea>
+                                    </Editor>
+                                </f:RenderField>
+                                <f:RenderField Width="55px" ColumnID="SafetyProductionEvaluationItemId" DataField="SafetyProductionEvaluationItemId" FieldType="String"
+                                    HeaderText="涓婚敭" HeaderTextAlign="Center" TextAlign="Center" Hidden="true">
+                                </f:RenderField>
+                            </Columns>
+                            <Listeners>
+                            <f:Listener Event="dataload" Handler="onGridDataLoad" />
+                        </Listeners>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:Button ID="btnCopy" Icon="Database" runat="server" ToolTip="澶嶅埗涓婂搴︽暟鎹�" ValidateForms="SimpleForm1"
+                            OnClick="btnCopy_Click" Hidden="true" MarginLeft="10px">
+                        </f:Button>
+                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Hidden="true"
+                            ValidateForms="SimpleForm1" OnClick="btnSave_Click">
+                        </f:Button>
+                        <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Hidden="true" ToolTip="鎻愪氦"
+                            ValidateForms="SimpleForm1" OnClick="btnSubmit_Click">
+                        </f:Button>
+                        <f:Button ID="btnUpdata" Icon="PageSave" runat="server" Hidden="true" ConfirmText="纭畾涓婃姤锛�"
+                            ToolTip="涓婃姤" ValidateForms="SimpleForm1" OnClick="btnUpdata_Click" MarginRight="10px">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="Window1" IconUrl="~/res/images/16/11.png" runat="server" Hidden="true"
+            IsModal="false" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
+            Title="鍔炵悊娴佺▼" CloseAction="HidePostBack" EnableIFrame="true" Height="520px" Width="800px">
+        </f:Window>
+    </form>
+    <script type="text/javascript">
+        function onGridDataLoad(event) {
+             this.mergeColumns(['Type','EvaluateWork','EvaluationContent','FillingRequirements'], {
+                depends: true
+            });
+
+            this.mergeColumns(['FillingRequirements'], {
+                depends: true
+            });
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx.cs
new file mode 100644
index 00000000..c208aa87
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx.cs
@@ -0,0 +1,534 @@
+锘縰sing BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.ZHGL.Information
+{
+    public partial class SafetyProductionEvaluationAdd : PageBase
+    {
+        #region 瀹氫箟鍙橀噺
+        public string SafetyProductionEvaluationId
+        {
+            get
+            {
+                return (string)ViewState["SafetyProductionEvaluationId"];
+            }
+            set
+            {
+                ViewState["SafetyProductionEvaluationId"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 瀹氫箟闆嗗悎
+        /// </summary>
+        private static List<Model.Information_SafetyProductionEvaluationItem> items = new List<Model.Information_SafetyProductionEvaluationItem>();
+        #endregion
+
+        #region 鍔犺浇椤甸潰
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.GetButtonPower();
+                items.Clear();
+                this.ddlUnitId.DataTextField = "UnitName";
+                this.ddlUnitId.DataValueField = "UnitId";
+                this.ddlUnitId.DataSource = BLL.UnitService.GetThisUnitDropDownList();
+                this.ddlUnitId.DataBind();
+
+                this.ddlYearId.DataTextField = "ConstText";
+                ddlYearId.DataValueField = "ConstValue";
+                ddlYearId.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_0008);
+                ddlYearId.DataBind();
+
+                this.ddlQuarter.DataTextField = "ConstText";
+                ddlQuarter.DataValueField = "ConstValue";
+                ddlQuarter.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_0011);
+                ddlQuarter.DataBind();
+                this.ddlUnitId.Readonly = true;
+                string unitId = Request.Params["UnitId"];
+                string year = Request.QueryString["Year"];
+                string quarter = Request.QueryString["Quarter"];
+                this.SafetyProductionEvaluationId = Request.Params["SafetyProductionEvaluationId"];
+                if (!string.IsNullOrEmpty(this.SafetyProductionEvaluationId))
+                {
+                    items = BLL.SafetyProductionEvaluationItemService.GetSafetyProductionEvaluationItemList(this.SafetyProductionEvaluationId);
+                    this.Grid1.DataSource = items;
+                    this.Grid1.DataBind();
+
+                    var SafetyProductionEvaluation = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationById(this.SafetyProductionEvaluationId);
+                    if (SafetyProductionEvaluation != null)
+                    {
+                        this.btnCopy.Hidden = true;
+                        this.btnSave.Hidden = true;
+                        this.btnSubmit.Hidden = true;
+                        if (SafetyProductionEvaluation.HandleState == BLL.Const.HandleState_4)
+                        {
+                            this.btnUpdata.Hidden = false;
+                        }
+                        else
+                        {
+                            if (SafetyProductionEvaluation.HandleMan == this.CurrUser.UserId)
+                            {
+                                this.btnSave.Hidden = false;
+                                this.btnSubmit.Hidden = false;
+                            }
+                        }
+                        if (SafetyProductionEvaluation.UpState == BLL.Const.UpState_3)  //宸蹭笂鎶�
+                        {
+                            this.btnSave.Hidden = true;
+                            this.btnUpdata.Hidden = true;
+                        }
+                        if (!string.IsNullOrEmpty(SafetyProductionEvaluation.UnitId))
+                        {
+                            this.ddlUnitId.SelectedValue = SafetyProductionEvaluation.UnitId;
+                        }
+                        if (SafetyProductionEvaluation.YearId.HasValue)
+                        {
+                            this.ddlYearId.SelectedValue = SafetyProductionEvaluation.YearId.ToString();
+                        }
+                        if (SafetyProductionEvaluation.Quarter.HasValue)
+                        {
+                            this.ddlQuarter.SelectedValue = SafetyProductionEvaluation.Quarter.ToString();
+                        }
+                        if (SafetyProductionEvaluation.ReportDate != null)
+                        {
+                            this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", SafetyProductionEvaluation.ReportDate);
+                        }
+                    }
+                }
+                else
+                {
+                    //this.btnCopy.Hidden = false;
+                    this.ddlUnitId.SelectedValue = unitId;
+                    this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                    this.ddlYearId.SelectedValue = year;
+                    this.ddlQuarter.SelectedValue = quarter;
+                    ////鑾峰彇椤圭洰鎶ュ憡闆嗗悎
+                    //List<Model.InformationProject_SafetyProductionEvaluationItem> projectItems = (from x in Funs.DB.InformationProject_SafetyProductionEvaluation
+                    //                                                                                 join y in Funs.DB.InformationProject_SafetyProductionEvaluationItem
+                    //                                                                                 on x.SafetyProductionEvaluationId equals y.SafetyProductionEvaluationId
+                    //                                                                                 where x.YearId.ToString() == year && x.Quarter.ToString() == quarter && x.States == BLL.Const.State_2
+                    //                                                                                 select y).Distinct().ToList();
+                    //if (projectItems.Count > 0)
+                    //{
+                    //    int i = 0;
+                    //    foreach (var projectItem in projectItems)
+                    //    {
+                    //        i += 10;
+                    //        Model.Information_SafetyProductionEvaluationItem item = new Model.Information_SafetyProductionEvaluationItem
+                    //        {
+                    //            SafetyProductionEvaluationItemId = SQLHelper.GetNewID(typeof(Model.Information_SafetyProductionEvaluationItem)),
+                    //            SortIndex = i
+                    //        };
+                    //        Model.Base_Project project = (from x in Funs.DB.Base_Project
+                    //                                      join y in Funs.DB.InformationProject_SafetyProductionEvaluation
+                    //                                      on x.ProjectId equals y.ProjectId
+                    //                                      join z in Funs.DB.InformationProject_SafetyProductionEvaluationItem
+                    //                                      on y.SafetyProductionEvaluationId equals z.SafetyProductionEvaluationId
+                    //                                      where z.SafetyProductionEvaluationItemId == projectItem.SafetyProductionEvaluationItemId
+                    //                                      select x).FirstOrDefault();
+                    //        if (project != null)
+                    //        {
+                    //            item.IndustryType = project.ProjectName;
+                    //        }
+                    //        item.TotalConductCount = projectItem.TotalConductCount;
+                    //        item.TotalPeopleCount = projectItem.TotalPeopleCount;
+                    //        item.TotalInvestment = projectItem.TotalInvestment;
+                    //        item.HQConductCount = projectItem.HQConductCount;
+                    //        item.HQPeopleCount = projectItem.HQPeopleCount;
+                    //        item.HQInvestment = projectItem.HQInvestment;
+                    //        item.BasicConductCount = projectItem.BasicConductCount;
+                    //        item.BasicPeopleCount = projectItem.BasicPeopleCount;
+                    //        item.BasicInvestment = projectItem.BasicInvestment;
+                    //        item.ComprehensivePractice = projectItem.ComprehensivePractice;
+                    //        item.CPScene = projectItem.CPScene;
+                    //        item.CPDesktop = projectItem.CPDesktop;
+                    //        item.SpecialDrill = projectItem.SpecialDrill;
+                    //        item.SDScene = projectItem.SDScene;
+                    //        item.SDDesktop = projectItem.SDDesktop;
+                    //        items.Add(item);
+                    //    }
+                    //}
+                    //else
+                    //{
+                    //    for (int i = 0; i < 100; i++)
+                    //    {
+                    //        i += 10;
+                    //        Model.Information_SafetyProductionEvaluationItem newItem = new Model.Information_SafetyProductionEvaluationItem
+                    //        {
+                    //            SafetyProductionEvaluationItemId = SQLHelper.GetNewID(typeof(Model.Information_SafetyProductionEvaluationItem)),
+                    //            SortIndex = i
+                    //        };
+                    //        items.Add(newItem);
+                    //    }
+                    //}
+                    Grid1.DataSource = items;
+                    Grid1.DataBind();
+
+
+                }
+            }
+        }
+
+        #endregion
+
+        #region 淇濆瓨銆佹彁浜ゃ�佷笂鎶�
+        /// <summary>
+        /// 淇濆瓨鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Save("add");
+        }
+
+        /// <summary>
+        /// 涓婃姤鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnUpdata_Click(object sender, EventArgs e)
+        {
+            Save("updata");
+        }
+
+        /// <summary>
+        /// 鎻愪氦鎸夐挳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            Save("submit");
+        }
+
+        /// <summary>
+        /// 淇濆瓨鏁版嵁
+        /// </summary>
+        /// <param name="type"></param>
+        private void Save(string type)
+        {
+            if (this.ddlUnitId.SelectedValue == BLL.Const._Null)
+            {
+                ShowNotify("璇烽�夋嫨鍗曚綅锛�", MessageBoxIcon.Warning);
+                return;
+            }
+            var drill = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdDate(this.ddlUnitId.SelectedValue, Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue), Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue), this.SafetyProductionEvaluationId);
+            if (drill != null)
+            {
+                ShowNotify("鏈崟浣嶆湰瀛ｅ害鎶ヨ〃宸插瓨鍦紝涓嶈兘閲嶅缂栧埗", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var SafetyProductionEvaluation = new Model.Information_SafetyProductionEvaluation();
+            if (this.ddlUnitId.SelectedValue != BLL.Const._Null)
+            {
+                SafetyProductionEvaluation.UnitId = this.ddlUnitId.SelectedValue;
+            }
+            if (!string.IsNullOrEmpty(this.dpkCompileDate.Text.Trim()))
+            {
+                SafetyProductionEvaluation.ReportDate = Convert.ToDateTime(this.dpkCompileDate.Text.Trim());
+            }
+            SafetyProductionEvaluation.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
+            SafetyProductionEvaluation.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
+            if (string.IsNullOrEmpty(this.SafetyProductionEvaluationId))
+            {
+                this.SafetyProductionEvaluationId = SQLHelper.GetNewID(typeof(Model.Information_SafetyProductionEvaluation)); SafetyProductionEvaluation.SafetyProductionEvaluationId = this.SafetyProductionEvaluationId;
+                SafetyProductionEvaluation.CompileMan = this.CurrUser.UserName;
+                SafetyProductionEvaluation.UpState = BLL.Const.UpState_2;
+                SafetyProductionEvaluation.HandleMan = this.CurrUser.UserId;
+                SafetyProductionEvaluation.HandleState = BLL.Const.HandleState_1;
+                BLL.SafetyProductionEvaluationService.AddSafetyProductionEvaluation(SafetyProductionEvaluation);
+                BLL.LogService.AddSys_Log(this.CurrUser, SafetyProductionEvaluation.YearId.ToString() + "-" + SafetyProductionEvaluation.Quarter.ToString(),
+                        SafetyProductionEvaluation.SafetyProductionEvaluationId, BLL.Const.SafetyProductionEvaluationMenuId, BLL.Const.BtnAdd);
+            }
+            else
+            {
+                Model.Information_SafetyProductionEvaluation oldReport = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationById(this.SafetyProductionEvaluationId);
+                if (oldReport != null)
+                {
+                    SafetyProductionEvaluation.HandleMan = oldReport.HandleMan;
+                    SafetyProductionEvaluation.HandleState = oldReport.HandleState;
+                }
+                SafetyProductionEvaluation.SafetyProductionEvaluationId = this.SafetyProductionEvaluationId;
+                SafetyProductionEvaluation.UpState = BLL.Const.UpState_2;
+                BLL.SafetyProductionEvaluationService.UpdateSafetyProductionEvaluation(SafetyProductionEvaluation);
+                BLL.LogService.AddSys_Log(this.CurrUser, SafetyProductionEvaluation.YearId.ToString() + "-" + SafetyProductionEvaluation.Quarter.ToString(),
+                        SafetyProductionEvaluation.SafetyProductionEvaluationId, BLL.Const.SafetyProductionEvaluationMenuId, BLL.Const.BtnModify);
+                BLL.SafetyProductionEvaluationItemService.DeleteSafetyProductionEvaluationItemList(SafetyProductionEvaluation.SafetyProductionEvaluationId);
+            }
+            GetItems(SafetyProductionEvaluation.SafetyProductionEvaluationId);
+            foreach (var item in items)
+            {
+                BLL.SafetyProductionEvaluationItemService.AddSafetyProductionEvaluationItem(item);
+            }
+            if (type == "updata")     //淇濆瓨骞朵笂鎶�
+            {
+                if (SafetyProductionEvaluation.UpState == BLL.Const.UpState_2)
+                {
+                    string code = CNCECHSSEWebService.UpSafetyProductionEvaluation(SafetyProductionEvaluation.SafetyProductionEvaluationId, this.CurrUser);
+                    if (code == "1")
+                    {
+                        ShowNotify("鍚屾鎴愬姛锛�", MessageBoxIcon.Success);
+                        PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                        return;
+                    }
+                    else
+                    {
+                        Alert.ShowInParent("鍚屾寮傚父锛岃閫�鍑哄悗閲嶈瘯锛�", MessageBoxIcon.Error);
+                    }
+                }
+                else
+                {
+                    ShowNotify("褰撳墠鍗曟嵁鐘舵�佷笉鑳藉悓姝ワ紒", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            if (type == "submit")
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReportSubmit.aspx?Type=SafetyProductionEvaluation&Id={0}", SafetyProductionEvaluation.SafetyProductionEvaluationId, "缂栬緫 - ")));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏄庣粏鍊�
+        /// </summary>
+        /// <param name="SafetyProductionEvaluationId"></param>
+        private void GetItems(string SafetyProductionEvaluationId)
+        {
+            items.Clear();
+            foreach (JObject mergedRow in Grid1.GetMergedData())
+            {
+                JObject values = mergedRow.Value<JObject>("values");
+                Model.Information_SafetyProductionEvaluationItem item = new Model.Information_SafetyProductionEvaluationItem();
+                if (values["SafetyProductionEvaluationItemId"].ToString() != "")
+                {
+                    item.SafetyProductionEvaluationItemId = values.Value<string>("SafetyProductionEvaluationItemId");
+                }
+                item.SafetyProductionEvaluationId = SafetyProductionEvaluationId;
+                item.SortIndex = Funs.GetNewInt(values.Value<string>("SortIndex"));
+                if (values["Type"].ToString() != "")
+                {
+                    item.Type = values.Value<string>("Type");
+                }
+                if (values["EvaluateWork"].ToString() != "")
+                {
+                    item.EvaluateWork = values.Value<string>("EvaluateWork");
+                }
+                if (values["EvaluationContent"].ToString() != "")
+                {
+                    item.EvaluationContent = values.Value<string>("EvaluationContent");
+                }
+                if (values["FillingRequirements"].ToString() != "")
+                {
+                    item.FillingRequirements = values.Value<string>("FillingRequirements");
+                }
+                if (values["CompletionDeadline"].ToString() != "")
+                {
+                    item.CompletionDeadline = values.Value<string>("CompletionDeadline");
+                }
+                if (values["ImplementationStatus"].ToString() != "")
+                {
+                    item.ImplementationStatus = values.Value<string>("ImplementationStatus");
+                }
+                items.Add(item);
+            }
+        }
+        #endregion
+
+        #region 鍏抽棴鍔炵悊娴佺▼绐楀彛
+        /// <summary>
+        /// 鍏抽棴鍔炵悊娴佺▼绐楀彛
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            Model.Information_SafetyProductionEvaluation report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationById(this.SafetyProductionEvaluationId);
+            if (report.HandleMan == this.CurrUser.UserId)
+            {
+                this.btnSave.Hidden = false;
+                this.btnSubmit.Hidden = false;
+            }
+            else
+            {
+                this.btnSave.Hidden = true;
+                this.btnSubmit.Hidden = true;
+            }
+        }
+        #endregion
+
+        #region Grid琛屼簨浠�
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            string rowID = Grid1.DataKeys[e.RowIndex][0].ToString();
+            GetItems(string.Empty);
+            if (e.CommandName == "Add")
+            {
+                Model.Information_SafetyProductionEvaluationItem oldItem = items.FirstOrDefault(x => x.SafetyProductionEvaluationItemId == rowID);
+                Model.Information_SafetyProductionEvaluationItem newItem = new Model.Information_SafetyProductionEvaluationItem
+                {
+                    SafetyProductionEvaluationItemId = SQLHelper.GetNewID(typeof(Model.Information_SafetyProductionEvaluationItem))
+                };
+                if (oldItem != null)
+                {
+                    newItem.SortIndex = oldItem.SortIndex + 1;
+                }
+                else
+                {
+                    newItem.SortIndex = 0;
+                }
+                items.Add(newItem);
+                items = items.OrderBy(x => x.SortIndex).ToList();
+                Grid1.DataSource = items;
+                Grid1.DataBind();
+            }
+            if (e.CommandName == "Delete")
+            {
+                if (Grid1.Rows.Count == 1)
+                {
+                    ShowNotify("鍙湁涓�鏉℃暟鎹紝鏃犳硶鍒犻櫎", MessageBoxIcon.Warning);
+                    return;
+                }
+                foreach (var item in items)
+                {
+                    if (item.SafetyProductionEvaluationItemId == rowID)
+                    {
+                        items.Remove(item);
+                        break;
+                    }
+                }
+                Grid1.DataSource = items;
+                Grid1.DataBind();
+                ShowNotify("鍒犻櫎鏁版嵁鎴愬姛!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 鑾峰彇鎸夐挳鏉冮檺
+        /// <summary>
+        /// 鑾峰彇鎸夐挳鏉冮檺
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.SafetyProductionEvaluationMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                    this.btnCopy.Hidden = false;
+                }
+                //if (buttonList.Contains(BLL.Const.BtnSaveUp))
+                //{
+                //    this.btnUpdata.Hidden = false;
+
+                //}
+                if (buttonList.Contains(BLL.Const.BtnSubmit))
+                {
+                    this.btnSubmit.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 澶嶅埗涓婁釜瀛ｅ害鏁版嵁
+        /// <summary>
+        /// 澶嶅埗涓婁釜瀛ｅ害鐨勬暟鎹�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnCopy_Click(object sender, EventArgs e)
+        {
+            int lastYear = 0, lastQuarter = 0;
+            int year = Convert.ToInt32(this.ddlYearId.SelectedValue);
+            int quarter = Convert.ToInt32(this.ddlQuarter.SelectedValue);
+            if (quarter == 1)
+            {
+                lastYear = year - 1;
+                lastQuarter = 4;
+            }
+            else
+            {
+                lastYear = year;
+                lastQuarter = quarter - 1;
+            }
+            Model.Information_SafetyProductionEvaluation SafetyProductionEvaluation = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationByUnitIdAndYearAndQuarters(this.ddlUnitId.SelectedValue, lastYear, lastQuarter);
+            if (SafetyProductionEvaluation != null)
+            {
+                Model.Information_SafetyProductionEvaluation newSafetyProductionEvaluation = new Model.Information_SafetyProductionEvaluation();
+                this.SafetyProductionEvaluationId = SQLHelper.GetNewID(typeof(Model.Information_SafetyProductionEvaluation));
+                newSafetyProductionEvaluation.SafetyProductionEvaluationId = this.SafetyProductionEvaluationId;
+                newSafetyProductionEvaluation.UnitId = this.ddlUnitId.SelectedValue;
+                newSafetyProductionEvaluation.ReportDate = DateTime.Now;
+                newSafetyProductionEvaluation.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
+                newSafetyProductionEvaluation.YearId = Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue);
+                newSafetyProductionEvaluation.CompileMan = this.CurrUser.UserName;
+                newSafetyProductionEvaluation.UpState = BLL.Const.UpState_2;
+                newSafetyProductionEvaluation.HandleState = BLL.Const.HandleState_1;
+                newSafetyProductionEvaluation.HandleMan = this.CurrUser.UserId;
+                BLL.SafetyProductionEvaluationService.AddSafetyProductionEvaluation(newSafetyProductionEvaluation);
+
+                items = BLL.SafetyProductionEvaluationItemService.GetSafetyProductionEvaluationItemList(SafetyProductionEvaluation.SafetyProductionEvaluationId);
+                if (items.Count > 0)
+                {
+                    foreach (var item in items)
+                    {
+                        Model.Information_SafetyProductionEvaluationItem newItem = new Model.Information_SafetyProductionEvaluationItem
+                        {
+                            SafetyProductionEvaluationItemId = SQLHelper.GetNewID(typeof(Model.Information_SafetyProductionEvaluationItem)),
+                            SafetyProductionEvaluationId = this.SafetyProductionEvaluationId,
+                            SortIndex = item.SortIndex
+                        };
+                        BLL.SafetyProductionEvaluationItemService.AddSafetyProductionEvaluationItem(newItem);
+                    }
+                }
+                GetValues(newSafetyProductionEvaluation.SafetyProductionEvaluationId);
+            }
+
+        }
+
+        /// <summary>
+        /// 鑾峰彇鏁版嵁
+        /// </summary>
+        private void GetValues(string SafetyProductionEvaluationId)
+        {
+            var report = BLL.SafetyProductionEvaluationService.GetSafetyProductionEvaluationById(SafetyProductionEvaluationId);
+            if (report != null)
+            {
+                if (!string.IsNullOrEmpty(report.UnitId))
+                {
+                    this.ddlUnitId.SelectedValue = report.UnitId;
+                }
+                if (report.YearId.HasValue)
+                {
+                    this.ddlYearId.SelectedValue = report.YearId.ToString();
+                }
+                if (report.Quarter.HasValue)
+                {
+                    this.ddlQuarter.SelectedValue = report.Quarter.ToString();
+                }
+                if (report.ReportDate != null)
+                {
+                    this.dpkCompileDate.Text = string.Format("{0:yyyy-MM-dd}", report.ReportDate);
+                }
+                items = BLL.SafetyProductionEvaluationItemService.GetSafetyProductionEvaluationItemList(SafetyProductionEvaluationId);
+                this.Grid1.DataSource = items;
+                this.Grid1.DataBind();
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx.designer.cs
new file mode 100644
index 00000000..a972c71c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/ZHGL/Information/SafetyProductionEvaluationAdd.aspx.designer.cs
@@ -0,0 +1,150 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+//     姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+//     瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+//     閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ZHGL.Information {
+    
+    
+    public partial class SafetyProductionEvaluationAdd {
+        
+        /// <summary>
+        /// form1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// ddlUnitId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlUnitId;
+        
+        /// <summary>
+        /// ddlYearId 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlYearId;
+        
+        /// <summary>
+        /// ddlQuarter 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlQuarter;
+        
+        /// <summary>
+        /// dpkCompileDate 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DatePicker dpkCompileDate;
+        
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// txtImplementationStatus 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtImplementationStatus;
+        
+        /// <summary>
+        /// Toolbar1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// btnCopy 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnCopy;
+        
+        /// <summary>
+        /// btnSave 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// btnSubmit 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnSubmit;
+        
+        /// <summary>
+        /// btnUpdata 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnUpdata;
+        
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
index 1e5e7c7d..0a56884a 100644
--- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs
@@ -788,8 +788,8 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
                     model.CompileDateMonth = this.drpCompileDateMonth.Text.Trim();
                     model.InspectionSummaryId = Guid.NewGuid().ToString();
                     model.InspectionSummaryMbId = "24";
-                    var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).FirstOrDefault();
-                    if (Rykq !=null)
+                    var Rykq =db.T_d_facerecord.Where(x => x.ProjectId == pid).Select(x=>x.ID).FirstOrDefault();
+                    if (Rykq !=0)
                     {
                         model.SummeryResult = "宸插鎺�";
                     }
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index c2780bf7..c90f11c5 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -9,6 +9,8 @@
 </TreeNode>
 <TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="妫�楠岃瘯楠岃鍒�/鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎" NavigateUrl=""><TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="鐜板満鎺у埗鐐硅鍓�(鏂�)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx"></TreeNode>
 <TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="鍒嗛儴鍒嗛」宸ョ▼(鏂�)" NavigateUrl="CQMS/WBS/Control/DivisionSubProjects.aspx"></TreeNode>
+<TreeNode id="FB94A120-921B-4AAB-B54F-EC11B6F561FD" Text="鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎銆佽鍓�" NavigateUrl="CQMS/WBS/Control/DivisionDivideAndCrop.aspx"></TreeNode>
+<TreeNode id="BA250432-492B-49A3-8BB6-D04BF74D2EDD" Text="鍗曚綅鍒嗛儴鍒嗛」宸ョ▼鍒掑垎琛�" NavigateUrl="CQMS/WBS/Control/DivisionDivideList.aspx"></TreeNode>
 <TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="鐜板満鎺у埗鐐硅鍓�" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
 <TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="鐜板満鎺у埗鐐硅祫鏂欐煖" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode>
 </TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_DigData.xml b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
index 0716e742..2c10d950 100644
--- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
@@ -1,8 +1,10 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="DA7D64F8-A107-4DBC-B7E4-5C79409EB9FA" Text="鏌ヨ" NavigateUrl="">
-  </TreeNode>
-<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="璧勬枡搴�" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="瀹夊叏鍏叡璧勬簮搴�" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="瀹夊叏鍚堣" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="瀹夊叏娉曞緥娉曡" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
+  <TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="璧勬枡搴�" NavigateUrl="">
+    <TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="瀹夊叏鍏叡璧勬簮搴�" NavigateUrl="">
+      <TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="瀹夊叏鍚堣" NavigateUrl="">
+        <TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="瀹夊叏娉曞緥娉曡" NavigateUrl="HSSE/Law/LawRegulationList.aspx">
+        </TreeNode>
 <TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="瀹夊叏鏍囧噯瑙勮寖" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
 <TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="瀹夊叏瑙勭珷鍒跺害" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
 <TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="瀹夊叏绠＄悊瑙勫畾" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
@@ -40,5 +42,4 @@
 </TreeNode>
 <TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="鏁版嵁搴�" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="椤圭洰HSE鏁版嵁姹囨��" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="鏁版嵁浣滄垬瀹�" NavigateUrl=""></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index 700a72fa..db103972 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -138,7 +138,6 @@
 <TreeNode id="FD572EFA-8E87-43D1-B514-25A39768106F" Text="鐢熸�佺幆淇濆伐浣滄�荤粨鎶ュ憡" NavigateUrl="HSSE/InformationProject/EPSummaryReport.aspx"></TreeNode>
 <TreeNode id="25CE6894-2840-4DC4-AD2E-D72292849CEE" Text="寤虹瓚琛屼笟鑳芥簮鑺傜害涓庣敓鎬佺幆澧冧繚鎶ゆ眹鎬昏〃" NavigateUrl="ZHGL/Environmental/ProjectArchitectureReport.aspx"></TreeNode>
 <TreeNode id="A44E98F6-E9FE-43F8-8349-C166263BF608" Text="鍖栧伐琛屼笟鑳芥簮鑺傜害涓庣敓鎬佺幆澧冧繚鎶ゆ眹鎬昏〃" NavigateUrl="ZHGL/Environmental/ProjectChemicalReport.aspx"></TreeNode>
-<TreeNode id="EFA6E45F-1267-4804-BEE7-41E0C5461204" Text="涓ぎ浼佷笟鑺傝兘鐜繚浜т笟浼佷笟鍩烘湰鎯呭喌鍜岀粡钀ユ儏鍐垫姤琛�" NavigateUrl="ZHGL/Environmental/ProjectOperationReport.aspx"></TreeNode>
 <TreeNode id="9DE996D9-A2CF-40C8-86D3-6A472AB30E5D" Text="涓ぎ浼佷笟鑺傝兘鐜繚浜т笟浼佷笟鐢熶骇鍜屾湇鍔′笟鍔℃儏鍐垫姤琛�" NavigateUrl="ZHGL/Environmental/ProjectEnergyReport.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="9BEB66C0-E6DE-44DD-94F6-5C7433E6DE62" Text="椤圭洰HSE鎬荤粨" NavigateUrl="HSSE/ActionPlan/ActionPlanSummary.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
index b34c5503..f12d5412 100644
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@@ -22,4 +22,6 @@
 <TreeNode id="7EC1FBAF-BEC9-46CD-9E3B-0D0093B4E1C2" Text="浠〃瀹屾垚鎯呭喌" NavigateUrl="JDGL/Check/MeterCompletion.aspx"></TreeNode>
 <TreeNode id="C7037A5D-D8A6-4C1C-A5B8-2083C31C0A7B" Text="鍏ㄥ巶鍦颁笅绠＄綉瀹屾垚鎯呭喌" NavigateUrl="JDGL/Check/UndergroundPipeCompletion.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="1FBC729D-0A8E-423C-B133-B64583BF9611" Text="杩涘害杞欢锛堟柊锛�" NavigateUrl=""><TreeNode id="368DB90C-8A47-44F7-A69A-D2D60A6E338C" Text="璐圭敤椤硅鍓�" NavigateUrl="JDGL/Progress/WbsManager.aspx"></TreeNode>
+</TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
index 2bd64fa5..2b9b3fb8 100644
--- a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
@@ -1,7 +1,15 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="0BEA2126-7A48-40EB-8E21-99148E91A22B" Text="鍏抽敭浜嬮」" NavigateUrl="PZHGL/GJSX/GJSXList.aspx">
-  </TreeNode>
-<TreeNode id="5F3B18D6-9FBA-4EF5-A7E4-DC9F6A4EA680" Text="鍏抽敭浜嬮」鏌ヨ" NavigateUrl="PZHGL/GJSX/GJSXFind.aspx"></TreeNode>
-<TreeNode id="CAA875A7-089B-4B79-87CE-742FDFD9DE43" Text="鍏抽敭浜嬮」缁熻" NavigateUrl="PZHGL/GJSX/GJSXInfoCount.aspx"></TreeNode>
+  <TreeNode id="168A94C7-E37D-4B9C-8684-51DF4F8C5134" Text="鍏抽敭浜嬮」锛堝唴閮級" NavigateUrl="">
+    <TreeNode id="0BEA2126-7A48-40EB-8E21-99148E91A22B" Text="鎴戝垱寤虹殑" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=0">
+    </TreeNode>
+<TreeNode id="4A9E60ED-24FF-4410-B3B7-2A5079615A78" Text="寰呮垜澶勭悊" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=1"></TreeNode>
+<TreeNode id="BEF7850D-1BA5-45F9-BD40-E52F6D813E7C" Text="鎴戝凡澶勭悊" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=2"></TreeNode>
+<TreeNode id="3C129205-F6A9-480D-B36C-E35DED5D7CEC" Text="鎴戝弬涓庣殑" NavigateUrl="PZHGL/GJSX/GJSXList.aspx?classify=3"></TreeNode>
+</TreeNode>
+<TreeNode id="42791ACB-7C72-481F-B1ED-158C7141522C" Text="鍗忚皟娌熼�氾紙澶栭儴锛�" NavigateUrl=""><TreeNode id="609F0D64-ABB8-4F5C-9646-FC1DFC8BAB85" Text="鎴戝垱寤虹殑" NavigateUrl="DocManage/DocManage.aspx?classify=0"></TreeNode>
+<TreeNode id="2FEF98BD-DBBD-4ADA-B600-18D3C113B22A" Text="寰呮垜澶勭悊" NavigateUrl="DocManage/DocManage.aspx?classify=1"></TreeNode>
+<TreeNode id="5BDEEA43-FFD7-4AEB-B760-24E70009EA0C" Text="鎴戝凡澶勭悊" NavigateUrl="DocManage/DocManage.aspx?classify=2"></TreeNode>
+<TreeNode id="58B45CA6-AFFB-4624-80C6-F70C1A54FBE2" Text="鎴戝弬涓庣殑" NavigateUrl="DocManage/DocManage.aspx?classify=3"></TreeNode>
+</TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_Project.xml b/SGGL/FineUIPro.Web/common/Menu_Project.xml
index 0dc9c199..1999ded1 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Project.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Project.xml
@@ -2,5 +2,4 @@
 <Tree>
   <TreeNode id="B95DF6F0-EB0C-4120-BD56-A4453AB42059" Text="椤圭洰鍒楄〃" NavigateUrl="ProjectData/ProjectList.aspx">
   </TreeNode>
-<TreeNode id="CD167198-1667-4552-9876-E768C2542C30" Text="瀹炰笟淇℃伅" NavigateUrl="BaseInfo/BaseFactory.aspx"></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index 1c0402e8..4056ca52 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -24,11 +24,11 @@
 <TreeNode id="8EB88D36-5B13-4F41-8FE8-D66BCA08439D" Text="寮�杞︽柟妗堢鐞�" NavigateUrl=""><TreeNode id="CAA63693-5D41-4018-9FF7-AAB311E6D8E0" Text="寮�杞︽柟妗堢鐞�" NavigateUrl="TestRun/DriverScheme.aspx"></TreeNode>
 <TreeNode id="94E11762-49CB-4116-9B28-6927BDC59D31" Text="寮�杞︽柟妗堢粺璁�" NavigateUrl="TestRun/DriverSchemeChart.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="2BF9C16D-536F-4F89-AA59-49ED1A1A164C" Text="寮�杞﹁繘搴︾鐞�" NavigateUrl=""><TreeNode id="EE7E37CA-384F-41B3-BAEE-89CBD9954AB3" Text="棰勮瘯杞﹁繘搴�" NavigateUrl="TestRun/Report/PreRunSchedule.aspx"></TreeNode>
+<TreeNode id="2BF9C16D-536F-4F89-AA59-49ED1A1A164C" Text="寮�杞﹁繘搴︾鐞�" NavigateUrl=""><TreeNode id="BC860C85-B224-48A6-B207-D7042BB71088" Text="寮�杞﹁繘搴︾鐞�" NavigateUrl="TestRun/DriverProgress.aspx"></TreeNode>
+<TreeNode id="EE7E37CA-384F-41B3-BAEE-89CBD9954AB3" Text="棰勮瘯杞﹁繘搴�" NavigateUrl="TestRun/Report/PreRunSchedule.aspx"></TreeNode>
 <TreeNode id="E9EF7C6D-7F0A-4FBA-8A79-474D4E61AF27" Text="涓夋煡鍥涘畾杩涘害" NavigateUrl="TestRun/Report/FourDecisionSchedule.aspx"></TreeNode>
 <TreeNode id="9ACDF513-BD63-48F5-BFA3-B9B1B7FA19E1" Text="璇曡溅杩涘害" NavigateUrl="TestRun/Report/TestRunSchedule.aspx"></TreeNode>
 <TreeNode id="3D554109-D95F-4051-8A6C-5616A7A95C94" Text="棣栭〉杩涘害璁剧疆" NavigateUrl="TestRun/Report/ScheduleSetUp.aspx"></TreeNode>
-<TreeNode id="BC860C85-B224-48A6-B207-D7042BB71088" Text="寮�杞﹁繘搴︾鐞�" NavigateUrl="TestRun/DriverProgress.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="4C6A8C24-6E2E-401A-90E1-128FAA1B8AA8" Text="寮�杞SE绠＄悊" NavigateUrl=""><TreeNode id="568F061C-5BD2-40B1-86E5-C49C2057AD9B" Text="寮�杞SE鎺柦鏂规" NavigateUrl="TestRun/DriverHse/HseMeasure.aspx"></TreeNode>
 <TreeNode id="1648A5CD-CF78-418B-9CF1-6325C353BDB8" Text="寮�杞﹀嵄闄╂簮娓呭崟" NavigateUrl="TestRun/DriverHse/HseHazard.aspx"></TreeNode>
@@ -41,7 +41,7 @@
 <TreeNode id="AD6E08B6-5571-4FFB-BDBE-9E6811770BD6" Text="棰勮瘯杞︾鐞�" NavigateUrl=""><TreeNode id="5C07E135-C3AB-4CE4-97A2-C79970640272" Text="绯荤粺鍒掑垎" NavigateUrl="TestRun/BeforeTestRun/DeviceRun.aspx"></TreeNode>
 <TreeNode id="B4702BFB-8CEB-46AD-BDC0-751D146FE228" Text="宸ヤ綔鍖呰缃�" NavigateUrl="TestRun/BeforeTestRun/SetWorkPackage.aspx"></TreeNode>
 <TreeNode id="34719347-E5EE-4491-9E92-B1270C187C7F" Text="宸ヤ綔鍖呰鍓�" NavigateUrl="TestRun/BeforeTestRun/SubSysWorkPackage.aspx"></TreeNode>
-<TreeNode id="F0E06491-B1DA-4510-ABCA-D09F4B24EE50" Text="绠￠亾鍜岃澶囧鍏�" NavigateUrl="TestRun/BeforeTestRun/SysPipingDeviceImport.aspx"></TreeNode>
+<TreeNode id="F0E06491-B1DA-4510-ABCA-D09F4B24EE50" Text="绯荤粺璧勪骇瀵煎叆" NavigateUrl="TestRun/BeforeTestRun/SysPipingDeviceImport.aspx"></TreeNode>
 <TreeNode id="3B60BB5F-A000-40FC-9C7F-D4AE28EB2EB3" Text="妫�鏌ヨ〃妯℃澘" NavigateUrl="TestRun/BeforeTestRun/InspectTemplate.aspx"></TreeNode>
 <TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="鐢熸垚宸ヤ綔鍖呮鏌ヨ〃" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="妫�鏌ヨ〃鏉′欢纭" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
@@ -80,7 +80,7 @@
 <TreeNode id="7081E94C-6A73-40A7-A72A-A13CDB7B5420" Text="妫�鏌ヨ〃娴佽浆鍏ㄩ儴閫氳繃" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="6ED76128-1E03-4B65-B474-BF84C536D027" Text="鐜板満瀹炴柦" NavigateUrl="TestRun/TestRunManage/SiteImplementationList.aspx"></TreeNode>
 <TreeNode id="2A441F42-57EF-4480-911A-1E17815C1B6B" Text="璇曡溅璁板綍涓婁紶" NavigateUrl="TestRun/TestRunManage/TestRunRecordUploadList.aspx"></TreeNode>
-<TreeNode id="29F80818-17A5-4BC0-8C38-A17415B0AC83" Text="璇曡溅绠＄悊" NavigateUrl="TestRun/TestRun.aspx"></TreeNode>
+<TreeNode id="29F80818-17A5-4BC0-8C38-A17415B0AC83" Text="璇曡溅璁板綍绠＄悊" NavigateUrl="TestRun/TestRun.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="81CE1758-5BBC-4709-AF4B-DDF6CB345571" Text="鎶曟枡璇曡溅绠＄悊" NavigateUrl=""><TreeNode id="B148D864-DA22-43C5-8D52-F38C0D34C7D5" Text="妫�鏌ヨ〃妯℃澘" NavigateUrl="TestRun/Feeding/InspectTemplate.aspx"></TreeNode>
 <TreeNode id="AB9AD56B-574E-41DC-8E89-5982A287C358" Text="鎶曟枡璇曡溅绠＄悊" NavigateUrl="TestRun/Feeding/SubInspectTerm.aspx"></TreeNode>
@@ -90,7 +90,7 @@
 <TreeNode id="0AC1D5B3-9E0B-4AC4-BB24-0A9F3953316C" Text="灏鹃」瀹℃牳" NavigateUrl="TestRun/Feeding/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="81162C96-2E10-4936-A2AD-B221B7966C85" Text="妫�鏌ヨ〃浼氱" NavigateUrl="TestRun/Feeding/InspectWanderAboutList.aspx"></TreeNode>
 <TreeNode id="0BF6BC64-8F72-47EA-A5B9-60ACC14619AC" Text="妫�鏌ヨ〃娴佽浆鍏ㄩ儴閫氳繃" NavigateUrl="TestRun/Feeding/InspectWanderAboutAllPassList.aspx"></TreeNode>
-<TreeNode id="B62482DA-9A12-45AC-9427-D0CF8A78EE2C" Text="鎶曟枡璇曡溅绠＄悊" NavigateUrl="TestRun/FeedingTestRun.aspx"></TreeNode>
+<TreeNode id="B62482DA-9A12-45AC-9427-D0CF8A78EE2C" Text="鎶曟枡璇曡溅璁板綍绠＄悊" NavigateUrl="TestRun/FeedingTestRun.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="110E8BDB-8121-4C5B-A3C3-AF2B34B1B29B" Text="鐢熶骇璇曡繍琛岀鐞�" NavigateUrl=""><TreeNode id="2590BA0B-3B56-4F8A-8EB8-2D047EF90753" Text="杩愯鏃ュ織绠＄悊" NavigateUrl="TestRun/ProduceTestRun/RunningLogManagementList.aspx"></TreeNode>
 <TreeNode id="8267F210-A313-44CC-9A89-631B3FC91ED0" Text="杩愯鎶ヨ〃绠＄悊" NavigateUrl="TestRun/ProduceTestRun/TestRunReport.aspx"></TreeNode>
@@ -123,6 +123,6 @@
 </TreeNode>
 <TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="椤圭洰寮�杞︽�荤粨" NavigateUrl=""><TreeNode id="9B32C4BF-62E9-4561-8632-97AC0F581701" Text="鏈堟妧鏈�荤粨" NavigateUrl="TestRun/DriverSummary/MonthSummary.aspx"></TreeNode>
 <TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="涓撻」鎬荤粨" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
-<TreeNode id="9EBA628D-E725-4A0B-B765-171F405D0821" Text="瀹屽伐鍚庝釜浜烘�荤粨" NavigateUrl="TestRun/DriverSummary/PersonalSummary.aspx"></TreeNode>
+<TreeNode id="9EBA628D-E725-4A0B-B765-171F405D0821" Text="寮�杞﹀伐绋嬪笀椤圭洰宸ヤ綔鎬荤粨" NavigateUrl="TestRun/DriverSummary/PersonalSummary.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index e5eca709..283e3429 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -1,21 +1,19 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="宸ヨ壓绯荤粺娓呭崟&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
+  <TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="宸ヨ壓绯荤粺娓呭崟" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
   </TreeNode>
-<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="闈炲伐鑹虹郴缁熸竻鍗�&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Non-Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
-<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="绉讳氦鍥捐〃" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="灏鹃」瀹屾垚缁熻琛�&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Punchlist Completion Table" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
-<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="绉讳氦缁熻琛�&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Table" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
-<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="绉讳氦缁熻鍥捐〃&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Chart" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
-<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="绉讳氦鐘舵�佹眹鎬昏〃&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Summary Table" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
+<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="闈炲伐鑹虹郴缁熸竻鍗�" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
+<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="绉讳氦鍥捐〃" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="灏鹃」瀹屾垚缁熻琛�" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
+<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="绉讳氦缁熻琛�" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
+<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="绉讳氦缁熻鍥捐〃" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
+<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="绉讳氦鐘舵�佹眹鎬昏〃" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="绠￠亾&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
-<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="闈欒澶�&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
-<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="鍔ㄨ澶�&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
-<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="浠〃&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
-<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="鐢垫皵&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
-<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="鍦熷缓/寤虹瓚/缁撴瀯&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
-<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="娑堥槻&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
-<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="鐢典俊&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
-<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="鍦扮&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
-<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="灏鹃」绠＄悊&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Punch List Form" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
+<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="绠￠亾" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
+<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="闈欒澶�" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
+<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="鍔ㄨ澶�" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
+<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="浠〃" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
+<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="鐢垫皵" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
+<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="鍦熷缓/寤虹瓚/缁撴瀯" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
+<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="鐢典俊" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
+<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="灏鹃」绠＄悊" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index cc7e0f27..53012cf7 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -27,6 +27,8 @@
 <TreeNode id="ECDD89AC-1E16-4D82-B3BE-5D62F31B7A14" Text="鍖栧伐琛屼笟鑳芥簮鑺傜害涓庣敓鎬佺幆澧冧繚鎶ゆ眹鎬昏〃" NavigateUrl="ZHGL/Environmental/ChemicalReport.aspx"></TreeNode>
 <TreeNode id="7652D239-1897-4886-8DF2-B71E3B060D21" Text="涓ぎ浼佷笟鑺傝兘鐜繚浜т笟浼佷笟鍩烘湰鎯呭喌鍜岀粡钀ユ儏鍐垫姤琛�" NavigateUrl="ZHGL/Environmental/OperationReport.aspx"></TreeNode>
 <TreeNode id="30579BFE-AB4B-49A7-A73D-B7CE902A8B69" Text="涓ぎ浼佷笟鑺傝兘鐜繚浜т笟浼佷笟鐢熶骇鍜屾湇鍔′笟鍔℃儏鍐垫姤琛�" NavigateUrl="ZHGL/Environmental/EnergyReport.aspx"></TreeNode>
+<TreeNode id="CB76394B-BDEB-4F45-9D19-F38612DC6591" Text="涓ぎ浼佷笟瀹夊叏鐢熶骇娌绘湰鏀诲潥涓夊勾琛屽姩宸ヤ綔鍙拌处" NavigateUrl="ZHGL/Information/ActionWorkLedger.aspx"></TreeNode>
+<TreeNode id="C48087A8-4C9F-485D-B0A4-C85E112BA705" Text="涓ぎ浼佷笟瀹夊叏鐢熶骇绠＄悊璇勪环宸ヤ綔璋冨害鍙拌处" NavigateUrl="ZHGL/Information/SafetyProductionEvaluation.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="C0F4A4A5-D5D3-4952-9A90-9B27F5FA9DFA" Text="瀹夊叏淇℃伅鍒嗘瀽" NavigateUrl=""><TreeNode id="598568A0-A338-499F-888C-1B73665837F9" Text="浜哄伐鏃惰垂鐢ㄥ垎鏋�" NavigateUrl="ZHGL/Information/AnalyseWorkTimeCost.aspx"></TreeNode>
 <TreeNode id="8396C9E2-3376-4144-978A-CC6041EC6C6A" Text="瀹夊叏浜嬫晠鍒嗘瀽" NavigateUrl="ZHGL/Information/AnalyseSafeAccident.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/PageBase.cs b/SGGL/FineUIPro.Web/common/PageBase.cs
index 420feb8d..4a4518af 100644
--- a/SGGL/FineUIPro.Web/common/PageBase.cs
+++ b/SGGL/FineUIPro.Web/common/PageBase.cs
@@ -11,6 +11,7 @@ using System.Reflection;
 using System.Text;
 using System.Web;
 using System.Web.UI;
+using static FineUIPro.Web.CQMS.Performance.Performance;
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web
@@ -1012,7 +1013,7 @@ namespace FineUIPro.Web
                     {
                         html = (row.FindControl("lbCheckManNames") as AspNet.Label).Text;
                     }
-                    if (column.ColumnID== "tfCM")
+                    if (column.ColumnID == "tfCM")
                     {
                         html = (row.FindControl("lblCM") as AspNet.Label).Text;
                     }
@@ -1195,6 +1196,80 @@ namespace FineUIPro.Web
 
             return sb.ToString();
         }
+
+        /// <summary>
+        /// 澶氳〃澶村鍑烘柟娉�
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        public string GetGridMultiHeaderTableHtml(Grid grid)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            //sb.Append("<tr>");
+            //foreach (GridColumn column in grid.Columns)
+            //{
+            //    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+            //    {
+            //        sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+            //    }
+            //}
+            //sb.Append("</tr>");
+            MultiHeaderTable mht = new MultiHeaderTable();
+            mht.ResolveMultiHeaderTable(grid.Columns);
+
+            foreach (List<object[]> rows in mht.MultiTable)
+            {
+                sb.Append("<tr>");
+                foreach (object[] cell in rows)
+                {
+                    int rowspan = Convert.ToInt32(cell[0]);
+                    int colspan = Convert.ToInt32(cell[1]);
+                    GridColumn column = cell[2] as GridColumn;
+                    if (column.Hidden == false)
+                    {
+                        sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
+                        rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
+                        colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
+                        colspan != 1 ? " style=\"text-align:center;\"" : "",
+                        column.HeaderText);
+                    }
+                }
+                sb.Append("</tr>");
+            }
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                //if (row.Grid.gr.Hidden == false) { 
+                foreach (GridColumn column in mht.Columns)
+                {
+                    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+                    {
+                        string html = row.Values[column.ColumnIndex].ToString();
+
+                        if (column.ColumnID == "tfPageIndex")
+                        {
+                            html = (row.FindControl("lblPageIndex") as AspNet.Label).Text;
+                        }
+
+                        else if (column.ColumnID == "Count4")
+                        {
+                            html = (row.FindControl("Label5") as AspNet.Label).Text;
+                        }
+
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                }
+                //}
+                sb.Append("</tr>");
+            }
+
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+
         #endregion
 
         #region 鏍规嵁韬唤璇佸彿鐮佽幏鍙栧勾榫�
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
index b51ff853..44a11776 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_CQMS.aspx.cs
@@ -333,50 +333,100 @@ namespace FineUIPro.Web
                 Model.BusinessColumn businessColumn = new Model.BusinessColumn();
                 List<string> listCategories = new List<string>();
                 businessColumn.title = "璐ㄩ噺涓�娆″悎鏍肩巼";
-                var cns = BLL.CNProfessionalService.GetList();
-                Model.SGGLDB db = Funs.DB;
-                List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
-                                                                                           where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
-                                                                                           select x).ToList();
-                List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
-                                                                                         where x.ProjectId == this.CurrUser.LoginProjectId
-                                                                                         select x).ToList();
-                Model.SingleSerie s = new Model.SingleSerie();
-                Model.SingleSerie s2 = new Model.SingleSerie();
-                List<double> listdata = new List<double>();
-                List<double> listdata2 = new List<double>();
-                double result = 0, result2 = 0;
-                foreach (var cn in cns)
+
+                //涓撲笟娴嬭瘯闃舵锛屼粎hfnbd浣跨敤
+                if (this.CurrUser.UserId == BLL.Const.hfnbdId)
                 {
-                    listCategories.Add(cn.ProfessionalName);
-                    var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
-                    var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
-                    if (okChecks.Count > 0 && totalChecks.Count > 0)
+                    var cns = BLL.CNProfessionalService.GetCnProList();
+                    Model.SGGLDB db = Funs.DB;
+                    List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
+                                                                                               where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
+                                                                                               select x).ToList();
+                    List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
+                                                                                             where x.ProjectId == this.CurrUser.LoginProjectId
+                                                                                             select x).ToList();
+                    Model.SingleSerie s = new Model.SingleSerie();
+                    Model.SingleSerie s2 = new Model.SingleSerie();
+                    List<double> listdata = new List<double>();
+                    List<double> listdata2 = new List<double>();
+                    double result = 0, result2 = 0;
+                    foreach (var cn in cns)
                     {
-                        var a = Convert.ToDouble(okChecks.Count);
-                        var b = Convert.ToDouble(totalChecks.Count);
-                        result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
-                    }
-                    if (cn.ProfessionalName.Contains("绠￠亾"))
-                    {
-                        var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "宸ヨ壓绠￠亾" && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault();
-                        if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
+                        listCategories.Add(cn.DetectionItems);
+                        var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.ControlId).ToList();
+                        var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.ControlId).ToList();
+                        if (okChecks.Count > 0 && totalChecks.Count > 0)
                         {
-                            result2 = Convert.ToDouble(ndtList.TotalRate);
+                            var a = Convert.ToDouble(okChecks.Count);
+                            var b = Convert.ToDouble(totalChecks.Count);
+                            result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
                         }
+                        if (cn.DetectionItems.Contains("绠￠亾"))
+                        {
+                            var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "宸ヨ壓绠￠亾" && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault();
+                            if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
+                            {
+                                result2 = Convert.ToDouble(ndtList.TotalRate);
+                            }
+                        }
+                        listdata.Add(result);
+                        listdata2.Add(result2);
+                        result = 0;
+                        result2 = 0;
                     }
-                    listdata.Add(result);
-                    listdata2.Add(result2);
-                    result = 0;
-                    result2 = 0;
+                    s.data = listdata;
+                    s2.data = listdata2;
+                    series.Add(s);
+                    series.Add(s2);
+                }
+                else
+                {
+                    var cns = BLL.CNProfessionalService.GetList();
+                    Model.SGGLDB db = Funs.DB;
+                    List<Model.ProcessControl_InspectionManagement> TotalCheckDetailOKLists = (from x in db.ProcessControl_InspectionManagement
+                                                                                               where x.ProjectId == this.CurrUser.LoginProjectId && x.IsOnceQualified == true
+                                                                                               select x).ToList();
+                    List<Model.ProcessControl_InspectionManagement> TotalCheckDetailLists = (from x in db.ProcessControl_InspectionManagement
+                                                                                             where x.ProjectId == this.CurrUser.LoginProjectId
+                                                                                             select x).ToList();
+                    Model.SingleSerie s = new Model.SingleSerie();
+                    Model.SingleSerie s2 = new Model.SingleSerie();
+                    List<double> listdata = new List<double>();
+                    List<double> listdata2 = new List<double>();
+                    double result = 0, result2 = 0;
+                    foreach (var cn in cns)
+                    {
+                        listCategories.Add(cn.ProfessionalName);
+                        var okChecks = TotalCheckDetailOKLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
+                        var totalChecks = TotalCheckDetailLists.Where(x => x.CNProfessionalId == cn.CNProfessionalId).ToList();
+                        if (okChecks.Count > 0 && totalChecks.Count > 0)
+                        {
+                            var a = Convert.ToDouble(okChecks.Count);
+                            var b = Convert.ToDouble(totalChecks.Count);
+                            result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 1));
+                        }
+                        if (cn.ProfessionalName.Contains("绠￠亾"))
+                        {
+                            var ndtList = (from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "宸ヨ壓绠￠亾" && x.ProjectId == this.CurrUser.LoginProjectId orderby x.CreateDate descending select x).FirstOrDefault();
+                            if (ndtList != null && !string.IsNullOrEmpty(ndtList.TotalRate))
+                            {
+                                result2 = Convert.ToDouble(ndtList.TotalRate);
+                            }
+                        }
+                        listdata.Add(result);
+                        listdata2.Add(result2);
+                        result = 0;
+                        result2 = 0;
+                    }
+                    s.data = listdata;
+                    s2.data = listdata2;
+                    series.Add(s);
+                    series.Add(s2);
                 }
-                s.data = listdata;
-                s2.data = listdata2;
-                series.Add(s);
-                series.Add(s2);
                 businessColumn.categories = listCategories;
                 businessColumn.series = series;
                 return JsonConvert.SerializeObject(businessColumn);
+
             }
         }
 
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
index 2a96bab5..6857d2ba 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx
@@ -404,7 +404,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 },
                 axisLabel: {
                     show: true,
-                    interval: 0,
+                    /*interval: 0,*/
                     textStyle: {
                         color: 'rgba(255, 255, 255, 0.8)'
                     }
@@ -461,7 +461,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
     },{
         name: '褰撴湀浜哄伐鏃�',
             type: 'bar',
-          barWidth: 40,
+        /*  barWidth: 40,*/
         data: two.series[1].data
     }]
     category_Two('two', xArr, data)
@@ -688,7 +688,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
                 },
                 axisLabel: {
                     show: true,
-                    interval: 0,
+                    /*interval: 0,*/
                     fontSize:10,
                     rotate: 15,
                     textStyle: {
@@ -748,7 +748,7 @@ var basePath = '<%= ResolveUrl("~/") %>';
     },{
         name: '褰撴湀',
            type: 'bar',
-          barWidth: 30,
+       /*   barWidth: 30,*/
         data: five.series[0].data
     }]
 
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
index cb378079..2da6f6d8 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx
@@ -68,6 +68,11 @@
         .tab .t-item {
             font-size: 13px;
         }
+
+        .bw-item-content {
+            overflow: hidden;
+            overflow-y: scroll;
+        }
     </style>
 </head>
 <body>
@@ -111,16 +116,16 @@
                         <div class="bw-b-bottom-up">
                             <div class="tab-wrap" style="left: 20px">
                                 <div class="tab" style="border: 0; box-shadow: none;">
-                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">鎶曟枡璇曡溅杩涘害</div>
+                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="tlscNum" runat="server">鎶曟枡璇曡溅杩涘害</div>
                                 </div>
                             </div>
                             <div class="tab-wrap">
                                 <div class="tab" data-value="1">
-                                    <div class="t-item" style="background-color: #B3764D">鏈姇鏂�</div>
+                                    <div class="t-item" style="background-color: #DD226D">鏈姇鏂�</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #DD226D">鎶曟枡涓�</div>
+                                    <div class="t-item" style="background-color: #57C43C">鎶曟枡涓�</div>
                                     <div class="spline"></div>
-                                    <div class="t-item" style="background-color: #57C43C">鎶曟枡瀹屾垚</div>
+                                    <div class="t-item" style="background-color: #B3764D">鎶曟枡瀹屾垚</div>
                                 </div>
                             </div>
                             <div class="bw-item-content">
@@ -138,7 +143,7 @@
                         <div class="bw-b-bottom-up">
                             <div class="tab-wrap" style="left: 20px">
                                 <div class="tab" style="border: 0; box-shadow: none;">
-                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff">璇曡繍琛岃繘搴�</div>
+                                    <div class="t-item" style="font-size: 16px; font-weight: normal; color: #fff" id="syxNum" runat="server">璇曡繍琛岃繘搴�</div>
                                 </div>
                             </div>
                             <div class="tab-wrap">
@@ -487,7 +492,7 @@
     var threeData = JSON.parse(fourDecisionStr);
     var threewidth = Math.floor(100 / threeData.length);
     $.each(threeData, function (index, item) {
-        $("#three").append("<div id='three" + index + "' style='width:" + threewidth + "%; height:100%; display:inline-block'></div>");
+        $("#three").append("<div id='three" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
     });
 
     //鍥�4
@@ -495,7 +500,7 @@
     var fourData = JSON.parse(fourStr);
     var fourwidth = Math.floor(100 / (fourData.length / 2));
     $.each(fourData, function (index, item) {
-        $("#four").append("<div id='four" + index + "' style='width:" + fourwidth + "%; height:50%; display:inline-block'></div>");
+        $("#four").append("<div id='four" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
     });
 
     //鍥�5
@@ -503,7 +508,7 @@
     var fiveData = JSON.parse(fiveStr);
     var fivewidth = Math.floor(100 / (fiveData.length / 2));
     $.each(fourData, function (index, item) {
-        $("#five").append("<div id='five" + index + "' style='width:" + fivewidth + "%; height:50%; display:inline-block'></div>");
+        $("#five").append("<div id='five" + index + "' style='width:129px; height:148px; display:inline-block'></div>");
     });
 
     //鍥�6
@@ -816,19 +821,26 @@
             //if (item.RunType == 3) {
             //    colorData = ["#CCCC33", "#8FCC33", "#57C43C", "#22DD48"];
             //}
-            var colorData = ["#7A7AA7", "#5656CC", "#3939E9", "#2222FF"];
+            var colorData = ["#DD226D", "#DD226D", "#DD226D", "#DD226D"];
             if (item.RunType == 2) {
-                colorData = ["#DD226D", "#DD226D", "#E95B39", "#DD226D"];
+                colorData = ["#57C43C", "#57C43C", "#57C43C", "#57C43C"];
             }
             if (item.RunType == 3) {
-                colorData = ["#3fbb6a", "#3fbb6a", "#3fbb6a", "#3fbb6a"];
+                colorData = ["#B3764D", "#B3764D", "#B3764D", "#B3764D"];
             }
             var chart = echarts.init(document.getElementById('four' + index));
             var value = 100;
+
+            //鍚嶇О
+            var sname = item.SystemName;
+            var index = sname.indexOf(" ")
+            if (index!=-1) {
+                sname = sname.substring(0, index) + "\n" + sname.substring(index + 1, sname.length);
+            }
             option = {
                 backgroundColor: '000',
                 title: {
-                    text: `` + item.SystemName,
+                    text: `` + sname,
                     subtext: item.RunType == 1 ? "鏈姇鏂�" : item.RunType == 2 ? "鎶曟枡涓�" : "鎶曟枡瀹屾垚",
                     left: 'center',
                     top: '45%', //top寰呰皟鏁�
@@ -926,10 +938,17 @@
             }
             var chart = echarts.init(document.getElementById('five' + index));
             var value = 100;
+            //鍚嶇О
+            var sname = item.SystemName;
+            var index = sname.indexOf(" ")
+            if (index != -1) {
+                sname = sname.substring(0, index) + "\n" + sname.substring(index + 1, sname.length);
+            }
+
             option = {
                 backgroundColor: '000',
                 title: {
-                    text: `` + item.SystemName,
+                    text: sname,
                     subtext: item.RunType == 1 ? "鏈繍琛�" : item.RunType == 2 ? "杩愯涓�" : "鍋滆溅妫�淇�",
                     left: 'center',
                     top: '45%', //top寰呰皟鏁�
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
index cf3c7de1..852e9f59 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.cs
@@ -290,6 +290,7 @@ namespace FineUIPro.Web
                         InstallationName = item.InstallationName
                     });
                 }
+                tlscNum.InnerHtml = "鎶曟枡璇曡溅杩涘害(" + result.Count.ToString() + ")";
                 feedingRunStr = JsonConvert.SerializeObject(result);
             }
         }
@@ -312,6 +313,7 @@ namespace FineUIPro.Web
                         InstallationName = item.InstallationName
                     });
                 }
+                syxNum.InnerHtml = "璇曡繍琛岃繘搴�(" + result.Count.ToString() + ")";
                 productsStr = JsonConvert.SerializeObject(result);
             }
         }
diff --git a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs
index 93b106a6..47b3add2 100644
--- a/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/common/mainMenu_TestRun.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class mainMenu_TestRun {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class mainMenu_TestRun
+    {
+
         /// <summary>
         /// Head1 鎺т欢銆�
         /// </summary>
@@ -20,5 +22,23 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+        /// <summary>
+        /// tlscNum 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl tlscNum;
+
+        /// <summary>
+        /// syxNum 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl syxNum;
     }
 }
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx b/SGGL/FineUIPro.Web/common/mainProject2.aspx
index 2fb63341..7587e2f2 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx
@@ -310,7 +310,8 @@
                         杩涘害缁熻
                     </div>
                     <div class="main">
-                        <div id="aq-map"></div>
+                       <%-- <div id="aq-map"></div>--%>
+                        <div id='left_one' style="width: 100%; height: 100%;"></div>
                     </div>
                 </div>
             </div>
@@ -1204,7 +1205,7 @@
 
 
 </script>
-<script>
+<%--<script>
     function line(id, xArr, data) {
         // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
         var myChart = echarts.init(document.getElementById(id))
@@ -1341,7 +1342,7 @@
     line('left_one', xArr1, data1)
     }
    
-</script>
+</script>--%>
 <script>
     function category(id, xArr, series) {
         // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
@@ -1598,7 +1599,7 @@
 
 
     // 瀹夊叏缁熻
-    createAQTJ()
+   <%-- createAQTJ()
     function createAQTJ() {
         var two =<%=Two %>;
         console.log("瀹夊叏缁熻", two)
@@ -1775,7 +1776,7 @@
         };
         var myEchart = echarts.init(document.getElementById('aq-map'));
         myEchart.setOption(opt);
-    }
+    }--%>
 
     // 璐ㄩ噺姒傚喌
  <%--   let weekData = [
@@ -2188,3 +2189,160 @@
     }
 </script>
 
+<script type="text/javascript">
+    function line(id, xArr, data) {
+        // 鍩轰簬鍑嗗濂界殑dom锛屽垵濮嬪寲echarts瀹炰緥
+        var myChart = echarts.init(document.getElementById(id))
+        // 鎸囧畾鍥捐〃鐨勯厤缃」鍜屾暟鎹�
+        var option = {
+            title: {
+                left: 'center',
+                text: ' ',
+                textStyle: {
+                    color: '#fff',
+                    fontSize: 12,
+                    fontWeight: '300'
+                },
+                show: false
+            },
+            tooltip: {
+                formatter: '{a}<br />{b}: {c}%'
+            },
+            legend: {
+                show: true,
+                textStyle: {
+                    color: '#fff'
+                },
+                left: 0
+            },
+            xAxis: {
+                axisTick: {
+                    show: false
+                },
+                axisLine: {
+                    lineStyle: {
+                        color: 'rgba(255, 255, 255, 0.3)'
+                    }
+                },
+                axisLabel: {
+                    show: true,
+                    textStyle: {
+                        color: 'rgba(255, 255, 255, 0.8)'
+                    }
+                },
+                type: 'category',
+                data: xArr
+            },
+            yAxis: {
+                axisTick: {
+                    show: false
+                },
+                axisLine: {
+                    show: false,
+                    lineStyle: {
+                        color: 'rgba(255, 255, 255, 0.3)'
+                    }
+                },
+                axisLabel: {
+                    show: true,
+                    textStyle: {
+                        color: 'rgba(255, 255, 255, 0.8)'
+                    },
+                    formatter: '{value} %'
+                }
+            },
+            series: data,
+            grid: {
+                top: '15%',
+                left: '10',
+                right: '10',
+                bottom: '0%',
+                containLabel: true,
+                backgroundColor: 'rgba(0,162,233, 0.01)',
+                // borderColor: 'rgba(0,162,233, 1)'
+            },
+            itemStyle: {
+                //color: 'rgba(200,201,10, 1)'
+                //normal: {
+                //    label: {
+                //        show: false
+                //    }
+                //}
+            },
+            backgroundColor: 'rgba(0,162,233, 0.01)',
+            textStyle: {
+                color: 'rgba(255, 255, 255, 0.3)'
+            }
+        }
+
+        // 浣跨敤鍒氭寚瀹氱殑閰嶇疆椤瑰拰鏁版嵁鏄剧ず鍥捐〃銆�
+        myChart.setOption(option)
+    }
+    //var two = { "title": "璧㈠緱鍊兼洸绾�", "xFontNum": 0, "legend": null, "categories": ["2020-07", "2020-08", "2020-09", "2020-10", "2020-11", "2020-12", "2021-01", "2021-02"], "series": [{ "name": null, "type": null, "data": [5.0, 2.0, 0.0, 1.0, 4.0, 8.0, 2.0, 3.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [8.0, 12.0, 4.0, 9.0, 10.0, 2.0, 3.0, 3.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [12.0, 2.0, 5.0, 10.0, 3.0, 3.0, 8.0, 10.0], "dataString": null, "dataObject": null }, { "name": null, "type": null, "data": [4.0, 3.0, 14.0, 8.0, 10.0, 3.0, 5.0, 10.0], "dataString": null, "dataObject": null }], "series2": null };
+    var two =<%=Tree %>
+    var xArr1 = two.categories
+    var data1 = [{
+        name: '璁″垝鍊�',
+        type: 'bar',
+        //smooth: true,
+        data: two.series[0].data,
+        label: { //鏌变綋涓婃樉绀烘暟鍊�
+            show: false,//寮�鍚樉绀�
+            position: 'top',//鍦ㄤ笂鏂规樉绀�
+            textStyle: {//鏁板�兼牱寮�
+                fontSize: '20px',
+                color: '#fff'
+            },
+            formatter: '{c}',
+        },
+        lineStyle: {
+            //color: 'rgba(200,201,10, 1)'
+        }
+    }, {
+        name: '瀹為檯鍊�',
+        type: 'bar',
+        //smooth: true,
+        data: two.series[2].data,
+        label: { //鏌变綋涓婃樉绀烘暟鍊�
+            show: false,//寮�鍚樉绀�
+            position: 'top',//鍦ㄤ笂鏂规樉绀�
+            textStyle: {//鏁板�兼牱寮�
+                fontSize: '20px',
+                color: '#fff'
+            },
+            formatter: '{c}',
+        },
+    }, {
+        name: '绱璁″垝鍊�',
+        type: 'line',
+        //smooth: true,
+        data: two.series[1].data,
+        label: { //鏌变綋涓婃樉绀烘暟鍊�
+            show: false,//寮�鍚樉绀�
+            position: 'top',//鍦ㄤ笂鏂规樉绀�
+            textStyle: {//鏁板�兼牱寮�
+                fontSize: '20px',
+                color: '#fff'
+            },
+            formatter: '{c}',
+        },
+        lineStyle: {
+            //color: 'rgba(200,201,10, 1)'
+        }
+    }, {
+        name: '绱瀹為檯鍊�',
+        type: 'line',
+        //smooth: true,
+        data: two.series[3].data,
+        label: { //鏌变綋涓婃樉绀烘暟鍊�
+            show: false,//寮�鍚樉绀�
+            position: 'top',//鍦ㄤ笂鏂规樉绀�
+            textStyle: {//鏁板�兼牱寮�
+                fontSize: '20px',
+                color: '#fff'
+            },
+            formatter: '{c}',
+        },
+    }]
+    line('left_one', xArr1, data1)
+</script>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 347a25ba..f2606cd6 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -140,8 +140,16 @@ namespace FineUIPro.Web.common
         {
             int AllCount = 0;
             int MCount = 0;
-            var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now);
-            AllCount = getallin.Count();
+            //淇敼鏃ユ湡2024-10-30 16:53:50 涓轰簡鍜屽彟涓�涓湅鏉跨浉鍚�
+            //Funs.DB.T_d_EmployInOutRecord.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date)
+            //var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now);
+
+            var getallin = from x in Funs.DB.T_d_EmployInOutRecord
+                           join z in Funs.DB.Base_WorkPost on x.PostId equals z.WorkPostId
+                           where x.ProjectId == this.CurrUser.LoginProjectId && x.RecordDate.Value == DateTime.Now.Date
+                           select new { z.PostType };
+
+             AllCount = getallin.Count();
             if (AllCount > 0)
             {
                 MCount = getallin.Where(x => x.PostType == Const.PostType_1).Count();
@@ -751,6 +759,8 @@ namespace FineUIPro.Web.common
             }
 
         }
+
+
         protected string Two
         {
             get
@@ -871,6 +881,47 @@ namespace FineUIPro.Web.common
                 return JsonConvert.SerializeObject(businessColumn);
             }
         }
+
+        #region 璧㈠緱鍊兼洸绾�
+        protected string Tree
+        {
+            get
+            {
+                List<Model.SingleSerie> series = new List<Model.SingleSerie>();
+                Model.BusinessColumn businessColumn = new Model.BusinessColumn();
+                List<string> listCategories = new List<string>();
+                businessColumn.title = "璧㈠緱鍊兼洸绾�";
+                var views = (from x in Funs.DB.View_JDGL_ProgressCompletion where x.ProjectId == this.CurrUser.LoginProjectId orderby x.Months select x).ToList();
+                Model.SingleSerie s = new Model.SingleSerie();
+                Model.SingleSerie s2 = new Model.SingleSerie();
+                Model.SingleSerie s3 = new Model.SingleSerie();
+                Model.SingleSerie s4 = new Model.SingleSerie();
+                List<double> listdata = new List<double>();
+                List<double> listdata2 = new List<double>();
+                List<double> listdata3 = new List<double>();
+                List<double> listdata4 = new List<double>();
+                for (int i = 0; i < views.Count; i++)
+                {
+                    listCategories.Add(views[i].MonthStr);
+                    listdata.Add(Convert.ToDouble(views[i].PlanNum));
+                    listdata2.Add(Convert.ToDouble(views[i].TotalPlanNum));
+                    listdata3.Add(Convert.ToDouble(views[i].RealNum));
+                    listdata4.Add(Convert.ToDouble(views[i].TotalRealNum));
+                }
+                s.data = listdata;
+                s2.data = listdata2;
+                s3.data = listdata3;
+                s4.data = listdata4;
+                series.Add(s);
+                series.Add(s2);
+                series.Add(s3);
+                series.Add(s4);
+                businessColumn.categories = listCategories;
+                businessColumn.series = series;
+                return JsonConvert.SerializeObject(businessColumn);
+            }
+        }
+        #endregion
         #endregion
 
         #region  浜哄姏鎯呭喌
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx
index 7613fb34..f178c5cb 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx
@@ -39,6 +39,11 @@
         .cl-tab {
             padding: 0.025rem 0 !important;
         }
+
+        .c-site>.num-box>.num {
+    font-size: .215rem;
+    color: #21FFAF;
+}
     </style>
 </head>
 <body>
@@ -1914,23 +1919,23 @@
                 textStyle: {
                     rich: {
                         a: {
-                            fontSize: 14,
+                            fontSize: 12,
                             color: '#DADADA',
                         },
                         b: {
                             color: '#FFFFFF',
-                            fontSize: 14,
+                            fontSize: 12,
                         },
                         c: {
                             padding: [0, 6],
-                            fontSize: 14,
+                            fontSize: 12,
                             color: '#FFFFFF',
                         },
                         d: {
-                            fontSize: 14,
+                            fontSize: 12,
                             color: '#12CDA2',
                         }
-                    }
+                    },
                 }
             },
             ],
@@ -2320,7 +2325,7 @@
                 },
                 axisLabel: {
                     interval: 0,
-                    rotate: -16, // 濡傛灉鏁版嵁杈冨鏃舵棆杞爣绛句互閬垮厤閲嶅彔
+                    rotate: -10, // 濡傛灉鏁版嵁杈冨鏃舵棆杞爣绛句互閬垮厤閲嶅彔
                     margin: 8, // 璁剧疆鏍囩涓庤酱绾夸箣闂寸殑璺濈
                     // align: 'center'
                 },
@@ -2346,7 +2351,8 @@
             dataZoom: [
                 {
                     // 璁剧疆婊氬姩鏉＄殑闅愯棌鎴栨樉绀�
-                    show: value.length > 10,
+                    /* show: value.length > 10,*/
+                    show: true,
                     // 璁剧疆绫诲瀷
                     type: "slider",
                     // 璁剧疆鑳屾櫙棰滆壊
@@ -2529,7 +2535,8 @@
                 map: "china",
                 roam: false, // 鍙互缂╂斁鍜屽钩绉�
                 aspectScale: 0.75, // 姣斾緥
-                top: 120,
+                top: 130,
+                left: 170,
                 zlevel: 10,
                 zoom: 1.4,
                 regions: [
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
index 30bf2b3c..a9ec355c 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
@@ -13,11 +13,27 @@ namespace FineUIPro.Web.common
     {
         List<Model.Base_Project> allProjects;
         public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>();
+
+        public string[] pids { get; set; }
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
                 Model.SGGLDB db = Funs.DB;
+                if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
+                {
+                    pids = CurrUser.CompanyProjectId.Split(',');
+                }
+                else {
+                    //鍔犺浇鎵�鏈夊湪寤洪」鐩殑鏁版嵁
+                    var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x=>x.ProjectId).ToArray();
+                    if (pidArray.Length>0)
+                    {
+                        pids = pidArray;
+                    }
+                }
+                
+
                 //鏈亗浜嬫晠
                 var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord
                                       join y in db.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
@@ -31,7 +47,26 @@ namespace FineUIPro.Web.common
 
                 //瀹夊叏浜哄伐鏃�
                 int wHours = db.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
-                this.divSafeWorkTime.InnerHtml = CountAqrgs().ToString().Split('.')[0];
+                var countAqrgsSum = Convert.ToDecimal(0);
+                if (pids == null)
+                {
+                    countAqrgsSum = CountAqrgs();
+                }
+                else {
+                    countAqrgsSum = CountAqrgs(null,null,pids);
+                }
+               
+                if (countAqrgsSum > 10000)
+                {
+                    countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00);
+
+                    this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "涓�";
+                }
+                else {
+                    this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0];
+                }
+
+               
 
                 //鏈湀瀹夊叏浜哄伐鏃�
                 //int wHoursMonth = 0;
@@ -43,50 +78,125 @@ namespace FineUIPro.Web.common
                 //}
                 DateTime d1 = getStartMonth();
                 DateTime d2 = getEndMonth();
+                var countMonthAqrgs = Convert.ToDecimal(0);
+                if (pids == null)
+                {
+                    countMonthAqrgs = CountAqrgs(d1, d2);
+                }
+                else
+                {
+                    countMonthAqrgs = CountAqrgs(d1, d2,pids);
+                }
+                if (countMonthAqrgs > 10000)
+                {
+                    countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00);
+
+                    this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "涓�";
+                }
+                else {
+                    this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0];
+                }
+
 
-                this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0];
 
                 //int wHoursMonth = db.SitePerson_PersonInOutNumber.Where(x => x.InOutDate > DateTime.Now.AddDays(-Convert.ToInt32(DateTime.Now.Date.Day)))
                 //    .Max(x => x.WorkHours) ?? 0;
                 //this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
 
                 //瀹夊叏鍩硅绱浜哄憳
-                var getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0;
-                //淇敼锛氬鍔犲崥鏅熸暀鑲蹭腑鐨勪汉鏁�
-                var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
-                this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                var getTrainRecord = 0;
+                var boShengCount = 0;
+                if (pids == null)
+                {
+                    getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0;
+                    //淇敼锛氬鍔犲崥鏅熸暀鑲蹭腑鐨勪汉鏁�
+                    boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
+                    this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                }
+                else {
+                    getTrainRecord = db.EduTrain_TrainRecord.Where(x=>pids.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) ?? 0;
+                    //淇敼锛氬鍔犲崥鏅熸暀鑲蹭腑鐨勪汉鏁�
+                    boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)
+                    && pids.Contains(x.ProjectId) ).ToList().Count;
 
-                //瀹夊叏绠＄悊浜哄憳
-                var allSum = from x in Funs.DB.SitePerson_Person
-                             where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
-                             select x;
-                var glAllPerson = from x in allSum
-                                  join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                  //where (y.PostType == "1" || y.PostType == "4")    //涓�鑸鐞嗗矖浣嶅拰鐗圭绠＄悊浜哄憳
-                                  where y.IsHsse == true
-                                  select x;
-                this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                    this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                }
 
-                //璐ㄩ噺绠＄悊浜哄憳
-                int CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
+
+                if (pids == null)
+                {
+                    //瀹夊叏绠＄悊浜哄憳
+                    var allSum = from x in Funs.DB.SitePerson_Person
+                                 where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
+                                 select x;
+
+                    var glAllPerson = from x in allSum
+                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                      //where (y.PostType == "1" || y.PostType == "4")    //涓�鑸鐞嗗矖浣嶅拰鐗圭绠＄悊浜哄憳
+                                      where y.IsHsse == true
+                                      select x;
+                    this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                }
+                else {
+                    //瀹夊叏绠＄悊浜哄憳
+                    var allSum = from x in Funs.DB.SitePerson_Person
+                                 where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
+                                 && pids.Contains(x.ProjectId)
+                                 select x;
+
+                    var glAllPerson = from x in allSum
+                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                      //where (y.PostType == "1" || y.PostType == "4")    //涓�鑸鐞嗗矖浣嶅拰鐗圭绠＄悊浜哄憳
+                                      where y.IsHsse == true
+                                      select x;
+                    this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                }
+
+                #region 璐ㄩ噺绠＄悊浜哄憳锛岃川閲忓煿璁汉鍛� 澧炲姞鍏徃绾� 
+                int CqmsManageNum = 0;
+                int CqmsPxNum = 0;
+                //璐ㄩ噺鍩硅浜哄憳
+                DateTime date = DateTime.Now.AddDays(-1);
+                if (pids == null)
+                {
+                    CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
                                      where x.IsOnJob == true && y.IsCQMS == true
                                      select x).Count() +
-                                     (from x in Funs.DB.SitePerson_Person
-                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                      where x.IsUsed == true && y.IsCQMS == true
-                                      select x).Count();
-                this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
+                                   (from x in Funs.DB.SitePerson_Person
+                                    join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                    where x.IsUsed == true && y.IsCQMS == true
+                                    select x).Count();
+                    this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
 
-                //璐ㄩ噺鍩硅浜哄憳
-                DateTime date = DateTime.Now.AddDays(-1);
-                int CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
+                    CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
                                  where x.IsTrain == true
                                  select x).Count();
-                divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                    divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                }
+                else {
+                    CqmsManageNum = (from x in Funs.DB.SitePerson_Person
+                                    join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                    where x.IsUsed == true && y.IsCQMS == true && pids.Contains(x.ProjectId)
+                                    select x).Count();
+                    this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
+
+                    CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
+                                 where x.IsTrain == true && pids.Contains(x.ProjectId)
+                                 select x).Count();
+                    divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                }
+                #endregion
 
                 //鍦ㄥ缓椤圭洰
-                allProjects = ProjectService.GetAllProjectDropDownList();
+                if (pids == null)
+                {
+                    allProjects = ProjectService.GetAllProjectDropDownList();
+                }
+                else {
+                    allProjects = ProjectService.GetAllProjectDropDownList(pids);
+                }
+                
                 int acount = allProjects.Count();
                 int pcount1 = 0;
                 int pcount2 = 0;
@@ -94,8 +204,15 @@ namespace FineUIPro.Web.common
                 if (acount > 0)
                 {
                     pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count();
-                    pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true select x).Count();
-                    pcount3 = Count3();
+                    var pidzjsg = string.Join(",", allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Select(x => x.ProjectId)).Split(',');
+                    if (pids == null) { 
+                        pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pidzjsg.Contains(x.ProjectId) select x).Count();
+                    }
+                    else { 
+                        pidzjsg = pids;
+                        pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pids.Contains(x.ProjectId) select x).Count();
+                    }
+                    pcount3 = Count3(pidzjsg);
                 }
                 div_zjxmCount.InnerHtml = pcount1.ToString() + "<div class=\"th\">涓�</div>";
                 div_cjrsCount.InnerHtml = pcount2.ToString() + "<div class=\"th\">浜�</div>";
@@ -162,7 +279,7 @@ namespace FineUIPro.Web.common
         /// </summary>
         /// <param name="state"></param>
         /// <returns></returns>
-        protected decimal CountAqrgs(DateTime? d1 = null, DateTime? d2 = null)
+        protected decimal CountAqrgs(DateTime? d1 = null, DateTime? d2 = null,string[] pids =null)
         {
             decimal cout1 = 0;
 
@@ -171,7 +288,12 @@ namespace FineUIPro.Web.common
             var getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber
 
                                         select x;
-            if (getAllPersonInOutList.Count() > 0)
+            if (pids != null) {
+                getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber
+                                        where pids.Contains(x.ProjectId)
+                                        select x;
+            }
+                if (getAllPersonInOutList.Count() > 0)
             {
                 if (datetime1.HasValue)
                 {
@@ -196,6 +318,18 @@ namespace FineUIPro.Web.common
                         where y.ProjectState == Const.ProjectState_1
                         select x;
 
+            if (pids!=null)
+            {
+                getD1 = from x in Funs.DB.Accident_AccidentHandle
+                        join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                        where  pids.Contains(x.ProjectId)
+                        select x;
+                getD2 = from x in Funs.DB.Accident_AccidentReport
+                        join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
+                        where   pids.Contains(x.ProjectId)
+                        select x;
+            }
+
             if (datetime1.HasValue)
             {
                 getD1 = getD1.Where(x => x.AccidentDate >= datetime1);
@@ -542,10 +676,10 @@ namespace FineUIPro.Web.common
         /// </summary>
         /// <param name="state"></param>
         /// <returns></returns>
-        protected int Count3()
+        protected int Count3(string[] pids)
         {
             int cout1 = 0;
-            cout1 = Funs.DB.Solution_LargerHazard.Where(x => x.States == Const.State_2).Count();
+            cout1 = Funs.DB.Solution_LargerHazard.Where(x => x.States == Const.State_2 && pids.Contains(x.ProjectId)).Count();
             return cout1;
         }
         #endregion
@@ -561,20 +695,48 @@ namespace FineUIPro.Web.common
         protected string zgzglDataValue;
         protected void getZlwt()
         {
-            zlallNumber = (from x in Funs.DB.Check_CheckControl
-                           where x.CheckDate <= DateTime.Now
-                           select x).Count().ToString();
-            var num2 = (from x in Funs.DB.Check_CheckControl
-                        where x.CheckDate <= DateTime.Now && x.State == "7"
-                        select x).Count();
-            zlfinishNumber = num2.ToString();
-            var num3 = (from x in Funs.DB.Check_CheckControl
-                        where x.CheckDate <= DateTime.Now && x.State != "7"
-                        select x).Count();
+            if (pids == null)
+            {
+                zlallNumber = (from x in Funs.DB.Check_CheckControl
+                               where x.CheckDate <= DateTime.Now
+                               select x).Count().ToString();
 
-            var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
-            zlzgl = zgl.ToString();
-            zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
+                var num2 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State == "7"
+                            select x).Count();
+
+                zlfinishNumber = num2.ToString();
+                var num3 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State != "7"
+                            select x).Count();
+
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
+
+                zlzgl = zgl.ToString();
+
+                zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
+            }
+            else {
+                zlallNumber = (from x in Funs.DB.Check_CheckControl
+                               where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                               select x).Count().ToString();
+
+                var num2 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
+                            select x).Count();
+
+                zlfinishNumber = num2.ToString();
+                var num3 = (from x in Funs.DB.Check_CheckControl
+                            where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
+                            select x).Count();
+
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / (num2 + num3));
+
+                zlzgl = zgl.ToString();
+
+                zgzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
+            }
+            
         }
         #endregion
 
@@ -586,19 +748,39 @@ namespace FineUIPro.Web.common
         protected string zggjzglDataValue;
         protected void getZlgj()
         {
-            var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        select x).Count();
-            //Check_JointCheck
-            zlgjallNumber = num1.ToString();
+            if (pids == null)
+            {
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            select x).Count();
+                //Check_JointCheck
+                zlgjallNumber = num1.ToString();
 
-            var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        where x.IsOnceQualified == true
-                        select x).Count();
-            zlgjfinishNumber = num2.ToString();
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true
+                            select x).Count();
+                zlgjfinishNumber = num2.ToString();
 
-            var zgl = String.Format("{0:N2}", 100.0 * num2 / num1);
-            zlgjzgl = zgl.ToString();
-            zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString();
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / num1);
+                zlgjzgl = zgl.ToString();
+                zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString();
+            }
+            else {
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where pids.Contains(x.ProjectId)
+                            select x).Count();
+                //Check_JointCheck
+                zlgjallNumber = num1.ToString();
+
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
+                            select x).Count();
+                zlgjfinishNumber = num2.ToString();
+
+                var zgl = String.Format("{0:N2}", 100.0 * num2 / num1);
+                zlgjzgl = zgl.ToString();
+                zggjzglDataValue = (100 - (100.0 * num2 / num1)).ToString();
+            }
+            
         }
 
         #endregion
@@ -617,6 +799,10 @@ namespace FineUIPro.Web.common
             double result = 0;
             Model.SGGLDB db = Funs.DB;
             var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "宸ヨ壓绠￠亾" select x;
+            if (pids!=null)
+            {
+                ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "宸ヨ壓绠￠亾" && pids.Contains(x.ProjectId) select x;
+            }
             decimal a = 0, b = 0;
             if (ndtLists.Count() > 0)
             {
@@ -673,30 +859,61 @@ namespace FineUIPro.Web.common
         protected string gjsxZdl = "0";
         protected void getGjsx()
         {
-            //Check_JointCheck
-            var znum = (from x in Funs.DB.GJSX
-                        select x).Count();
-            divGjsxzj.InnerHtml = znum.ToString();
+            if (pids == null)
+            {
+                //Check_JointCheck
+                var znum = (from x in Funs.DB.GJSX
+                            select x).Count();
+                divGjsxzj.InnerHtml = znum.ToString();
 
-            //鍒版湡搴斿畬鎴�
-            var dqnum = (from x in Funs.DB.GJSX
-                         where x.CompleteDate <= DateTime.Now
-                         select x).Count().ToString();
-            divGjsxdq.InnerHtml = dqnum;
+                //鍒版湡搴斿畬鎴�
+                var dqnum = (from x in Funs.DB.GJSX
+                             where x.CompleteDate <= DateTime.Now
+                             select x).Count().ToString();
+                divGjsxdq.InnerHtml = dqnum;
 
-            //鏈噯鐐瑰畬鎴�
-            var wzdnum = (from x in Funs.DB.GJSX
-                          where x.CompleteDate <= DateTime.Now
-                          && x.State != "0"
-                          select x).Count().ToString();
-            divGjsxwzd.InnerHtml = wzdnum;
+                //鏈噯鐐瑰畬鎴�
+                var wzdnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State != "0"
+                              select x).Count().ToString();
+                divGjsxwzd.InnerHtml = wzdnum;
 
-            //鍑嗙偣鐜囷紝宸插畬鎴�/鎬绘暟*100
-            var ywcnum = (from x in Funs.DB.GJSX
-                          where x.CompleteDate <= DateTime.Now
-                          && x.State == "0"
-                          select x).Count();
-            gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString();
+                //鍑嗙偣鐜囷紝宸插畬鎴�/鎬绘暟*100
+                var ywcnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State == "0"
+                              select x).Count();
+                gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString();
+            }
+            else {
+                //Check_JointCheck
+                var znum = (from x in Funs.DB.GJSX
+                            where pids.Contains(x.ProjectId)
+                            select x).Count();
+                divGjsxzj.InnerHtml = znum.ToString();
+
+                //鍒版湡搴斿畬鎴�
+                var dqnum = (from x in Funs.DB.GJSX
+                             where x.CompleteDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                             select x).Count().ToString();
+                divGjsxdq.InnerHtml = dqnum;
+
+                //鏈噯鐐瑰畬鎴�
+                var wzdnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State != "0" && pids.Contains(x.ProjectId)
+                              select x).Count().ToString();
+                divGjsxwzd.InnerHtml = wzdnum;
+
+                //鍑嗙偣鐜囷紝宸插畬鎴�/鎬绘暟*100
+                var ywcnum = (from x in Funs.DB.GJSX
+                              where x.CompleteDate <= DateTime.Now
+                              && x.State == "0" && pids.Contains(x.ProjectId)
+                              select x).Count();
+                gjsxZdl = Math.Round((100.0 * ywcnum / znum), 2).ToString();
+            }
+           
         }
 
         #endregion
@@ -706,7 +923,14 @@ namespace FineUIPro.Web.common
         {
             int AllCount = 0;
             int MCount = 0;
-            var getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now);
+            var getallin = new List<Model.PageDataPersonInOutItem>();
+            if (pids == null)
+            {
+                getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now);
+            }
+            else {
+                getallin = APIPageDataService.getPersonNumByCompany(DateTime.Now,pids);
+            }
             AllCount = getallin.Count();
             if (AllCount > 0)
             {
@@ -727,7 +951,16 @@ namespace FineUIPro.Web.common
         protected string ProjectPersonMc;
         private void getProjectSitePerson()
         {
-            var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            var list = new List<Model.Base_Project>();
+            if (pids == null)
+            {
+                list= Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            }
+            else {
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
+            }
+                
+               
             foreach (var item in list)
             {
                 ProjectPersonMc += "'" + item.ShortName + "',";
@@ -743,14 +976,25 @@ namespace FineUIPro.Web.common
         protected string ProjectMc;
         protected void getJd()
         {
-            var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
-            foreach (var item in list)
+            var list = new List<Model.Base_Project>();
+            if (pids == null)
             {
-                ProjectJd += "'" + item.Progress.Value.ToString("0.##") + "',";
-                ProjectMc += "'" + item.ShortName + "',";
+                list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
             }
-            ProjectJd = ProjectJd.TrimEnd(',');
-            ProjectMc = ProjectMc.TrimEnd(',');
+            else {
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList();
+            }
+            if (list.Count>0)
+            {
+                foreach (var item in list)
+                {
+                    ProjectJd += "'" + item.Progress.Value.ToString("0.##") + "',";
+                    ProjectMc += "'" + item.ShortName + "',";
+                }
+                ProjectJd = ProjectJd.TrimEnd(',');
+                ProjectMc = ProjectMc.TrimEnd(',');
+            }
+            
         }
         #endregion
 
@@ -767,22 +1011,42 @@ namespace FineUIPro.Web.common
         /// 鑾峰彇闅愭偅鏁存敼闂幆椤�
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralClosedNum()
+        public  int GetGeneralClosedNum()
         {
-            int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+            int result = 0;
+            if (pids==null)
+            {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
                           where x.States == "3"
                           select x).Count();
+            }
+            else {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                          where x.States == "3" && pids.Contains(x.ProjectId)
+                          select x).Count();
+            }
+           
             return result;
         }
         /// <summary>
         /// 鑾峰彇闅愭偅鏈暣鏀瑰畬鎴愰」
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralNotClosedNum()
+        public  int GetGeneralNotClosedNum()
         {
-            int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+            int result = 0;
+            if (pids == null)
+            {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
                           where x.States != "3"
                           select x).Count();
+            }
+            else {
+                result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                          where x.States != "3" && pids.Contains(x.ProjectId)
+                          select x).Count();
+            }
+                
             return result;
         }
         #endregion
@@ -797,7 +1061,15 @@ namespace FineUIPro.Web.common
         {
 
             //椤圭洰
-            var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            var list = new List<Model.Base_Project>();
+            if (pids == null)
+            {
+                list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null).ToList();
+            }
+            else
+            {
+                list = Funs.DB.Base_Project.Where(x => pids.Contains(x.ProjectId) && x.Progress != null).ToList();
+            }
             var PipelinList = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M");
             var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "璁惧");
             foreach (var item in list)
@@ -920,13 +1192,25 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇鏈亗浜嬩欢鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetNearMissNum()
+        private  int GetNearMissNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentPersonRecord
-                          join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
-                          where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
+                              && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx b/SGGL/FineUIPro.Web/common/main_new0.aspx
index 3cf81a61..18da8bca 100644
--- a/SGGL/FineUIPro.Web/common/main_new0.aspx
+++ b/SGGL/FineUIPro.Web/common/main_new0.aspx
@@ -217,14 +217,14 @@
                         </div>
                     </div>
                 </div>
-                <div class="y_box js-hover" data-type="yhpc" style="width: 6rem;height: 5.0875rem;">
+                <div class="y_box js-hover" style="width: 6rem;height: 5.0875rem;">
                     <div class="y_box_label y_image_default tab-wrap">闅愭偅鎺掓煡娌荤悊鏁版嵁
                         <div class="y_tabs y_row">
                             <span class="y_image_default y_tab-action active" data-type="yb"    style="cursor:pointer" onclick="yjClick(0)" id="ybyh_span">涓�鑸殣鎮�</span>
                             <span class="y_image_default" data-type="zd"   style="cursor:pointer" onclick="yjClick(1)" id="zdyh_span">閲嶅ぇ闅愭偅</span>
                         </div>
                     </div>
-                    <div class="y_box_main">
+                    <div class="y_box_main"  data-type="yhpc" >
                         <div class="pc_box y_row " style="padding-top: .25rem;">
                             <div class="pc-item">
                                 <div class="pc-item-card y_column y_image_default">
diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
index d05b42a8..7758e0f3 100644
--- a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
@@ -16,6 +16,10 @@ namespace FineUIPro.Web.common
     {
         public static List<Model.Solution_LargerHazard> LargerHazard = new List<Model.Solution_LargerHazard>();
 
+        /// <summary>
+        /// 鍏徃绾ч」鐩瓫閫�
+        /// </summary>
+        public string[] pids { get; set; }
         //椤甸潰鍔犺浇
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -24,24 +28,33 @@ namespace FineUIPro.Web.common
                 //瀹夌洃浜哄憳鏁版嵁
                 //浼佷笟鎬婚儴鎬荤洃浜烘暟
                 Model.SGGLDB db = Funs.DB;
+                if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
+                {
+                    pids = CurrUser.CompanyProjectId.Split(',');
+                }
+                else
+                {
+                    //鍔犺浇鎵�鏈夊湪寤洪」鐩殑鏁版嵁
+                    var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray();
+                    if (pidArray.Length > 0)
+                    {
+                        pids = pidArray;
+                    }
+                }
+
                 var unitId = string.Empty;
                 var thisUnit = CommonService.GetIsThisUnit();
                 if (thisUnit != null) unitId = thisUnit.UnitId;
                 div_qyzbzjrs.InnerHtml = (from x in db.Person_CompanyBranchPerson
                                           where x.IsOnJob == true && x.WorkPostId == Const.WorkPost_HSSEDirector && x.UnitId == unitId
                                           select x).Count().ToString();
-                div_qyzbrs1.InnerHtml = (from x in db.SitePerson_Person
-                                         where x.IsUsed == true && x.WorkPostId == Const.WorkPost_HSSEDirector
-                                         select x).Count().ToString();
+               
                 //浼佷笟鎬婚儴涓撹亴浜烘暟
                 div_qyzbzzrs.InnerHtml = (from x in db.Person_CompanyBranchPerson
                                           join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
                                           where x.IsOnJob == true && y.IsHsse == true && x.UnitId == unitId
                                           select x).Count().ToString();
-                div_qyzbzzrs1.InnerHtml = (from x in db.SitePerson_Person
-                                           join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                           where x.IsUsed == true && y.IsHsse == true
-                                           select x).Count().ToString();
+               
                 //鍒嗘敮鏈烘瀯鎬荤洃浜烘暟
                 div_fzjgzjrs.InnerHtml = (from x in db.Person_CompanyBranchPerson
                                           where x.IsOnJob == true && x.WorkPostId == Const.WorkPost_HSSEDirector && x.UnitId != unitId
@@ -51,25 +64,29 @@ namespace FineUIPro.Web.common
                                           join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
                                           where x.IsOnJob == true && y.IsHsse == true && x.UnitId != unitId
                                           select x).Count().ToString();
-                //浼佷笟鎬婚儴鍙傚缓浜烘暟
-                div_qyzbcjrs.InnerHtml = (from x in db.SitePerson_Person where x.IsUsed == true select x).Count().ToString();
+               
+                if (pids == null)
+                {
+                    //椤圭洰鎬荤洃
+                    div_xmrs.InnerHtml = (from x in db.SitePerson_Person
+                                          where x.WorkPostId == Const.WorkPost_HSSEDirector && x.IsUsed == true
+                                          select x).Count().ToString();
+                    div_qyzbrs1.InnerHtml = div_xmrs.InnerHtml;
+                    //椤圭洰涓撹亴
+                    div_xmzzrs.InnerHtml = (from x in db.SitePerson_Person
+                                            join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                            where y.IsHsse == true && x.IsUsed == true
+                                            select x).Count().ToString();
+                    div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
+                    //椤圭洰鍙傚缓
+                    div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
+                                            where x.IsUsed == true
+                                            select x).Count().ToString();
 
-                //椤圭洰鎬荤洃
-                div_xmrs.InnerHtml = (from x in db.SitePerson_Person
-                                      where x.WorkPostId == Const.WorkPost_HSSEDirector && x.IsUsed == true
-                                      select x).Count().ToString();
-                //椤圭洰涓撹亴
-                div_xmzzrs.InnerHtml = (from x in db.SitePerson_Person
-                                        join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                        where y.IsHsse == true && x.IsUsed == true
-                                        select x).Count().ToString();
-                //椤圭洰鍙傚缓
-                div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
-                                        where x.IsUsed == true
-                                        select x).Count().ToString();
-
-                //娉ㄥ畨甯�
-                var ZasSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
+                    //浼佷笟鎬婚儴鍙傚缓浜烘暟
+                    div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
+                    //娉ㄥ畨甯�
+                    var ZasSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
                         Person.PersonName,Person.PersonId,Person.IdentityCard,Person.Sex,Person.WorkPostId,WorkPost.WorkPostName,Person.Telephone
                         ,(CASE WHEN Sex=2 THEN '濂�'  WHEN Sex=1 THEN '鐢�' ELSE '' END) AS SexStr
                         FROM SitePerson_Person  AS Person
@@ -79,11 +96,56 @@ namespace FineUIPro.Web.common
                         WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) 
                         AND  (SELECT COUNT(*) FROM  QualityAudit_PersonQuality AS Q LEFT JOIN Base_Certificate AS Cer ON Q.CertificateId 
                         =Cer.CertificateId WHERE Q.PersonId = Person.PersonId AND IsRegisterHSSE =1) > 0";
-                List<SqlParameter> listStr = new List<SqlParameter>();
-                SqlParameter[] parameter = listStr.ToArray();
-                DataTable tb = SQLHelper.GetDataTableRunText(ZasSql, parameter);
+                    List<SqlParameter> listStr = new List<SqlParameter>();
+                    SqlParameter[] parameter = listStr.ToArray();
+                    DataTable tb = SQLHelper.GetDataTableRunText(ZasSql, parameter);
 
-                div_zasrs.InnerHtml = tb.Rows.Count.ToString();
+                    div_zasrs.InnerHtml = tb.Rows.Count.ToString();
+                }
+                else {
+                    //椤圭洰鎬荤洃
+                    div_xmrs.InnerHtml = (from x in db.SitePerson_Person
+                                          where x.WorkPostId == Const.WorkPost_HSSEDirector && x.IsUsed == true
+                                          && pids.Contains(x.ProjectId)
+                                          select x).Count().ToString();
+                    //椤圭洰涓撹亴
+                    div_xmzzrs.InnerHtml = (from x in db.SitePerson_Person
+                                            join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                            where y.IsHsse == true && x.IsUsed == true
+                                            && pids.Contains(x.ProjectId)
+                                            select x).Count().ToString();
+                    //椤圭洰鍙傚缓
+                    div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
+                                            where x.IsUsed == true
+                                            && pids.Contains(x.ProjectId)
+                                            select x).Count().ToString();
+
+                    string s1 = string.Format("'{0}'", String.Join(",", pids).Replace(",", "','"));
+
+                    //娉ㄥ畨甯�
+                    var ZasSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
+                        Person.PersonName,Person.PersonId,Person.IdentityCard,Person.Sex,Person.WorkPostId,WorkPost.WorkPostName,Person.Telephone
+                        ,(CASE WHEN Sex=2 THEN '濂�'  WHEN Sex=1 THEN '鐢�' ELSE '' END) AS SexStr
+                        FROM SitePerson_Person  AS Person
+                        LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId
+                        LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
+                        LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
+                        WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) 
+                        AND  (SELECT COUNT(*) FROM  QualityAudit_PersonQuality AS Q LEFT JOIN Base_Certificate AS Cer ON Q.CertificateId 
+                        =Cer.CertificateId WHERE Q.PersonId = Person.PersonId AND IsRegisterHSSE =1) > 0 and  Person.ProjectId in (" + s1 + ")";
+                    List<SqlParameter> listStr = new List<SqlParameter>();
+                    SqlParameter[] parameter = listStr.ToArray();
+                    DataTable tb = SQLHelper.GetDataTableRunText(ZasSql, parameter);
+
+                    div_zasrs.InnerHtml = tb.Rows.Count.ToString();
+
+                    div_qyzbrs1.InnerHtml = div_xmrs.InnerHtml;
+                    div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
+                    div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
+                }
+               
+
+                
                 //椤圭洰淇℃伅
                 getProjectInfo();
 
@@ -107,16 +169,32 @@ namespace FineUIPro.Web.common
         protected void getProjectInfo()
         {
             Model.SGGLDB db = Funs.DB;
-            var list = db.Base_Project;
-            //鍦ㄥ缓椤圭洰
-            div_zjxm.InnerHtml = list.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).Count().ToString();
-            //鍋滃伐椤圭洰
-            div_tgxm.InnerHtml = list.Where(x => (x.ProjectState == Const.ProjectState_2 || x.ProjectState == null)).Count().ToString();
-            //鍦ㄦ柦鍗卞ぇ宸ョ▼
-            div_wdxm.InnerHtml = db.Solution_LargerHazard.Where(x => x.States == Const.State_2).Count().ToString();
-            //瀹夊叏宸ユ椂鏁�
-            //int wHours = Funs.DB.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
-            this.div_safeworktime.InnerHtml = Count3().ToString().Split('.')[0];
+            if (pids == null)
+            {
+                var list = db.Base_Project;
+                //鍦ㄥ缓椤圭洰
+                div_zjxm.InnerHtml = list.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).Count().ToString();
+                //鍋滃伐椤圭洰
+                div_tgxm.InnerHtml = list.Where(x => (x.ProjectState == Const.ProjectState_2 || x.ProjectState == null)).Count().ToString();
+                //鍦ㄦ柦鍗卞ぇ宸ョ▼
+                div_wdxm.InnerHtml = db.Solution_LargerHazard.Where(x => x.States == Const.State_2).Count().ToString();
+                //瀹夊叏宸ユ椂鏁�
+                //int wHours = Funs.DB.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
+                this.div_safeworktime.InnerHtml = Count3().ToString().Split('.')[0];
+            }
+            else {
+                var list = db.Base_Project.Where(x=>pids.Contains(x.ProjectId));
+                //鍦ㄥ缓椤圭洰
+                div_zjxm.InnerHtml = list.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).Count().ToString();
+                //鍋滃伐椤圭洰
+                div_tgxm.InnerHtml = list.Where(x => (x.ProjectState == Const.ProjectState_2 || x.ProjectState == null)).Count().ToString();
+                //鍦ㄦ柦鍗卞ぇ宸ョ▼
+                div_wdxm.InnerHtml = db.Solution_LargerHazard.Where(x => x.States == Const.State_2 && pids.Contains(x.ProjectId)).Count().ToString();
+                //瀹夊叏宸ユ椂鏁�
+                //int wHours = Funs.DB.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
+                this.div_safeworktime.InnerHtml = Count3().ToString().Split('.')[0];
+            }
+           
         }
         #endregion
         #region 瀹夊叏浜哄伐鏃剁┛閫忔暟鎹�
@@ -129,36 +207,73 @@ namespace FineUIPro.Web.common
         {
             Model.SGGLDB db = Funs.DB;
             decimal cout1 = 0;
-            var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber
-                                        select x;
-            if (getAllPersonInOutList.Count() > 0)
+            if (pids == null)
             {
+                var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber
+                                            select x;
                 if (getAllPersonInOutList.Count() > 0)
                 {
-                    cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours);
+                    if (getAllPersonInOutList.Count() > 0)
+                    {
+                        cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours);
+                    }
+                }
+
+                var getD1 = from x in db.Accident_AccidentHandle
+                            join y in db.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x;
+                var getD2 = from x in db.Accident_AccidentReport
+                            join y in db.Base_Project on x.ProjectId equals y.ProjectId
+                            where y.ProjectState == Const.ProjectState_1
+                            select x;
+
+
+
+
+                if (getD1.Count() > 0)
+                {
+                    cout1 = cout1 - getD1.Sum(x => x.WorkHoursLoss ?? 0);
+                }
+                if (getD2.Count() > 0)
+                {
+                    cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0);
                 }
             }
+            else {
+                var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber
+                                            where pids.Contains(x.ProjectId)
+                                            select x;
+                if (getAllPersonInOutList.Count() > 0)
+                {
+                    if (getAllPersonInOutList.Count() > 0)
+                    {
+                        cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours);
+                    }
+                }
 
-            var getD1 = from x in db.Accident_AccidentHandle
-                        join y in db.Base_Project on x.ProjectId equals y.ProjectId
-                        where y.ProjectState == Const.ProjectState_1
-                        select x;
-            var getD2 = from x in db.Accident_AccidentReport
-                        join y in db.Base_Project on x.ProjectId equals y.ProjectId
-                        where y.ProjectState == Const.ProjectState_1
-                        select x;
+                var getD1 = from x in db.Accident_AccidentHandle
+                            join y in db.Base_Project on x.ProjectId equals y.ProjectId
+                            where  pids.Contains(x.ProjectId)
+                            select x;
+                var getD2 = from x in db.Accident_AccidentReport
+                            join y in db.Base_Project on x.ProjectId equals y.ProjectId
+                            where pids.Contains(x.ProjectId)
+                            select x;
 
 
 
 
-            if (getD1.Count() > 0)
-            {
-                cout1 = cout1 - getD1.Sum(x => x.WorkHoursLoss ?? 0);
-            }
-            if (getD2.Count() > 0)
-            {
-                cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0);
+                if (getD1.Count() > 0)
+                {
+                    cout1 = cout1 - getD1.Sum(x => x.WorkHoursLoss ?? 0);
+                }
+                if (getD2.Count() > 0)
+                {
+                    cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0);
+                }
             }
+           
             return cout1;
         }
 
@@ -178,14 +293,20 @@ namespace FineUIPro.Web.common
         protected void getProjectYh()
         {
             Model.SGGLDB db = Funs.DB;
-            var list = db.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            var list = new List<Model.Base_Project>();
+            if (pids != null)
+            {
+                list = db.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
+            }
+            else {
+                list = db.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
+            }
             var hazardRegisters = from x in db.HSSE_Hazard_HazardRegister select x;
             if (list.Count > 0)
             {
                 foreach (var item in list)
                 {
                     yhXmmc += "'" + item.ShortName + "',";
-
                     //涓�鑸�
                     allYhYb += "'" +
                     ((from x in hazardRegisters
@@ -234,13 +355,30 @@ namespace FineUIPro.Web.common
             div_qyawh.InnerHtml = HSSEData_HSSEService.GetSafetyCommitteeMeetingNum().ToString();
             //浼佷笟涓撻
             div_qyzt.InnerHtml = HSSEData_HSSEService.GetEnterpriseTopicsMeetingNum().ToString();
-            //椤圭洰瀹夊叏棰嗗灏忕粍
-            div_xmaqldxz.InnerHtml = Funs.DB.Meeting_SafetyLeaderGroupMeeting.Where(x => x.CompileDate > Const.DtmarkTime).Count().ToString();
-            //椤圭洰瀹夊叏渚嬩細
-            DateTime date = DateTime.Now;
-            div_xmalh.InnerHtml = ((from x in Funs.DB.Meeting_WeekMeeting where x.WeekMeetingDate.Value.Year == date.Year && x.WeekMeetingDate.Value.Month == date.Month && x.WeekMeetingDate.Value.Day == date.Day select x).Count()
-                + (from x in Funs.DB.Meeting_MonthMeeting where x.MonthMeetingDate.Value.Year == date.Year && x.MonthMeetingDate.Value.Month == date.Month && x.MonthMeetingDate.Value.Day == date.Day select x).Count()).ToString();
+            if (pids == null)
+            {
+                //椤圭洰瀹夊叏棰嗗灏忕粍
+                div_xmaqldxz.InnerHtml = Funs.DB.Meeting_SafetyLeaderGroupMeeting.Where(x => x.CompileDate > Const.DtmarkTime).Count().ToString();
+                //椤圭洰瀹夊叏渚嬩細
+                DateTime date = DateTime.Now;
+                div_xmalh.InnerHtml = ((from x in Funs.DB.Meeting_WeekMeeting where x.WeekMeetingDate.Value.Year == date.Year && x.WeekMeetingDate.Value.Month == date.Month && x.WeekMeetingDate.Value.Day == date.Day select x).Count()
+                    + (from x in Funs.DB.Meeting_MonthMeeting where x.MonthMeetingDate.Value.Year == date.Year && x.MonthMeetingDate.Value.Month == date.Month && x.MonthMeetingDate.Value.Day == date.Day select x).Count()).ToString();
+            }
+            else {
+               
+                //椤圭洰瀹夊叏棰嗗灏忕粍
+                div_xmaqldxz.InnerHtml = Funs.DB.Meeting_SafetyLeaderGroupMeeting.Where(x => x.CompileDate > Const.DtmarkTime
+                && pids.Contains(x.ProjectId) ).Count().ToString();
+                //椤圭洰瀹夊叏渚嬩細
+                DateTime date = DateTime.Now;
+                div_xmalh.InnerHtml = ((from x in Funs.DB.Meeting_WeekMeeting where x.WeekMeetingDate.Value.Year == date.Year && x.WeekMeetingDate.Value.Month == date.Month && x.WeekMeetingDate.Value.Day == date.Day
+                                        && pids.Contains(x.ProjectId)
+                                        select x).Count()
+                    + (from x in Funs.DB.Meeting_MonthMeeting where x.MonthMeetingDate.Value.Year == date.Year && x.MonthMeetingDate.Value.Month == date.Month && x.MonthMeetingDate.Value.Day == date.Day
+                       && pids.Contains(x.ProjectId)
+                       select x).Count()).ToString();
 
+            }
         }
         #endregion
 
@@ -249,72 +387,135 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇璐圭敤浣跨敤锛堜竾鍏冿級
         /// </summary>
         /// <returns></returns>
-        public static int GetCostUse()
+        public  int GetCostUse()
         {
-            var result = 0;
-            var costs = (from x in Funs.DB.CostGoods_CostSmallDetailItem
-                         join y in Funs.DB.CostGoods_CostSmallDetail
-                             on x.CostSmallDetailId equals y.CostSmallDetailId
-                         where y.CompileDate > Const.DtmarkTime
-                         select x.CostMoney ?? 0).ToList().Sum();
-            result = Funs.GetNewIntOrZero(costs.ToString().Split('.')[0]);
-            return result;
+            if (pids==null)
+            {
+                var result = 0;
+                var costs = (from x in Funs.DB.CostGoods_CostSmallDetailItem
+                             join y in Funs.DB.CostGoods_CostSmallDetail
+                                 on x.CostSmallDetailId equals y.CostSmallDetailId
+                             where y.CompileDate > Const.DtmarkTime
+                             select x.CostMoney ?? 0).ToList().Sum();
+                result = Funs.GetNewIntOrZero(costs.ToString().Split('.')[0]);
+                return result;
+            }
+            else
+            {
+                var result = 0;
+                var costs = (from x in Funs.DB.CostGoods_CostSmallDetailItem
+                             join y in Funs.DB.CostGoods_CostSmallDetail
+                                 on x.CostSmallDetailId equals y.CostSmallDetailId
+                             where y.CompileDate > Const.DtmarkTime && pids.Contains(y.ProjectId)
+                             select x.CostMoney ?? 0).ToList().Sum();
+                result = Funs.GetNewIntOrZero(costs.ToString().Split('.')[0]);
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇鏂藉伐鏈哄叿鍦ㄧ敤鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetUseEquipmentNum()
+        public  int GetUseEquipmentNum()
         {
-            var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
-                          join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
-                          where x.IsUsed == true
-                          select x).Count() +
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
+                              join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
+                              where x.IsUsed == true
+                              select x).Count() +
                          (from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
                           join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
                               .GeneralEquipmentInId
                           where x.IsUsed == true
                           select x).Count();
-            return result;
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
+                              join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
+                              where x.IsUsed == true && pids.Contains(y.ProjectId)
+                              select x).Count() +
+                       (from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
+                        join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
+                            .GeneralEquipmentInId
+                        where x.IsUsed == true && pids.Contains(y.ProjectId)
+                        select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇鏂藉伐鏈哄叿鐗圭璁惧鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSpecialEquipmentNum()
+        public  int GetSpecialEquipmentNum()
         {
-            var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
-                          join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
-                          where x.IsUsed == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
+                              join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
+                              where x.IsUsed == true
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
+                              join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
+                              where x.IsUsed == true && pids.Contains(y.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇浣滀笟璁稿彲椤规暟
         /// </summary>
         /// <returns></returns>
-        public static int GetLicensesNum()
+        public  int GetLicensesNum()
         {
-            var result = (from x in Funs.DB.License_LicenseManager
-                          where x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.License_LicenseManager
+                              where x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.License_LicenseManager
+                              where x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇浣滀笟璁稿彲鍏抽棴椤规暟
         /// </summary>
         /// <returns></returns>
-        public static int GetLicensesCloseNum()
+        public  int GetLicensesCloseNum()
         {
-            var result = (from x in Funs.DB.License_LicenseManager
-                          where x.IsHighRisk == true && x.WorkStates == "3" &&
-                                x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.License_LicenseManager
+                              where x.IsHighRisk == true && x.WorkStates == "3" &&
+                                    x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.License_LicenseManager
+                              where x.IsHighRisk == true && x.WorkStates == "3" &&
+                                    x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -322,33 +523,56 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇涓�鑸殣鎮ｆ暣鏀归棴鐜」
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralClosedNum()
+        public  int GetGeneralClosedNum()
         {
-            var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.Risk_Level == "涓�鑸�" && x.States == "3" &&
-                                x.CheckTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids==null)
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "涓�鑸�" && x.States == "3" &&
+                                    x.CheckTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "涓�鑸�" && x.States == "3" && 
+                                    x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         ///     鑾峰彇涓�鑸殣鎮ｆ湭鏁存敼瀹屾垚椤�
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralNotClosedNum()
+        public  int GetGeneralNotClosedNum()
         {
-            var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.Risk_Level == "涓�鑸�" && x.States != "3" &&
-                                x.CheckTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "涓�鑸�" && x.States != "3" &&
+                                    x.CheckTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "涓�鑸�" && x.States != "3" &&
+                                    x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 涓�鑸暣鏀圭巼
         /// </summary>
         /// <returns></returns>
-        public static string GetGeneralZgl()
+        public  string GetGeneralZgl()
         {
             var num1 = Math.Round(100.0 * GetGeneralClosedNum() / (GetGeneralClosedNum() + GetGeneralNotClosedNum()), 0).ToString();
             return num1;
@@ -358,33 +582,55 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇閲嶅ぇ闅愭偅鏁存敼闂幆椤�
         /// </summary>
         /// <returns></returns>
-        public static int GetMajorClosedNum()
+        public  int GetMajorClosedNum()
         {
-            var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.Risk_Level == "閲嶅ぇ" && x.States == "3" &&
-                                x.CheckTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "閲嶅ぇ" && x.States == "3" &&
+                                    x.CheckTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "閲嶅ぇ" && x.States == "3" &&
+                                    x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇閲嶅ぇ闅愭偅鏈暣鏀瑰畬鎴愰」
         /// </summary>
         /// <returns></returns>
-        public static int GetMajorNotClosedNum()
+        public  int GetMajorNotClosedNum()
         {
-            var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.Risk_Level == "閲嶅ぇ" && x.States != "3" &&
-                                x.CheckTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "閲嶅ぇ" && x.States != "3" &&
+                                    x.CheckTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.Risk_Level == "閲嶅ぇ" && x.States != "3" &&
+                                    x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 閲嶅ぇ鏁存敼鐜�
         /// </summary>
         /// <returns></returns>
-        public static string GetMajorZgl()
+        public  string GetMajorZgl()
         {
             var num1 = Math.Round(100.0 * GetMajorClosedNum() / (GetMajorClosedNum() + GetMajorNotClosedNum()), 0).ToString();
             if (num1 == "NaN") num1 = "0";
@@ -398,9 +644,16 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇浼佷笟璐熻矗浜哄甫鐝鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyLeadShiftCheckNum()
+        public  int GetCompanyLeadShiftCheckNum()
         {
-            return HSSEData_HSSEService.GetCompanyLeadShiftCheckNum();
+            if (pids == null)
+            {
+                return HSSEData_HSSEService.GetCompanyLeadShiftCheckNum();
+            }
+            else {
+                return HSSEData_HSSEService.GetCompanyLeadShiftCheckNum(pids);
+            }
+           
         }
 
 
@@ -409,54 +662,92 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇浼佷笟缁煎悎妫�鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyComprehensiveCheckNum()
+        public  int GetCompanyComprehensiveCheckNum()
         {
-            return HSSEData_HSSEService.GetCompanyComprehensiveCheckNum();
+            if (pids == null)
+                return HSSEData_HSSEService.GetCompanyComprehensiveCheckNum();
+            else
+                return HSSEData_HSSEService.GetCompanyComprehensiveCheckNum(pids);
         }
 
         /// <summary>
         ///     鑾峰彇浼佷笟涓撻」妫�鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanySpecialCheckNum()
+        public  int GetCompanySpecialCheckNum()
         {
-            return HSSEData_HSSEService.GetCompanySpecialCheckNum();
+            if (pids == null)
+                return HSSEData_HSSEService.GetCompanySpecialCheckNum();
+            else
+                return HSSEData_HSSEService.GetCompanySpecialCheckNum(pids);
         }
 
         /// <summary>
         ///     鑾峰彇椤圭洰璐熻矗浜哄甫鐝鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetProjectLeadShiftCheckNum()
+        public  int GetProjectLeadShiftCheckNum()
         {
-            var result = (from x in Funs.DB.Check_ProjectLeaderCheck
-                          where x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Check_ProjectLeaderCheck
+                              where x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Check_ProjectLeaderCheck
+                              where x.CompileDate > Const.DtmarkTime
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         ///     鑾峰彇椤圭洰涓撻」妫�鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetProjectSpecialCheckNum()
+        public  int GetProjectSpecialCheckNum()
         {
-            var result = (from x in Funs.DB.Check_CheckSpecial
-                          where x.CheckTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Check_CheckSpecial
+                              where x.CheckTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Check_CheckSpecial
+                              where x.CheckTime > Const.DtmarkTime
+                              && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+            
         }
 
         /// <summary>
         ///     鑾峰彇椤圭洰涓撲笟妫�鏌ユ鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetProjectMajorCheckNum()
+        public  int GetProjectMajorCheckNum()
         {
-            var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                          where x.CheckTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.CheckTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                              where x.CheckTime > Const.DtmarkTime
+                                 && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -465,74 +756,135 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇鏈亗浜嬩欢鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetNearMissNum()
+        public  int GetNearMissNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentPersonRecord
-                          join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
-                          where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+           
         }
 
         /// <summary>
         ///     鑾峰彇鍙褰曚簨浠舵暟
         /// </summary>
         /// <returns></returns>
-        public static int GetRecordableEventNum()
+        public  int GetRecordableEventNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentPersonRecord
-                          join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
-                          where x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Accident_AccidentPersonRecord
+                              join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
+                              where x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+            
         }
 
         /// <summary>
         ///     鑾峰彇涓�鑸簨鏁呮暟
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralAccidentNum()
+        public  int GetGeneralAccidentNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentReport
-                          where x.AccidentDegree == "1" && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Accident_AccidentReport
+                              where x.AccidentDegree == "1" && x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Accident_AccidentReport
+                              where x.AccidentDegree == "1" && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇杈冨ぇ浜嬫晠鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetMajorAccidentNum()
+        public  int GetMajorAccidentNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentReport
-                          where x.AccidentDegree == "2" && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Accident_AccidentReport
+                              where x.AccidentDegree == "2" && x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Accident_AccidentReport
+                              where x.AccidentDegree == "2" && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇閲嶅ぇ浜嬫晠鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSeriousAccidentNum()
+        public  int GetSeriousAccidentNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentReport
-                          where x.AccidentDegree == "3" && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Accident_AccidentReport
+                              where x.AccidentDegree == "3" && x.CompileDate > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Accident_AccidentReport
+                              where x.AccidentDegree == "3" && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇鐗瑰埆閲嶅ぇ浜嬫晠鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSpecialSeriousAccidentNum()
+        public  int GetSpecialSeriousAccidentNum()
         {
-            var result = (from x in Funs.DB.Accident_AccidentReport
+            if (pids == null) { 
+                var result = (from x in Funs.DB.Accident_AccidentReport
                           where x.AccidentDegree == "4"
                           select x).Count();
-            return result;
+                     return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Accident_AccidentReport
+                              where x.AccidentDegree == "4" && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -541,66 +893,125 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇浼佷笟绾х患鍚堥妗堟暟
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyComprehensivePlanNum()
+        public  int GetCompanyComprehensivePlanNum()
         {
-            var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
-                          join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
-                          where y.EmergencyTypeName.Contains("缁煎悎") && x.CompileDate > Const.DtmarkTime
-                          select x).Count() +
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
+                              join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                              where y.EmergencyTypeName.Contains("缁煎悎") && x.CompileDate > Const.DtmarkTime
+                              select x).Count() +
                           (from x in Funs.DB.Emergency_EmergencyList
                            join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
                            where y.EmergencyTypeName.Contains("缁煎悎") && x.CompileDate > Const.DtmarkTime
                            select x).Count();
-            return result;
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
+                              join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                              where y.EmergencyTypeName.Contains("缁煎悎") && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count() +
+                         (from x in Funs.DB.Emergency_EmergencyList
+                          join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                          where y.EmergencyTypeName.Contains("缁煎悎") && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                          select x).Count();
+                return result;
+
+            }
         }
 
         /// <summary>
         ///     鑾峰彇浼佷笟绾т笓椤归妗堟暟
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanySpecialPlanNum()
+        public  int GetCompanySpecialPlanNum()
         {
-            var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
-                          join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
-                          where y.EmergencyTypeName.Contains("涓撻」") && x.CompileDate > Const.DtmarkTime
-                          select x).Count() +
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
+                              join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                              where y.EmergencyTypeName.Contains("涓撻」") && x.CompileDate > Const.DtmarkTime
+                              select x).Count() +
                           (from x in Funs.DB.Emergency_EmergencyList
                            join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
                            where y.EmergencyTypeName.Contains("涓撻」") && x.CompileDate > Const.DtmarkTime
                            select x).Count();
-            return result;
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
+                              join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                              where y.EmergencyTypeName.Contains("涓撻」") && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count() +
+                         (from x in Funs.DB.Emergency_EmergencyList
+                          join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                          where y.EmergencyTypeName.Contains("涓撻」") && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                          select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇浼佷笟绾х幇鍦哄缃妗�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyOnSiteDisposalPlan()
+        public  int GetCompanyOnSiteDisposalPlan()
         {
-            var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
-                          join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
-                          where y.EmergencyTypeName.Contains("鐜板満澶勭疆") && x.CompileDate > Const.DtmarkTime
-                          select x).Count() +
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
+                              join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                              where y.EmergencyTypeName.Contains("鐜板満澶勭疆") && x.CompileDate > Const.DtmarkTime
+                              select x).Count() +
                           (from x in Funs.DB.Emergency_EmergencyList
                            join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
                            where y.EmergencyTypeName.Contains("鐜板満澶勭疆") && x.CompileDate > Const.DtmarkTime
                            select x).Count();
-            return result;
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
+                              join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                              where y.EmergencyTypeName.Contains("鐜板満澶勭疆") && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count() +
+                         (from x in Funs.DB.Emergency_EmergencyList
+                          join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                          where y.EmergencyTypeName.Contains("鐜板満澶勭疆") && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                          select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇浼佷笟绾ф紨缁冩鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompanyDrillNum()
+        public  int GetCompanyDrillNum()
         {
-            var result = (from x in Funs.DB.Emergency_DrillRecordList_Unit
-                          where x.CompileDate > Const.DtmarkTime
-                          select x).Count() +
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Emergency_DrillRecordList_Unit
+                              where x.CompileDate > Const.DtmarkTime
+                              select x).Count() +
                           (from x in Funs.DB.Emergency_DrillRecordList
                            where x.CompileDate > Const.DtmarkTime
                            select x).Count();
-            return result;
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Emergency_DrillRecordList_Unit
+                              where x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count() +
+                          (from x in Funs.DB.Emergency_DrillRecordList
+                           where x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                           select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -609,42 +1020,79 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇涓夌骇瀹夊叏鏁欒偛鍩硅鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSafeTrainNum()
+        public  int GetSafeTrainNum()
         {
-            var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
-                          join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
-                          join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
-                          where y.TrainType == "1"
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                              join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                              join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                              where y.TrainType == "1"
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                              join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                              join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                              where y.TrainType == "1" && pids.Contains(z.ProjectId)
+                              select x).Count();
+                return result;
+
+            }
         }
 
         /// <summary>
         ///     鑾峰彇涓撻」鍩硅鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSpecialTrainNum()
+        public  int GetSpecialTrainNum()
         {
-            var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
-                          join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
-                          join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
-                          where y.TrainType == "2"
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                              join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                              join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                              where y.TrainType == "2"
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                              join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                              join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                              where y.TrainType == "2" && pids.Contains(z.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇鐗圭浣滀笟鍩硅鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSpecialOperationTrainNum()
+        public  int GetSpecialOperationTrainNum()
         {
-            var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
-                          join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
-                          join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
-                          where y.TrainType == "3"
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                              join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                              join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                              where y.TrainType == "3"
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                              join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                              join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                              where y.TrainType == "3" && pids.Contains(z.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -653,52 +1101,99 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇涓�鑸闄╂暟
         /// </summary>
         /// <returns></returns>
-        public static int GetGeneralRiskNum()
+        public  int GetGeneralRiskNum()
         {
-            var result = (from x in Funs.DB.Hazard_HazardSelectedItem
-                          join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
-                          where y.RiskLevel == 2 && (x.IsStart == true || x.State == "1")
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 2 && (x.IsStart == true || x.State == "1")
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 2 && (x.IsStart == true || x.State == "1")
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇浣庨闄╂暟
         /// </summary>
         /// <returns></returns>
-        public static int GetLowRiskNum()
+        public  int GetLowRiskNum()
         {
-            var result = (from x in Funs.DB.Hazard_HazardSelectedItem
-                          join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
-                          where y.RiskLevel == 1 && (x.IsStart == true || x.State == "1")
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 1 && (x.IsStart == true || x.State == "1")
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 1 && (x.IsStart == true || x.State == "1")
+                               && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇涓闄╂暟
         /// </summary>
         /// <returns></returns>
-        public static int GetMediumRiskNum()
+        public  int GetMediumRiskNum()
         {
-            var result = (from x in Funs.DB.Hazard_HazardSelectedItem
-                          join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
-                          where y.RiskLevel == 3 && (x.IsStart == true || x.State == "1")
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 3 && (x.IsStart == true || x.State == "1")
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 3 && (x.IsStart == true || x.State == "1")
+                                && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇楂橀闄╂暟
         /// </summary>
         /// <returns></returns>
-        public static int GetHighRiskNum()
+        public  int GetHighRiskNum()
         {
-            var result = (from x in Funs.DB.Hazard_HazardSelectedItem
-                          join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
-                          where y.RiskLevel == 4 && (x.IsStart == true || x.State == "1")
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 4 && (x.IsStart == true || x.State == "1")
+                              select x).Count();
+                return result;
+            }
+            else {
+                var result = (from x in Funs.DB.Hazard_HazardSelectedItem
+                              join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
+                              where y.RiskLevel == 4 && (x.IsStart == true || x.State == "1")
+                              && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -707,103 +1202,190 @@ namespace FineUIPro.Web.common
         ///     鑾峰彇鍗卞ぇ宸ョ▼瀹℃壒瀹屾垚鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompletedNum()
+        public  int GetCompletedNum()
         {
-            var result = (from x in Funs.DB.Solution_LargerHazard
-                          where x.States != "0" && x.IsSuperLargerHazard == false &&
-                                x.RecordTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States != "0" && x.IsSuperLargerHazard == false &&
+                                    x.RecordTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States != "0" && x.IsSuperLargerHazard == false &&
+                                    x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇鍗卞ぇ宸ョ▼鍩硅浜烘鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetTrainPersonNum()
+        public  int GetTrainPersonNum()
         {
-            var result = (from x in Funs.DB.Solution_LargerHazard
-                          where x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
-                          select x.TrainPersonNum).ToList().Sum(x => x.Value);
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
+                              select x.TrainPersonNum).ToList().Sum(x => x.Value);
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x.TrainPersonNum).ToList().Sum(x => x.Value);
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇鍗卞ぇ宸ョ▼鏂藉伐涓暟
         /// </summary>
         /// <returns></returns>
-        public static int GetConstructionNum()
+        public  int GetConstructionNum()
         {
-            var result = (from x in Funs.DB.Solution_LargerHazard
-                          where x.States == "2" && x.IsSuperLargerHazard == false &&
-                                x.RecordTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "2" && x.IsSuperLargerHazard == false &&
+                                    x.RecordTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "2" && x.IsSuperLargerHazard == false &&
+                                    x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇鍗卞ぇ宸ョ▼瀹屽伐涓暟
         /// </summary>
         /// <returns></returns>
-        public static int GetFinishedNum()
+        public  int GetFinishedNum()
         {
-            var result = (from x in Funs.DB.Solution_LargerHazard
-                          where x.States == "3" && x.IsSuperLargerHazard == false &&
-                                x.RecordTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "3" && x.IsSuperLargerHazard == false &&
+                                    x.RecordTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "3" && x.IsSuperLargerHazard == false &&
+                                    x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇瓒呭嵄澶у伐绋嬪鎵瑰畬鎴愭暟
         /// </summary>
         /// <returns></returns>
-        public static int GetSuperCompletedNum()
+        public  int GetSuperCompletedNum()
         {
-            var result = (from x in Funs.DB.Solution_LargerHazard
-                          where x.States != "0" && x.IsSuperLargerHazard == true &&
-                                x.RecordTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States != "0" && x.IsSuperLargerHazard == true &&
+                                    x.RecordTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States != "0" && x.IsSuperLargerHazard == true &&
+                                    x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇瓒呭嵄澶у伐绋嬪煿璁汉娆℃暟
         /// </summary>
         /// <returns></returns>
-        public static int GetSuperTrainPersonNum()
+        public  int GetSuperTrainPersonNum()
         {
-            var result =
+            if (pids == null)
+            {
+                var result =
                 (from x in Funs.DB.Solution_LargerHazard
                  where x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
                  select x.TrainPersonNum).ToList().Sum(x => x.Value);
-            return result;
+                return result;
+            }
+            else
+            {
+                var result =
+              (from x in Funs.DB.Solution_LargerHazard
+               where x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+               select x.TrainPersonNum).ToList().Sum(x => x.Value);
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇瓒呭嵄澶у伐绋嬫柦宸ヤ釜鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSuperConstructionNum()
+        public  int GetSuperConstructionNum()
         {
-            var result = (from x in Funs.DB.Solution_LargerHazard
-                          where x.States == "2" && x.IsSuperLargerHazard == true &&
-                                x.RecordTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "2" && x.IsSuperLargerHazard == true &&
+                                    x.RecordTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "2" && x.IsSuperLargerHazard == true &&
+                                    x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         ///     鑾峰彇瓒呭嵄澶у伐绋嬪畬宸ヤ釜鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetSuperFinishedNum()
+        public  int GetSuperFinishedNum()
         {
-            var result = (from x in Funs.DB.Solution_LargerHazard
-                          where x.States == "3" && x.IsSuperLargerHazard == true &&
-                                x.RecordTime > Const.DtmarkTime
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "3" && x.IsSuperLargerHazard == true &&
+                                    x.RecordTime > Const.DtmarkTime
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                var result = (from x in Funs.DB.Solution_LargerHazard
+                              where x.States == "3" && x.IsSuperLargerHazard == true &&
+                                    x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
     }
diff --git a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs
index 3ffd8ad4..eddc0f93 100644
--- a/SGGL/FineUIPro.Web/common/main_new1.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new1.aspx.cs
@@ -18,6 +18,12 @@ namespace FineUIPro.Web.common
         protected string hjallNumber = "0";
         protected string hjfinishNumber = "0";
         protected string hjzgl = "0";
+
+        /// <summary>
+        /// 鍏徃绾ч」鐩瓫閫�
+        /// </summary>
+        public string[] pids { get; set; }
+
         /// <summary>
         /// 椤甸潰鍔犺浇
         /// </summary>
@@ -27,6 +33,20 @@ namespace FineUIPro.Web.common
         {
             if (!IsPostBack)
             {
+                if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
+                {
+                    pids = CurrUser.CompanyProjectId.Split(',');
+                }
+                else
+                {
+                    //鍔犺浇鎵�鏈夊湪寤洪」鐩殑鏁版嵁
+                    var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray();
+                    if (pidArray.Length > 0)
+                    {
+                        pids = pidArray;
+                    }
+                }
+
                 ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false);
                 if (this.drpProject.Items.Count > 0)
                 {
@@ -121,78 +141,139 @@ namespace FineUIPro.Web.common
         /// 鑾峰彇椤圭洰閮ㄤ汉鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetProjectPersonNum()
+        public int GetProjectPersonNum()
         {
-            int result = (from x in Funs.DB.SitePerson_Person
-                          join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                          where y.IsCQMS == true && x.IsUsed == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.SitePerson_Person
+                              join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                              where y.IsCQMS == true && x.IsUsed == true
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.SitePerson_Person
+                              join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                              where y.IsCQMS == true && x.IsUsed == true && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+
         }
 
         /// <summary>
         /// 鑾峰彇鍦ㄧ敤璁￠噺鍣ㄥ叿鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetUseNum()
+        public int GetUseNum()
         {
-            int result = (from x in Funs.DB.Comprehensive_InspectionMachine
-                          where x.IsOnSite == true && x.InspectionType.Contains("璁￠噺")
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("璁￠噺")
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("璁￠噺") && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
+
         }
         /// <summary>
         /// 鑾峰彇鏍″噯鍚堟牸鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetOKNum()
+        public int GetOKNum()
         {
-            int result = (from x in Funs.DB.Comprehensive_InspectionMachine
-                          where x.IsOnSite == true && x.InspectionType.Contains("璁￠噺") && x.IsCheckOK == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("璁￠噺") && x.IsCheckOK == true
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Comprehensive_InspectionMachine
+                              where x.IsOnSite == true && x.InspectionType.Contains("璁￠噺") && x.IsCheckOK == true && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 鏈烘棰勮
         /// </summary>
         /// <returns></returns>
-        public static int GetJxyjNum()
+        public int GetJxyjNum()
         {
-            int result = 0;
-            //鏈哄叿鎶ラ獙鐨勫埌鏈熸彁閱掑拰杩囨湡鎻愰啋璁板綍鏁板姞涓�璧�
-            //鏈哄叿鎶ラ獙鐨勫埌鏈熸彁閱掓暟
-            //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
-            // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
-            //杩囨湡鎻愰啋璁板綍鏁�
-            var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
-            //result = num1 + num2;
-            result =  num2;
-            return result;
+            if (pids == null)
+            {
+                int result = 0;
+                //鏈哄叿鎶ラ獙鐨勫埌鏈熸彁閱掑拰杩囨湡鎻愰啋璁板綍鏁板姞涓�璧�
+                //鏈哄叿鎶ラ獙鐨勫埌鏈熸彁閱掓暟
+                //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
+                // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
+                //杩囨湡鎻愰啋璁板綍鏁�
+                var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
+                //result = num1 + num2;
+                result = num2;
+                return result;
+            }
+            else {
+                int result = 0;
+                //杩囨湡鎻愰啋璁板綍鏁�
+                var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now
+                && pids.Contains(x.ProjectId)).Count();
+                //result = num1 + num2;
+                result = num2;
+                return result;
+            }
         }
 
         /// <summary>
         /// 鑾峰彇璐ㄩ噺鍩硅浜烘鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetTrainPersonNum()
+        public int GetTrainPersonNum()
         {
-            int result = (from x in Funs.DB.Comprehensive_InspectionPerson
-                          where x.IsTrain == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Comprehensive_InspectionPerson
+                              where x.IsTrain == true
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Comprehensive_InspectionPerson
+                              where x.IsTrain == true && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 鑾峰彇鎶�鏈氦搴曚汉娆℃暟
         /// </summary>
         /// <returns></returns>
-        public static int GetTechnicalDisclosePersonNum()
+        public int GetTechnicalDisclosePersonNum()
         {
-            var result = (from x in Funs.DB.Comprehensive_DesignDetails
-                          select x.JoinPersonNum ?? 0).ToList().Sum();
-            var q = Funs.GetNewIntOrZero(result.ToString());
-            return q;
+            if (pids == null)
+            {
+                var result = (from x in Funs.DB.Comprehensive_DesignDetails
+                              select x.JoinPersonNum ?? 0).ToList().Sum();
+                var q = Funs.GetNewIntOrZero(result.ToString());
+                return q;
+            }
+            else {
+                var result = (from x in Funs.DB.Comprehensive_DesignDetails
+                              where pids.Contains(x.ProjectId)
+                              select x.JoinPersonNum ?? 0).ToList().Sum();
+                var q = Funs.GetNewIntOrZero(result.ToString());
+                return q;
+            }
         }
 
         /// <summary>
@@ -200,13 +281,26 @@ namespace FineUIPro.Web.common
         /// </summary>
         private void getEarlyWarningCounts()
         {
-            int allCount = 0;
-            var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
-                                    where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
-                                    select x;
-            //// 棰勮浜烘暟
-            allCount = getPersonQualitys.Count();
-            this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
+            if (pids == null)
+            {
+                int allCount = 0;
+                var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
+                                        where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
+                                        select x;
+                //// 棰勮浜烘暟
+                allCount = getPersonQualitys.Count();
+                this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
+
+            }
+            else {
+                int allCount = 0;
+                var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
+                                        where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true && pids.Contains(x.ProjectId)
+                                        select x;
+                //// 棰勮浜烘暟
+                allCount = getPersonQualitys.Count();
+                this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
+            }
         }
 
         #region 璐ㄩ噺楠屾敹鏁版嵁
@@ -214,48 +308,73 @@ namespace FineUIPro.Web.common
         /// 鍏辨鎬绘暟
         /// </summary>
         /// <returns></returns>
-        public static int getAllInspectionManagement()
+        public int getAllInspectionManagement()
         {
-            int result = 0;
-            ;
-            //缁熻鎵�缁欐椂闂存鐨勫叏閮ㄦ暟閲�
-            //List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
-            //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
-            //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
-            var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        select x).Count();
-            result = num1;
-            //int result = (from x in Funs.DB.Check_CheckControl
-            //              where x.CheckDate <= DateTime.Now && x.State == "7"
-            //              select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = 0;
+                //缁熻鎵�缁欐椂闂存鐨勫叏閮ㄦ暟閲�
+                //List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber =
+                //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
+                //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, false);
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            select x).Count();
+                result = num1;
+                //int result = (from x in Funs.DB.Check_CheckControl
+                //              where x.CheckDate <= DateTime.Now && x.State == "7"
+                //              select x).Count();
+                return result;
+            }
+            else {
+                int result = 0;
+                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where pids.Contains(x.ProjectId)
+                            select x).Count();
+                result = num1;
+
+                return result;
+            }
         }
         /// <summary>
         /// 娆″悎鏍兼暟閲�
         /// </summary>
         /// <returns></returns>
-        public static int getIsOnceInspectionManagement()
+        public int getIsOnceInspectionManagement()
         {
-            int result = 0;
-            //缁熻鎵�缁欐椂闂存鐨勫悎鏍兼暟閲�
-            //List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
-            //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
-            //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
-            var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                        where x.IsOnceQualified == true
-                        select x).Count();
-            result = num2;
+            if (pids == null)
+            {
+                int result = 0;
+                //缁熻鎵�缁欐椂闂存鐨勫悎鏍兼暟閲�
+                //List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber =
+                //    BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
+                //        null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true
+                            select x).Count();
+                result = num2;
 
-            //int result = (from x in Funs.DB.Check_CheckControl
-            //              where x.CheckDate <= DateTime.Now && x.State != "7"
-            //              select x).Count();
-            return result;
+                //int result = (from x in Funs.DB.Check_CheckControl
+                //              where x.CheckDate <= DateTime.Now && x.State != "7"
+                //              select x).Count();
+                return result;
+            }
+            else {
+                int result = 0;
+
+                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                            where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
+                            select x).Count();
+                result = num2;
+
+
+                return result;
+            }
         }
         /// <summary>
         /// 鏁存敼鐜�
         /// </summary>
         /// <returns></returns>
-        public static string GetInspectionManagementZgl()
+        public string GetInspectionManagementZgl()
         {
             string zgl = String.Format("{0:N2}", 100.0 * getIsOnceInspectionManagement() / getAllInspectionManagement());
             return zgl + "%";
@@ -269,30 +388,48 @@ namespace FineUIPro.Web.common
         /// 鑾峰彇鏁存敼瀹屾垚鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetProblemCompletedNum()
+        public int GetProblemCompletedNum()
         {
-            int result = (from x in Funs.DB.Check_CheckControl
-                          where x.CheckDate <= DateTime.Now && x.State == "7"
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State == "7"
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         /// <summary>
         /// 鑾峰彇鏈暣鏀规暟
         /// </summary>
         /// <returns></returns>
-        public static int GetProblemNotCompletedNum()
+        public int GetProblemNotCompletedNum()
         {
-            int result = (from x in Funs.DB.Check_CheckControl
-                          where x.CheckDate <= DateTime.Now && x.State != "7"
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State != "7"
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
 
         /// <summary>
         /// 鏁存敼鐜�
         /// </summary>
         /// <returns></returns>
-        public static string GetProblemZgl()
+        public string GetProblemZgl()
         {
             string zgl = String.Format("{0:N2}", 100.0 * GetProblemCompletedNum() / (GetProblemCompletedNum() + GetProblemNotCompletedNum()));
             return zgl + "%";
@@ -316,12 +453,21 @@ namespace FineUIPro.Web.common
         /// 鑾峰彇闂涓暟
         /// </summary>
         /// <returns></returns>
-        public static int GetProblemNum()
+        public int GetProblemNum()
         {
-            int result = (from x in Funs.DB.Check_CheckControl
-                          where x.CheckDate <= DateTime.Now
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now
+                              select x).Count();
+                return result;
+            }
+            else {
+                int result = (from x in Funs.DB.Check_CheckControl
+                              where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         #endregion
 
@@ -329,114 +475,216 @@ namespace FineUIPro.Web.common
         /// 鑾峰彇鐒婂伐鎬绘暟
         /// </summary>
         /// <returns></returns>
-        public static int GetWelderNum()
+        public int GetWelderNum()
         {
-            int result = (from x in Funs.DB.BS_Welder
-                          where x.WED_IfOnGuard == true
-                          select x).Count();
-            return result;
+            if (pids == null)
+            {
+                int result = (from x in Funs.DB.BS_Welder
+                              where x.WED_IfOnGuard == true
+                              select x).Count();
+                return result;
+            }
+            else
+            {
+                int result = (from x in Funs.DB.BS_Welder
+                              where x.WED_IfOnGuard == true && pids.Contains(x.ProjectId)
+                              select x).Count();
+                return result;
+            }
         }
         /// <summary>
         /// 鑾峰彇鎬昏揪鍥犳暟
         /// </summary>
         /// <returns></returns>
-        public static int GetTotalDineNum()
+        public int GetTotalDineNum()
         {
-            int result = 0;
-            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
-                        select x;
-            if (getD1.Count() > 0)
+            if (pids == null)
             {
-                foreach (var item in getD1)
+                int result = 0;
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                            select x;
+                if (getD1.Count() > 0)
                 {
-                    result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
+                    }
                 }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
+                    }
+                }
+                return result;
             }
             else
             {
-                var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                             orderby x.CompileDate descending
-                             select x).FirstOrDefault();
-                if (getD2 != null)
+                int result = 0;
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                            where pids.Contains(x.ProjectId)
+                            select x;
+                if (getD1.Count() > 0)
                 {
-                    result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalWeldQuantity.Split('.')[0]);
+                    }
                 }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 where pids.Contains(x.ProjectId)
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalWeldQuantity.Split('.')[0]);
+                    }
+                }
+                return result;
             }
-            return result;
         }
         /// <summary>
         /// 鑾峰彇瀹屾垚杈惧洜鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetCompleteDineNum()
+        public int GetCompleteDineNum()
         {
-            int result = 0;
-
-            var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
-
-                        select x;
-            if (getD1.Count() > 0)
+            if (pids == null)
             {
-                foreach (var item in getD1)
-                {
-                    result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
-                }
-            }
-            else
-            {
-                var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                             orderby x.CompileDate descending
-                             select x).FirstOrDefault();
-                if (getD2 != null)
-                {
-                    result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
-                }
+                int result = 0;
 
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+
+                            select x;
+                if (getD1.Count() > 0)
+                {
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
+                    }
+                }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
+                    }
+
+                }
+                return result;
+            }
+            else {
+                int result = 0;
+
+                var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
+                            where pids.Contains(x.ProjectId)
+                            select x;
+                if (getD1.Count() > 0)
+                {
+                    foreach (var item in getD1)
+                    {
+                        result += Funs.GetNewIntOrZero(item.TotalCompleted.Split('.')[0]);
+                    }
+                }
+                else
+                {
+                    var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                                 where pids.Contains(x.ProjectId)
+                                 orderby x.CompileDate descending
+                                 select x).FirstOrDefault();
+                    if (getD2 != null)
+                    {
+                        result = Funs.GetNewIntOrZero(getD2.TotalCompleted.Split('.')[0]);
+                    }
+
+                }
+                return result;
             }
-            return result;
         }
         /// <summary>
         /// 鑾峰彇鎬荤墖鏁�
         /// </summary>
         /// <returns></returns>
-        public static int GetTotalFilmNum()
+        public int GetTotalFilmNum()
         {
-            //int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
-            //                              join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
-            //                              select x.CHT_TotalFilm).ToList().Sum());
-            int result = 0;
-
-            var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                         orderby x.CompileDate descending
-                         select x).FirstOrDefault();
-            if (getD2 != null)
+            if (pids == null)
             {
-                result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
+                //int result = Convert.ToInt32((from x in Funs.DB.CH_CheckItem
+                //                              join y in Funs.DB.CH_Check on x.CHT_CheckID equals y.CHT_CheckID
+                //                              select x.CHT_TotalFilm).ToList().Sum());
+                int result = 0;
+
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
+                }
+                return result;
+            }
+            else
+            {
+                int result = 0;
+
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where pids.Contains(x.ProjectId)
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmAmount.Split('.')[0]);
+                }
+                return result;
             }
-            return result;
         }
         /// <summary>
         /// 鑾峰彇鍚堟牸鐗囨暟
         /// </summary>
         /// <returns></returns>
-        public static int GetOKFilmNum()
+        public int GetOKFilmNum()
         {
-            int result = 0;
-            var getD2 = (from x in Funs.DB.HJGL_FL_Data
-                         orderby x.CompileDate descending
-                         select x).FirstOrDefault();
-            if (getD2 != null)
+            if (pids == null)
             {
-                result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+                int result = 0;
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+                }
+                return result;
+            }
+            else
+            {
+                int result = 0;
+                var getD2 = (from x in Funs.DB.HJGL_FL_Data
+                             where pids.Contains(x.ProjectId)
+                             orderby x.CompileDate descending
+                             select x).FirstOrDefault();
+                if (getD2 != null)
+                {
+                    result = Funs.GetNewIntOrZero(getD2.OneTimeFilmQualifiedAmount.Split('.')[0]);
+                }
+                return result;
             }
-            return result;
         }
 
         /// <summary>
         /// 涓�娆℃媿鐗囧悎鏍肩巼
         /// </summary>
         /// <returns></returns>
-        public static string GetOKFilmHgl()
+        public string GetOKFilmHgl()
         {
             string zgl = "0";
             if (GetOKFilmNum() > 0)
@@ -459,38 +707,114 @@ namespace FineUIPro.Web.common
         private void getInspectionManagementInfo()
         {
 
-            var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
-            foreach (var item in q)
+            if (this.CurrUser.UserId == BLL.Const.hfnbdId)
             {
-                //鑾峰彇涓撲笟
-                InspectionManagementZy += "'" + item.ProfessionalName + "',";
-                //鏍规嵁涓撲笟鑾峰彇鎬昏
-                //var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
-                //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                //            where y.CNProfessionalId == item.CNProfessionalId
-                //            select x).ToList().Count;
-                var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                            where x.CNProfessionalId == item.CNProfessionalId
-                            select x).Count();
-                InspectionManagementSumCount += "'" + num1 + "',";
+                //var q=(from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+                var q = (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList();
 
-                //鏍规嵁涓撲笟鑾峰彇鍚堟牸鏁�
-                //var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
-                //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                //            where y.CNProfessionalId == item.CNProfessionalId &&  y.IsOnceQualified==true
-                //            select x).ToList().Count;
-                var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
-                            where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
-                            select x).Count();
-                InspectionManagementOkCount += "'" + num2 + "',";
 
-                //涓�娆￠獙鏀跺悎鏍肩巼
-                var hgl = "0";
-                if (num1 > 0)
+                foreach (var item in q)
                 {
-                    hgl += String.Format("{0:N2}", 100.0 * num2 / num1);
+                    //鑾峰彇涓撲笟
+                    InspectionManagementZy += "'" + item.DetectionItems + "',";
+                    //鏍规嵁涓撲笟鑾峰彇鎬昏
+                    //var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
+                    //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
+                    //            where y.CNProfessionalId == item.CNProfessionalId
+                    //            select x).ToList().Count;
+                    var num1 = 0;
+                    var num2 = 0;
+                    if (pids == null)
+                    {
+                        num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.ControlId
+                                select x).Count();
+                        num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true
+                                select x).Count();
+                    }
+                    else
+                    {
+                        num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId)
+                                select x).Count();
+                        num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
+                                select x).Count();
+                    }
+
+
+                    InspectionManagementSumCount += "'" + num1 + "',";
+
+                    //鏍规嵁涓撲笟鑾峰彇鍚堟牸鏁�
+                    //var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
+                    //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
+                    //            where y.CNProfessionalId == item.CNProfessionalId &&  y.IsOnceQualified==true
+                    //            select x).ToList().Count;
+
+                    InspectionManagementOkCount += "'" + num2 + "',";
+
+                    //涓�娆￠獙鏀跺悎鏍肩巼
+                    var hgl = "0";
+                    if (num1 > 0)
+                    {
+                        hgl += String.Format("{0:N2}", 100.0 * num2 / num1);
+                    }
+                    InspectionManagementOneOkCount += "'" + hgl + "',";
+                }
+            }
+            else
+            {
+                var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+              
+                foreach (var item in q)
+                {
+                    //鑾峰彇涓撲笟
+                    InspectionManagementZy += "'" + item.ProfessionalName + "',";
+                    //鏍规嵁涓撲笟鑾峰彇鎬昏
+                    //var num1 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
+                    //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
+                    //            where y.CNProfessionalId == item.CNProfessionalId
+                    //            select x).ToList().Count;
+                    var num1 = 0;
+                    var num2 = 0;
+                    if (pids == null)
+                    {
+                        num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.CNProfessionalId
+                                select x).Count();
+                        num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
+                                select x).Count();
+                    }
+                    else
+                    {
+                        num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)
+                                select x).Count();
+                        num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
+                                where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
+                                select x).Count();
+                    }
+
+                    InspectionManagementSumCount += "'" + num1 + "',";
+
+                    //鏍规嵁涓撲笟鑾峰彇鍚堟牸鏁�
+                    //var num2 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
+                    //            join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
+                    //            where y.CNProfessionalId == item.CNProfessionalId &&  y.IsOnceQualified==true
+                    //            select x).ToList().Count;
+
+                    InspectionManagementOkCount += "'" + num2 + "',";
+
+                    //涓�娆￠獙鏀跺悎鏍肩巼
+                    var hgl = "0";
+                    if (num1 > 0)
+                    {
+                        hgl += String.Format("{0:N2}", 100.0 * num2 / num1);
+                    }
+                    InspectionManagementOneOkCount += "'" + hgl + "',";
                 }
-                InspectionManagementOneOkCount += "'" + hgl + "',";
             }
             InspectionManagementZy = InspectionManagementZy.TrimEnd(',');
             InspectionManagementSumCount = InspectionManagementSumCount.TrimEnd(',');
@@ -514,29 +838,56 @@ namespace FineUIPro.Web.common
         protected string ncrCount;
         private void getNcrInfo()
         {
-            //闂幆椤� 鏈夊畬鎴愭棩鏈熺殑
-            //var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
-            //var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate == null).Count(); 
-            var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "宸查棴鍚�").Count();
-            var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "鏁存敼涓�").Count();
-            ncrZgbhx = num1.ToString();
-            ncrwZgbhx = num2.ToString();
-            if ((num1 + num2) > 0)
+            if (pids==null)
             {
-                ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
-            }
+                //闂幆椤� 鏈夊畬鎴愭棩鏈熺殑
+                //var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
+                //var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate == null).Count(); 
+                var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "宸查棴鍚�").Count();
+                var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "鏁存敼涓�").Count();
+                ncrZgbhx = num1.ToString();
+                ncrwZgbhx = num2.ToString();
+                if ((num1 + num2) > 0)
+                {
+                    ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
+                }
 
-            //鍔犺浇涓撲笟
-            var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId!=BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
-            foreach (var item in list)
-            {
-                ncrZy += "'" + item.ProfessionalName + "',";
-                //鏍规嵁涓撲笟鍔犺浇鏁版嵁閲�
-                var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId).Count();
-                ncrCount += "'" + num3 + "',";
+                //鍔犺浇涓撲笟
+                var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+                foreach (var item in list)
+                {
+                    ncrZy += "'" + item.ProfessionalName + "',";
+                    //鏍规嵁涓撲笟鍔犺浇鏁版嵁閲�
+                    var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId).Count();
+                    ncrCount += "'" + num3 + "',";
+                }
+                ncrZy = ncrZy.TrimEnd(',');
+                ncrCount = ncrCount.TrimEnd(',');
             }
-            ncrZy = ncrZy.TrimEnd(',');
-            ncrCount = ncrCount.TrimEnd(',');
+            else
+            {
+                var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "宸查棴鍚�" && pids.Contains(x.ProjectId)).Count();
+                var num2 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.ImplementationFrontState == "鏁存敼涓�" && pids.Contains(x.ProjectId)).Count();
+                ncrZgbhx = num1.ToString();
+                ncrwZgbhx = num2.ToString();
+                if ((num1 + num2) > 0)
+                {
+                    ncrZgl = String.Format("{0:N2}", 100.0 * num1 / (num1 + num2)) + "%";
+                }
+
+                //鍔犺浇涓撲笟
+                var list = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId orderby x.SortIndex select x).ToList();
+                foreach (var item in list)
+                {
+                    ncrZy += "'" + item.ProfessionalName + "',";
+                    //鏍规嵁涓撲笟鍔犺浇鏁版嵁閲�
+                    var num3 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)).Count();
+                    ncrCount += "'" + num3 + "',";
+                }
+                ncrZy = ncrZy.TrimEnd(',');
+                ncrCount = ncrCount.TrimEnd(',');
+            }
+           
 
         }
         #endregion
diff --git a/SGGL/FineUIPro.Web/index.aspx b/SGGL/FineUIPro.Web/index.aspx
index 508fb88c..dd8ae329 100644
--- a/SGGL/FineUIPro.Web/index.aspx
+++ b/SGGL/FineUIPro.Web/index.aspx
@@ -43,13 +43,7 @@
             background-color: transparent !important;
         }
 
-        .projcet-select {
-            float: left;
-            height: 40px;
-            flex: 1;
-            display: flex;
-            justify-content: flex-end;
-        }
+
 
         .bgbtn {
             /*background-image: url(../res/images/login.png) !important;*/
@@ -168,20 +162,130 @@
         .bgbtn_head {
             display: inline-block;
             position: absolute;
-            width: 40%;
+            width: 96%;
             height: 50%;
-            left: 30%;
+            left: 2%;
             top: 0;
             background: none !important;
             border: none !important;
             padding: 0 !important;
         }
-        .f-btn .f-btn-text{
-                        color: #fff;
+
+        .f-btn .f-btn-text {
+            color: #fff;
+        }
+
+        .n-btns-r .n-btn-l-act {
+            background-image: url(./res/images/03.png) !important;
+        }
+    </style>
+    <style>
+        .projcet-select {
+            position: absolute;
+            bottom: -13%;
+            left: 50%;
+            transform: translateX(-50%);
+        }
+
+        h1 {
+        }
+
+        .projcet-select input {
+            padding-right: 23px;
+            font-size: 14px;
+            padding: 0;
+            border:none;
+            color:#ffffff;
+                padding-left: 10px;
+                 background: rgba(0,0,0,0);
 
         }
-        .n-btns-r .n-btn-l-act{
-            background-image: url(./res/images/03.png) !important;
+        .projcet-select input::placeholder {
+  color: #ffffff;
+}
+        .projcet-select .f-field-triggerbox-icons {
+            font-size: 16px;
+            position: absolute;
+            bottom: 3%;
+            margin: 0;
+            padding: 0;
+        }
+        .projcet-select .f-field-triggerbox-icons i{
+            position: absolute;
+    bottom: 0;
+    right: 0;
+        }
+
+       .projcet-select .f-state-hover, .f-widget-content .f-state-hover, .f-widget-header .f-state-hover, .f-state-focus, .f-widget-content .f-state-focus, .f-widget-header .f-state-focus{
+           background: rgba(0,0,0,0);
+           border:none
+        }
+       .projcet-select  .f-panel.f-panel-noheader.f-panel-noborder, .f-panel.f-panel-noheader.f-panel-noborder>.f-panel-bodyct>.f-panel-body{
+           font-size: 14px;
+       }
+      
+       .f-field-body-cell-inner{
+           font-size: 14px;
+       }
+       .grid1_class .f-field-body-cell-inner input{
+           padding: 2px 10px;
+       }
+        .grid1_class .f-state-hover {
+           border: none;
+        }
+        .grid1_toolbar {
+            background:#000231
+        }
+        
+      .grid1_class thead{
+              background: #d7ebf9;
+                color: #18A6F1;
+        }
+
+        .grid1_toolbar input {
+             background:#000231
+        }
+        .grid1_toolbar .f-corner-all {
+             background:#000231
+        }
+
+       /*琛ㄦ牸绗竴琛岄鑹�*/
+         .f-grid-row-selected{
+             background-color:#E4F2FF !important;
+             color:black;
+                 
+         }
+         /*琛ㄦ牸鍗曡棰滆壊*/
+        .f-grid-row{
+            background-color:#E4F2FF;
+             color:black;
+        }
+
+        /*鍚勮棰滆壊*/
+        .f-grid-row-alt {
+            background-color: #ffffff !important;
+             color:black;
+        }
+
+        .f-state-active, .f-widget-content .f-state-active, .f-widget-header .f-state-active {
+        
+            color:black;
+        }
+
+        .f-state-active .f-icon {
+    color: darkcyan;
+}
+
+        .grid1_class .f-state-hover {
+            color:black;
+            background: #99e7ff !important;
+            background: none;
+        
+        }
+
+        .grid1_class .f-grid-bodyct {
+        
+          background:#000231 !important
         }
     </style>
 </head>
@@ -196,88 +300,151 @@
                         <div class="header">
                             <div class="nav-left">
                                 <div class="nav-btn t-btns">
-                                    <div class="t-btn t-btn-act" id="div_xmgk" onclick="changeHead(0)" style="cursor:pointer">椤圭洰姒傚喌
+                                    <div class="t-btn t-btn-act" id="div_xmgk" onclick="changeHead(0)" style="cursor: pointer">
+                                        椤圭洰姒傚喌
                                         <f:Button runat="server" CssClass="bgbtntop" OnClick="btnXmgk_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_xmgk"
-                                             OnClientClick="parent.removeActiveTab();">
-                                          </f:Button></div>
-                                    <div class="t-btn" id="div_aqsc" onclick="changeHead(1)" style="cursor:pointer">瀹夊叏鐢熶骇
-                                        <f:Button runat="server" CssClass="bgbtntop" OnClick="btnAqsc_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_aqsc"
-                                             OnClientClick="parent.removeActiveTab();">
-                                          </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_xmgk"
+                                            OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
-                                    <div class="t-btn" id="div_zlgl" onclick="changeHead(2)" style="cursor:pointer">璐ㄩ噺绠＄悊
+                                    <div class="t-btn" id="div_aqsc" onclick="changeHead(1)" style="cursor: pointer">
+                                        瀹夊叏鐢熶骇
+                                        <f:Button runat="server" CssClass="bgbtntop" OnClick="btnAqsc_Click" Hidden="true"
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_aqsc"
+                                            OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
+                                    <div class="t-btn" id="div_zlgl" onclick="changeHead(2)" style="cursor: pointer">
+                                        璐ㄩ噺绠＄悊
                                         <f:Button runat="server" CssClass="bgbtntop" OnClick="btnZlgl_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_zlgl"
-                                             OnClientClick="parent.removeActiveTab();">
-                                          </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btn_zlgl"
+                                            OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
                                 </div>
                                 <div class="nav-btn n-btns-l">
-                                    <div class="n-btn-l" >
-                                        <f:Button runat="server"  Text="椤圭洰娓呭崟" ID="btnProject" OnClick="btnProject_Click"
-                                                        EnablePostBack="true"  EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button></div>
-                                    <div class="n-btn-l" >
+                                    <div class="n-btn-l">
+                                        <f:Button runat="server" Text="椤圭洰娓呭崟" ID="btnProject" OnClick="btnProject_Click"
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
+                                    <div class="n-btn-l">
                                         <f:Button runat="server" Text="澶ф暟鎹腑蹇�" ID="btnDigData" OnClick="btnDigData_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button></div>
-                                    <div class="n-btn-l" >
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
+                                    <div class="n-btn-l">
                                         <f:Button runat="server" Text="鎬婚儴妫�鏌�" ID="btnServer" OnClick="btnServer_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button></div>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                    </div>
                                 </div>
                             </div>
-                            <div class="nav-center">
+                            <div class="nav-center" style="position: relative;">
                                 <h1>涓浗浜旂幆宸ョ▼鏈夐檺鍏徃鏅烘収鏂藉伐绠＄悊淇℃伅绯荤粺锛堝叕鍙哥骇锛�<f:Button runat="server" CssClass="bgbtn_head" EnablePostBack="true" OnClick="btnHome_Click"
-                                            EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
-                                        </f:Button></h1>
+                                    EnableDefaultState="true" EnableDefaultCorner="false" ID="btnHome" OnClientClick="parent.removeActiveTab();">
+                                </f:Button>
+                                </h1>
+
+                                <div class="projcet-select">
+                                    <f:DropDownBox runat="server" ID="drpProject" Label="" EmptyText="濡傝绛涢�夐」鐩鐐瑰嚮姝ゅ閫夋嫨" MatchFieldWidth="false" LabelAlign="Left"
+                                        AutoPostBack="true" OnTextChanged="drpProject_SelectedIndexChanged" Width="500px" 
+                                        EnableMultiSelect="true">
+                                        <PopPanel>
+                                            <f:Grid ID="Grid1" ShowBorder="false" ShowHeader="false" runat="server" DataIDField="ProjectId" DataTextField="ProjectName"
+                                                DataKeyNames="ProjectId" AllowSorting="true" SortField="ProjectCode" SortDirection="ASC" CssClass="grid1_class"
+                                                Hidden="true" Width="900px" Height="400px" PageSize="300" EnableCheckBoxSelect="true" EnableMultiSelect="true">
+                                                <Toolbars>
+                                                    <f:Toolbar ID="Toolbar2" Position="Top" runat="server" CssClass="grid1_toolbar">
+                                                        <Items>
+                                                            <f:TextBox runat="server" ID="txtProjectName" EmptyText="鎸夊悕绉版煡璇�" FocusOnPageLoad="true"
+                                                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="100px" CssClass="txtSearch">
+                                                            </f:TextBox>
+                                                            <f:TextBox runat="server" ID="txtProjectCode" EmptyText="鎸夌紪鍙锋煡璇�" FocusOnPageLoad="true"
+                                                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="100px" CssClass="txtSearch">
+                                                            </f:TextBox>
+                                                            <f:RadioButtonList runat="server" ID="ckState" Width="450px"
+                                                                AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
+                                                                <f:RadioItem Text="鍦ㄥ缓" Value="1" Selected="true" />
+                                                                <f:RadioItem Text="鍋滃伐" Value="2" />
+                                                                <f:RadioItem Text="绔ｅ伐" Value="3" />
+                                                            </f:RadioButtonList>
+                                                        </Items>
+                                                    </f:Toolbar>
+                                                </Toolbars>
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="搴忓彿" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+
+                                                    <f:RenderField Width="200px" ColumnID="ProjectCode" DataField="ProjectCode" EnableFilter="true"
+                                                        FieldType="String" HeaderText="椤圭洰缂栧彿" HeaderTextAlign="Center" SortField="ProjectCode"
+                                                        TextAlign="Left">
+                                                    </f:RenderField>
+                                                    <f:RenderField Width="620px" ColumnID="ProjectName" DataField="ProjectName" EnableFilter="true"
+                                                        FieldType="String" HeaderText="椤圭洰鍚嶇О" HeaderTextAlign="Center"
+                                                        TextAlign="Left">
+                                                    </f:RenderField>
+                                                </Columns>
+                                            </f:Grid>
+                                        </PopPanel>
+                                    </f:DropDownBox>
+                                </div>
                             </div>
+
+
+
+
                             <div class="nav-right">
                                 <div class="btns t-btns t-btn-r">
-                                    <div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor:pointer"><span>鎴戠殑
+                                    <div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor: pointer">
+                                        <span>鎴戠殑
                                         <f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" Hidden="true"
-                                                  EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
-                                          </f:Button>
-                                                                               </span></div>
-                                    <div class="t-btn1 iconfont icon-shezhi" onclick="btnSysSetFunction()" style="cursor:pointer"><span>璁剧疆
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                        </span>
+                                    </div>
+                                    <div class="t-btn1 iconfont icon-shezhi" onclick="btnSysSetFunction()" style="cursor: pointer">
+                                        <span>璁剧疆
                                         <f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnSysSet_Click" Hidden="true"
-                                                    EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
-                                                </f:Button>
-                                                                              </span></div>
-                                    <div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor:pointer"><span>閫�鍑�
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnSysSet" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
+                                        </span>
+                                    </div>
+                                    <div class="t-btn1 iconfont icon-tuichu" onclick="SignOutFunction()" style="cursor: pointer">
+                                        <span>閫�鍑�
                                         <f:Button runat="server" CssClass="bgbtntop" IconFont="PowerOff" Hidden="true"
-                                                    EnablePostBack="false" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button18">
-                                                    <Listeners>
-                                                        <f:Listener Event="click" Handler="onToolSignOutClick" />
-                                                    </Listeners>
-                                                </f:Button>
-                                                                                                                                </span></div>
-                                    <div class="t-btn1 iconfont icon-quanping_o ab" style="cursor:pointer"><span>鍏ㄥ睆
+                                            EnablePostBack="false" EnableDefaultState="true" EnableDefaultCorner="false" ID="Button18">
+                                            <Listeners>
+                                                <f:Listener Event="click" Handler="onToolSignOutClick" />
+                                            </Listeners>
+                                        </f:Button>
+                                        </span>
+                                    </div>
+                                    <div class="t-btn1 iconfont icon-quanping_o ab" style="cursor: pointer">
+                                        <span>鍏ㄥ睆
 
-                                                                                                        </span></div>
+                                        </span>
+                                    </div>
                                     <div>
-                                        <f:Button runat="server" CssClass="bgbtntop" Text="" ToolTip="鍒锋柊鑿滃崟"  OnClick="btnRetweet_Click"
-                                                    EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnRetweet" OnClientClick="parent.removeActiveTab();">
-                                                </f:Button>
+                                        <f:Button runat="server" CssClass="bgbtntop" Text="" ToolTip="鍒锋柊鑿滃崟" OnClick="btnRetweet_Click"
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnRetweet" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
                                 </div>
                                 <div class="nav-btn n-btns-r">
-                                    <div class="n-btn-r" >
+                                    <div class="n-btn-r">
                                         <f:Button runat="server" Text="閫氱煡绠＄悊" ID="btnNotice" OnClick="btnNotice_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
-                                    <div class="n-btn-r" >
+                                    <div class="n-btn-r">
                                         <f:Button runat="server" Text="鍛樺伐绠＄悊" ID="btnPerson" OnClick="btnPerson_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
-                                    <div class="n-btn-r" >
+                                    <div class="n-btn-r">
                                         <f:Button runat="server" Text="缁煎悎绠＄悊" ID="btnZHGL" OnClick="btnZHGL_Click"
-                                                        EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
-                                                    </f:Button>
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button>
                                     </div>
                                 </div>
                             </div>
@@ -734,7 +901,10 @@
              
             });
 
-            
+            $(".icon-shezhi").click(function () {
+                var $item = $('.f-tabstrip-header')
+                $item.attr('style', ";display:block !important;")
+            })
 
             $(".bgbtn_head").click(function () {
                 var $item = $('.f-tabstrip-header')
diff --git a/SGGL/FineUIPro.Web/index.aspx.cs b/SGGL/FineUIPro.Web/index.aspx.cs
index ac18d6e7..275f44bd 100644
--- a/SGGL/FineUIPro.Web/index.aspx.cs
+++ b/SGGL/FineUIPro.Web/index.aspx.cs
@@ -1,5 +1,6 @@
 锘縰sing BLL;
 using System;
+using System.Linq;
 using System.Web;
 using System.Web.UI.WebControls;
 using System.Xml;
@@ -299,6 +300,9 @@ namespace FineUIPro.Web
         {
             if (!IsPostBack)
             {
+                //閫夋嫨椤圭洰涓虹┖
+                CurrUser.CompanyProjectId = "";
+
                 this.MenuSwitchMethod(Request.Params["menuType"]);
                 this.InitMenuStyleButton();
                 this.InitMenuModeButton();
@@ -319,6 +323,8 @@ namespace FineUIPro.Web
                     this.Tab1.IFrameUrl = "~/common/main2.aspx";
                     this.hdHomePage.Text = "2";
                 }
+
+                BindGrid(this.ckState.SelectedValue, this.txtProjectName.Text.Trim(), txtProjectCode.Text.Trim());
             }
         }
 
@@ -545,5 +551,55 @@ namespace FineUIPro.Web
         {
             this.Tab1.IFrameUrl = "~/common/main_new1.aspx";
         }
+
+        #region 鍏徃绾ф柊澧為」鐩瓫閫�
+        /// <summary>
+        /// 椤圭洰鍒囨崲
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpProject_SelectedIndexChanged(object sender, EventArgs e) {
+            CurrUser.CompanyProjectId = string.Join(",", drpProject.Values);
+            this.Tab1.RefreshIFrame();
+
+        }
+
+        /// <summary>
+        /// 鏌ヨ
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e) {
+            BindGrid(this.ckState.SelectedValue, this.txtProjectName.Text.Trim(), txtProjectCode.Text.Trim());
+        }
+
+        /// <summary>
+        /// 鍔犺浇椤圭洰
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="projectId"></param>
+        /// <param name="ProjectAttribute"></param>
+        /// <param name="projectState"></param>
+        /// <param name="projectName"></param>
+        /// <param name="unitId"></param>
+        /// <param name="ProjectCode"></param>
+        private void BindGrid(string projectState, string projectName,string ProjectCode = "")
+        {
+            var projectlist = BLL.ProjectService.GetUnEndProjectByUserIdDropDownList(projectState, projectName, ProjectCode);
+            foreach (var item in projectlist)
+            {
+                item.ProjectType = BLL.UnitService.GetUnitCodeByUnitId(item.UnitId);
+                item.UnitId = BLL.UnitService.GetUnitNameByUnitId(item.UnitId);
+
+            }
+            //绗竴绾ф寜鍒嗗叕鍙哥紪鍙烽『搴忔帓搴忕浜岀骇鎺掑簭涓洪」鐩紪鍙峰�掑簭鎺掑垪銆�
+            projectlist = projectlist.OrderBy(x => x.ProjectType).ThenByDescending(x => x.ProjectCode).ToList();
+
+            Grid1.RecordCount = projectlist.Count;
+            var table = this.GetPagedDataTable(Grid1, projectlist);
+            Grid1.DataSource = projectlist;
+            Grid1.DataBind();
+        }
+        #endregion
     }
 }
diff --git a/SGGL/FineUIPro.Web/index.aspx.designer.cs b/SGGL/FineUIPro.Web/index.aspx.designer.cs
index d86d9482..7797a36a 100644
--- a/SGGL/FineUIPro.Web/index.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/index.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class index {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class index
+    {
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// topPanel 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ContentPanel topPanel;
-        
+
         /// <summary>
         /// ContentPanel1 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// btn_xmgk 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btn_xmgk;
-        
+
         /// <summary>
         /// btn_aqsc 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btn_aqsc;
-        
+
         /// <summary>
         /// btn_zlgl 鎺т欢銆�
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btn_zlgl;
-        
+
         /// <summary>
         /// btnProject 鎺т欢銆�
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnProject;
-        
+
         /// <summary>
         /// btnDigData 鎺т欢銆�
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnDigData;
-        
+
         /// <summary>
         /// btnServer 鎺т欢銆�
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnServer;
-        
+
         /// <summary>
         /// btnHome 鎺т欢銆�
         /// </summary>
@@ -119,7 +121,61 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnHome;
-        
+
+        /// <summary>
+        /// drpProject 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.DropDownBox drpProject;
+
+        /// <summary>
+        /// Grid1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// Toolbar2 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtProjectName 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+
+        /// <summary>
+        /// txtProjectCode 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectCode;
+
+        /// <summary>
+        /// ckState 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList ckState;
+
         /// <summary>
         /// btnPersonal 鎺т欢銆�
         /// </summary>
@@ -128,7 +184,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnPersonal;
-        
+
         /// <summary>
         /// btnSysSet 鎺т欢銆�
         /// </summary>
@@ -137,7 +193,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnSysSet;
-        
+
         /// <summary>
         /// Button18 鎺т欢銆�
         /// </summary>
@@ -146,7 +202,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button Button18;
-        
+
         /// <summary>
         /// btnRetweet 鎺т欢銆�
         /// </summary>
@@ -155,7 +211,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnRetweet;
-        
+
         /// <summary>
         /// btnNotice 鎺т欢銆�
         /// </summary>
@@ -164,7 +220,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnNotice;
-        
+
         /// <summary>
         /// btnPerson 鎺т欢銆�
         /// </summary>
@@ -173,7 +229,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnPerson;
-        
+
         /// <summary>
         /// btnZHGL 鎺т欢銆�
         /// </summary>
@@ -182,7 +238,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnZHGL;
-        
+
         /// <summary>
         /// leftPanel 鎺т欢銆�
         /// </summary>
@@ -191,7 +247,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Panel leftPanel;
-        
+
         /// <summary>
         /// tbYear 鎺т欢銆�
         /// </summary>
@@ -200,7 +256,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Toolbar tbYear;
-        
+
         /// <summary>
         /// drpYear 鎺т欢銆�
         /// </summary>
@@ -209,7 +265,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList drpYear;
-        
+
         /// <summary>
         /// leftPanelToolCollapse 鎺т欢銆�
         /// </summary>
@@ -218,7 +274,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolCollapse;
-        
+
         /// <summary>
         /// leftPanelToolGear 鎺т欢銆�
         /// </summary>
@@ -227,7 +283,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolGear;
-        
+
         /// <summary>
         /// btnExpandAll 鎺т欢銆�
         /// </summary>
@@ -236,7 +292,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton btnExpandAll;
-        
+
         /// <summary>
         /// btnCollapseAll 鎺т欢銆�
         /// </summary>
@@ -245,7 +301,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton btnCollapseAll;
-        
+
         /// <summary>
         /// MenuMode 鎺т欢銆�
         /// </summary>
@@ -254,7 +310,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuMode;
-        
+
         /// <summary>
         /// MenuModeNormal 鎺т欢銆�
         /// </summary>
@@ -263,7 +319,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeNormal;
-        
+
         /// <summary>
         /// MenuModeCompact 鎺т欢銆�
         /// </summary>
@@ -272,7 +328,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeCompact;
-        
+
         /// <summary>
         /// MenuModeLarge 鎺т欢銆�
         /// </summary>
@@ -281,7 +337,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeLarge;
-        
+
         /// <summary>
         /// MenuStyle 鎺т欢銆�
         /// </summary>
@@ -290,7 +346,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuStyle;
-        
+
         /// <summary>
         /// MenuStyleTree 鎺т欢銆�
         /// </summary>
@@ -299,7 +355,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleTree;
-        
+
         /// <summary>
         /// MenuStyleMiniModeTree 鎺т欢銆�
         /// </summary>
@@ -308,7 +364,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleMiniModeTree;
-        
+
         /// <summary>
         /// MenuStylePlainTree 鎺т欢銆�
         /// </summary>
@@ -317,7 +373,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStylePlainTree;
-        
+
         /// <summary>
         /// MenuLang 鎺т欢銆�
         /// </summary>
@@ -326,7 +382,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuLang;
-        
+
         /// <summary>
         /// MenuLangZHCN 鎺т欢銆�
         /// </summary>
@@ -335,7 +391,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuLangZHCN;
-        
+
         /// <summary>
         /// mainTabStrip 鎺т欢銆�
         /// </summary>
@@ -344,7 +400,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TabStrip mainTabStrip;
-        
+
         /// <summary>
         /// Tab1 鎺т欢銆�
         /// </summary>
@@ -353,7 +409,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tab Tab1;
-        
+
         /// <summary>
         /// toolRefresh 鎺т欢銆�
         /// </summary>
@@ -362,7 +418,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolRefresh;
-        
+
         /// <summary>
         /// toolNewWindow 鎺т欢銆�
         /// </summary>
@@ -371,7 +427,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolNewWindow;
-        
+
         /// <summary>
         /// toolMaximize 鎺т欢銆�
         /// </summary>
@@ -380,7 +436,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolMaximize;
-        
+
         /// <summary>
         /// toolSignOut 鎺т欢銆�
         /// </summary>
@@ -389,7 +445,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolSignOut;
-        
+
         /// <summary>
         /// windowCustomQuery 鎺т欢銆�
         /// </summary>
@@ -398,7 +454,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Window windowCustomQuery;
-        
+
         /// <summary>
         /// hdHomePage 鎺т欢銆�
         /// </summary>
@@ -407,7 +463,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.HiddenField hdHomePage;
-        
+
         /// <summary>
         /// btnChangeHomePage 鎺т欢銆�
         /// </summary>
@@ -416,7 +472,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnChangeHomePage;
-        
+
         /// <summary>
         /// XmlDataSource1 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx b/SGGL/FineUIPro.Web/indexProject.aspx
index 1537a513..df69e968 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx
+++ b/SGGL/FineUIPro.Web/indexProject.aspx
@@ -220,6 +220,10 @@
         .f-panel-body .f-field {
             margin-bottom: 0px !important;
         }
+
+        .t-btn1 {
+            padding: 0 .15rem;
+        }
     </style>
 </head>
 <body class="wrap" onresize="myFunction()">
@@ -261,6 +265,10 @@
                             </div>
                             <div class="nav-right">
                                 <div class="btns t-btns t-btn-r">
+                                     <div class=" t-btn1 iconfont" onclick="CallFunction()" style="cursor: pointer"><span>鍛煎彨<f:Button runat="server" CssClass="bgbtntop" IconFont="Eye" OnClick="btnPhoneClick" ToolTip="鍛煎彨" Hidden="true"
+                                            EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnCall" OnClientClick="parent.removeActiveTab();">
+                                        </f:Button></span></div>
+
                                     <div class=" t-btn1 iconfont icon-yonghu" onclick="PersonalFunction()" style="cursor: pointer"><span>涓汉<f:Button runat="server" CssClass="bgbtntop" IconFont="User" OnClick="btnPersonal_Click" ToolTip="鎴戠殑" Hidden="true"
                                             EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnPersonal" OnClientClick="parent.removeActiveTab();">
                                         </f:Button></span></div>
@@ -280,11 +288,11 @@
                                 </div>
                                 <div class="nav-btn n-btns-r">
                                     <div class="n-btn-r c-n-btn-r" onclick="TransferClick();" style="cursor:pointer">绉讳氦绠＄悊</div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor:pointer">鍏抽敭浜嬮」</div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="PGJSXClick();" style="cursor:pointer;width: 2.225rem;height: .305rem;line-height: .35rem;">鍏抽敭浜嬮」涓庡崗璋冩矡閫�</div>
                                     <div class="n-btn-r c-n-btn-r" onclick="DigitalSiteClick();" style="cursor:pointer">瑙嗛鐩戞帶</div>
                                     <div class="n-btn-r c-n-btn-r" onclick="PDigDataClick();" style="cursor:pointer">鐜板満鑰冨嫟</div>
                                     <div class="n-btn-r c-n-btn-r" onclick="OpinionClick();" style="cursor:pointer">鎰忚鏀堕泦</div>
-                                    <div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor:pointer">鍗忚皟涓庢矡閫�</div>
+                                    <div class="n-btn-r c-n-btn-r" onclick="DocClick();" style="cursor:pointer; display:none">鍗忚皟涓庢矡閫�</div>
                                 </div>
                             </div>
                         </div>
@@ -410,6 +418,12 @@
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
+
+         <f:Window ID="Window1" Title="鍛煎彨" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="1000px"
+            Height="700px">
+        </f:Window>
+
         <asp:XmlDataSource ID="XmlDataSource1" runat="server" EnableCaching="false"></asp:XmlDataSource>
         <f:Button runat="server" ID="ProjectZJ" OnClick="ProjectZJ_Click" Hidden="true"></f:Button>
         <f:Button runat="server" ID="ProjectTG" OnClick="ProjectTG_Click" Hidden="true"></f:Button>
@@ -1016,6 +1030,13 @@
                 }
             }
         }
+
+        //鍛煎彨
+        function CallFunction() {
+            // 寮瑰嚭涓�涓柊绐楀彛锛屽姞杞芥寚瀹氱殑URL
+            //window.open('https://www.baidu.com', '_blank');
+            $('[id$="_btnCall"]').click();
+        }
     </script>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs
index db315f2d..e44802bd 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs
@@ -294,7 +294,7 @@ namespace FineUIPro.Web
                 Response.Expires = 0;               //璁剧疆杩囨湡鏃堕棿
                 Response.Cache.SetNoStore();			//鍦ㄦ湇鍔″櫒绔笉缂撳瓨璇ラ〉闈�
                 Response.AppendHeader("Pragma", "no-cache");	//鍦ㄥ鎴风涓嶇紦瀛�
-                ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false);
+                ProjectService.InitProjectShortNameByStateDropDownList(this.drpProject, this.CurrUser.UserId, BLL.Const.ProjectState_1, false,"1");
                 if (!string.IsNullOrEmpty(Request.Params["projectId"]))
                 {
                     this.drpProject.SelectedValue = Request.Params["projectId"];
@@ -646,18 +646,20 @@ namespace FineUIPro.Web
                         }
                     }
                 }
-                if (roleTypes.Contains(Const.Role_III))
-                {
-                    this.Tab1.IFrameUrl = "~/common/mainIII.aspx?roleCNs=" + roleCNs;
-                }
-                else if (roleTypes.Contains(Const.Role_IV))
-                {
-                    this.Tab1.IFrameUrl = "~/common/mainIV.aspx?roleCNs=" + roleCNs + "&unitWorkIds=" + projectUser.WorkAreaId;
-                }
-                else
-                {
-                    this.Tab1.IFrameUrl = "~/common/mainProject2.aspx";
-                }
+                //if (roleTypes.Contains(Const.Role_III))
+                //{
+                //    this.Tab1.IFrameUrl = "~/common/mainIII.aspx?roleCNs=" + roleCNs;
+                //}
+                //else if (roleTypes.Contains(Const.Role_IV))
+                //{
+                //    this.Tab1.IFrameUrl = "~/common/mainIV.aspx?roleCNs=" + roleCNs + "&unitWorkIds=" + projectUser.WorkAreaId;
+                //}
+                //else
+                //{
+                //    this.Tab1.IFrameUrl = "~/common/mainProject2.aspx";
+                //}
+
+                this.Tab1.IFrameUrl = "~/common/mainProject2.aspx";
             }
             else
             {
@@ -730,8 +732,10 @@ namespace FineUIPro.Web
 
         protected void btnHome_Click(object sender, EventArgs e)
         {
+            //淇敼鏈儴鐢ㄦ埛閮借兘杩�
+            //this.CurrUser.UnitId == Const.drpProject &&
             if (string.IsNullOrEmpty(this.CurrUser.LastProjectId)
-                && ((this.CurrUser.UnitId == Const.UnitId_CWCEC && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
+                && ((this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId))
             {
                 UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId);
                 this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId;
@@ -878,5 +882,14 @@ namespace FineUIPro.Web
             }
 
         }
+
+        /// <summary>
+        /// 鍛煎彨
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPhoneClick(object sender, EventArgs e) {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/ProjectData/ProjectUserContact.aspx")));
+        }
     }
 }
diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
index 4af3eea1..c8b0d732 100644
--- a/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/indexProject.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </鑷姩鐢熸垚>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web {
-    
-    
-    public partial class indexProject {
-        
+namespace FineUIPro.Web
+{
+
+
+    public partial class indexProject
+    {
+
         /// <summary>
         /// form1 鎺т欢銆�
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 鎺т欢銆�
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 鎺т欢銆�
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// topPanel 鎺т欢銆�
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ContentPanel topPanel;
-        
+
         /// <summary>
         /// ContentPanel1 鎺т欢銆�
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel1;
-        
+
         /// <summary>
         /// drpProject 鎺т欢銆�
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProject;
-        
+
         /// <summary>
         /// Button21 鎺т欢銆�
         /// </summary>
@@ -74,7 +76,16 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button Button21;
-        
+
+        /// <summary>
+        /// btnCall 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Button btnCall;
+
         /// <summary>
         /// btnPersonal 鎺т欢銆�
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnPersonal;
-        
+
         /// <summary>
         /// btnProjectSet 鎺т欢銆�
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnProjectSet;
-        
+
         /// <summary>
         /// btnHelp 鎺т欢銆�
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnHelp;
-        
+
         /// <summary>
         /// Button18 鎺т欢銆�
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button Button18;
-        
+
         /// <summary>
         /// leftPanel 鎺т欢銆�
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Panel leftPanel;
-        
+
         /// <summary>
         /// leftPanelToolCollapse 鎺т欢銆�
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolCollapse;
-        
+
         /// <summary>
         /// leftPanelToolGear 鎺т欢銆�
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool leftPanelToolGear;
-        
+
         /// <summary>
         /// btnExpandAll 鎺т欢銆�
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton btnExpandAll;
-        
+
         /// <summary>
         /// btnCollapseAll 鎺т欢銆�
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton btnCollapseAll;
-        
+
         /// <summary>
         /// MenuMode 鎺т欢銆�
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuMode;
-        
+
         /// <summary>
         /// MenuModeNormal 鎺т欢銆�
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeNormal;
-        
+
         /// <summary>
         /// MenuModeCompact 鎺т欢銆�
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeCompact;
-        
+
         /// <summary>
         /// MenuModeLarge 鎺т欢銆�
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuModeLarge;
-        
+
         /// <summary>
         /// MenuStyle 鎺т欢銆�
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuStyle;
-        
+
         /// <summary>
         /// MenuStyleTree 鎺т欢銆�
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleTree;
-        
+
         /// <summary>
         /// MenuStyleMiniModeTree 鎺т欢銆�
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStyleMiniModeTree;
-        
+
         /// <summary>
         /// MenuStylePlainTree 鎺т欢銆�
         /// </summary>
@@ -227,7 +238,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuStylePlainTree;
-        
+
         /// <summary>
         /// MenuLang 鎺т欢銆�
         /// </summary>
@@ -236,7 +247,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuButton MenuLang;
-        
+
         /// <summary>
         /// MenuLangZHCN 鎺т欢銆�
         /// </summary>
@@ -245,7 +256,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.MenuCheckBox MenuLangZHCN;
-        
+
         /// <summary>
         /// mainTabStrip 鎺т欢銆�
         /// </summary>
@@ -254,7 +265,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.TabStrip mainTabStrip;
-        
+
         /// <summary>
         /// Tab1 鎺т欢銆�
         /// </summary>
@@ -263,7 +274,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tab Tab1;
-        
+
         /// <summary>
         /// toolRefresh 鎺т欢銆�
         /// </summary>
@@ -272,7 +283,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolRefresh;
-        
+
         /// <summary>
         /// toolNewWindow 鎺т欢銆�
         /// </summary>
@@ -281,7 +292,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolNewWindow;
-        
+
         /// <summary>
         /// toolMaximize 鎺т欢銆�
         /// </summary>
@@ -290,7 +301,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolMaximize;
-        
+
         /// <summary>
         /// toolSignOut 鎺т欢銆�
         /// </summary>
@@ -299,7 +310,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Tool toolSignOut;
-        
+
         /// <summary>
         /// windowCustomQuery 鎺т欢銆�
         /// </summary>
@@ -308,7 +319,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Window windowCustomQuery;
-        
+
         /// <summary>
         /// WindowAtt 鎺т欢銆�
         /// </summary>
@@ -317,7 +328,16 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
+        /// <summary>
+        /// Window1 鎺т欢銆�
+        /// </summary>
+        /// <remarks>
+        /// 鑷姩鐢熸垚鐨勫瓧娈点��
+        /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
         /// <summary>
         /// XmlDataSource1 鎺т欢銆�
         /// </summary>
@@ -326,7 +346,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::System.Web.UI.WebControls.XmlDataSource XmlDataSource1;
-        
+
         /// <summary>
         /// ProjectZJ 鎺т欢銆�
         /// </summary>
@@ -335,7 +355,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button ProjectZJ;
-        
+
         /// <summary>
         /// ProjectTG 鎺т欢銆�
         /// </summary>
@@ -344,7 +364,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button ProjectTG;
-        
+
         /// <summary>
         /// ProjectJG 鎺т欢銆�
         /// </summary>
@@ -353,7 +373,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button ProjectJG;
-        
+
         /// <summary>
         /// btnCQMS 鎺т欢銆�
         /// </summary>
@@ -362,7 +382,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnCQMS;
-        
+
         /// <summary>
         /// btnHSSE 鎺т欢銆�
         /// </summary>
@@ -371,7 +391,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnHSSE;
-        
+
         /// <summary>
         /// btnJDGL 鎺т欢銆�
         /// </summary>
@@ -380,7 +400,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnJDGL;
-        
+
         /// <summary>
         /// btnHJGL 鎺т欢銆�
         /// </summary>
@@ -389,7 +409,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnHJGL;
-        
+
         /// <summary>
         /// btnCLGL 鎺т欢銆�
         /// </summary>
@@ -398,7 +418,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnCLGL;
-        
+
         /// <summary>
         /// btnTestRun 鎺т欢銆�
         /// </summary>
@@ -407,7 +427,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnTestRun;
-        
+
         /// <summary>
         /// btnTransfer 鎺т欢銆�
         /// </summary>
@@ -416,7 +436,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnTransfer;
-        
+
         /// <summary>
         /// btnPGJSX 鎺т欢銆�
         /// </summary>
@@ -425,7 +445,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnPGJSX;
-        
+
         /// <summary>
         /// btnDigitalSite 鎺т欢銆�
         /// </summary>
@@ -434,7 +454,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnDigitalSite;
-        
+
         /// <summary>
         /// btnPDigData 鎺т欢銆�
         /// </summary>
@@ -443,7 +463,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnPDigData;
-        
+
         /// <summary>
         /// btnOpinion 鎺т欢銆�
         /// </summary>
@@ -452,7 +472,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnOpinion;
-        
+
         /// <summary>
         /// btnDoc 鎺т欢銆�
         /// </summary>
@@ -461,7 +481,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.Button btnDoc;
-        
+
         /// <summary>
         /// SimpleForm1 鎺т欢銆�
         /// </summary>
@@ -470,7 +490,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.SimpleForm SimpleForm1;
-        
+
         /// <summary>
         /// hfProjectCode 鎺т欢銆�
         /// </summary>
@@ -479,7 +499,7 @@ namespace FineUIPro.Web {
         /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
         /// </remarks>
         protected global::FineUIPro.HiddenField hfProjectCode;
-        
+
         /// <summary>
         /// hfMonitorPW 鎺т欢銆�
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/res/js/jssip-3.7.0.min.js b/SGGL/FineUIPro.Web/res/js/jssip-3.7.0.min.js
new file mode 100644
index 00000000..ec1ecc88
--- /dev/null
+++ b/SGGL/FineUIPro.Web/res/js/jssip-3.7.0.min.js
@@ -0,0 +1,9 @@
+/*
+ * JsSIP v3.7.0
+ * the Javascript SIP library
+ * Copyright: 2012-2020 Jos茅 Luis Mill谩n <jmillan@aliax.net> (https://github.com/jmillan)
+ * Homepage: https://jssip.net
+ * License: MIT
+ */
+
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).JsSIP=e()}}(function(){return function(){return function e(t,n,r){function s(o,l){if(!n[o]){if(!t[o]){var u="function"==typeof require&&require;if(!l&&u)return u(o,!0);if(i)return i(o,!0);var a=new Error("Cannot find module '"+o+"'");throw a.code="MODULE_NOT_FOUND",a}var c=n[o]={exports:{}};t[o][0].call(c.exports,function(e){return s(t[o][1][e]||e)},c,c.exports,e,t,n,r)}return n[o].exports}for(var i="function"==typeof require&&require,o=0;o<r.length;o++)s(r[o]);return s}}()({1:[function(e,t,n){"use strict";function r(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return s(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return s(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,i=function(){};return{s:i,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,l=!0,u=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return l=e.done,e},e:function(e){u=!0,o=e},f:function(){try{l||null==n.return||n.return()}finally{if(u)throw o}}}}function s(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var i=e("./Utils"),o=e("./Constants"),l=e("./Grammar"),u=e("./URI"),a=e("./Socket"),c=e("./Exceptions");n.settings={authorization_user:null,password:null,realm:null,ha1:null,authorization_jwt:null,display_name:null,uri:null,contact_uri:null,instance_id:null,use_preloaded_route:!1,session_timers:!0,session_timers_refresh_method:o.UPDATE,session_timers_force_refresher:!1,no_answer_timeout:60,register:!0,register_expires:600,registrar_server:null,sockets:null,connection_recovery_max_interval:o.CONNECTION_RECOVERY_MAX_INTERVAL,connection_recovery_min_interval:o.CONNECTION_RECOVERY_MIN_INTERVAL,via_host:"".concat(i.createRandomToken(12),".invalid")};var h={mandatory:{sockets:function(e){var t=[];if(a.isSocket(e))t.push({socket:e});else{if(!Array.isArray(e)||!e.length)return;var n,s=r(e);try{for(s.s();!(n=s.n()).done;){var i=n.value;Object.prototype.hasOwnProperty.call(i,"socket")&&a.isSocket(i.socket)?t.push(i):a.isSocket(i)&&t.push({socket:i})}}catch(e){s.e(e)}finally{s.f()}}return t},uri:function(e){/^sip:/i.test(e)||(e="".concat(o.SIP,":").concat(e));var t=u.parse(e);return t&&t.user?t:void 0}},optional:{authorization_user:function(e){return-1===l.parse('"'.concat(e,'"'),"quoted_string")?void 0:e},authorization_jwt:function(e){if("string"==typeof e)return e},user_agent:function(e){if("string"==typeof e)return e},connection_recovery_max_interval:function(e){if(i.isDecimal(e)){var t=Number(e);if(t>0)return t}},connection_recovery_min_interval:function(e){if(i.isDecimal(e)){var t=Number(e);if(t>0)return t}},contact_uri:function(e){if("string"==typeof e){var t=l.parse(e,"SIP_URI");if(-1!==t)return t}},display_name:function(e){return e},instance_id:function(e){return/^uuid:/i.test(e)&&(e=e.substr(5)),-1===l.parse(e,"uuid")?void 0:e},no_answer_timeout:function(e){if(i.isDecimal(e)){var t=Number(e);if(t>0)return t}},session_timers:function(e){if("boolean"==typeof e)return e},session_timers_refresh_method:function(e){if("string"==typeof e&&((e=e.toUpperCase())===o.INVITE||e===o.UPDATE))return e},session_timers_force_refresher:function(e){if("boolean"==typeof e)return e},password:function(e){return String(e)},realm:function(e){return String(e)},ha1:function(e){return String(e)},register:function(e){if("boolean"==typeof e)return e},register_expires:function(e){if(i.isDecimal(e)){var t=Number(e);if(t>0)return t}},registrar_server:function(e){/^sip:/i.test(e)||(e="".concat(o.SIP,":").concat(e));var t=u.parse(e);return t?t.user?void 0:t:void 0},use_preloaded_route:function(e){if("boolean"==typeof e)return e}}};n.load=function(e,t){for(var n in h.mandatory){if(!t.hasOwnProperty(n))throw new c.ConfigurationError(n);var r=t[n],s=h.mandatory[n](r);if(void 0===s)throw new c.ConfigurationError(n,r);e[n]=s}for(var o in h.optional)if(t.hasOwnProperty(o)){var l=t[o];if(i.isEmpty(l))continue;var u=h.optional[o](l);if(void 0===u)throw new c.ConfigurationError(o,l);e[o]=u}}},{"./Constants":2,"./Exceptions":6,"./Grammar":7,"./Socket":20,"./URI":25,"./Utils":26}],2:[function(e,t,n){"use strict";var r=e("../package.json");t.exports={USER_AGENT:"".concat(r.title," ").concat(r.version),SIP:"sip",SIPS:"sips",causes:{CONNECTION_ERROR:"Connection Error",REQUEST_TIMEOUT:"Request Timeout",SIP_FAILURE_CODE:"SIP Failure Code",INTERNAL_ERROR:"Internal Error",BUSY:"Busy",REJECTED:"Rejected",REDIRECTED:"Redirected",UNAVAILABLE:"Unavailable",NOT_FOUND:"Not Found",ADDRESS_INCOMPLETE:"Address Incomplete",INCOMPATIBLE_SDP:"Incompatible SDP",MISSING_SDP:"Missing SDP",AUTHENTICATION_ERROR:"Authentication Error",BYE:"Terminated",WEBRTC_ERROR:"WebRTC Error",CANCELED:"Canceled",NO_ANSWER:"No Answer",EXPIRES:"Expires",NO_ACK:"No ACK",DIALOG_ERROR:"Dialog Error",USER_DENIED_MEDIA_ACCESS:"User Denied Media Access",BAD_MEDIA_DESCRIPTION:"Bad Media Description",RTP_TIMEOUT:"RTP Timeout"},SIP_ERROR_CAUSES:{REDIRECTED:[300,301,302,305,380],BUSY:[486,600],REJECTED:[403,603],NOT_FOUND:[404,604],UNAVAILABLE:[480,410,408,430],ADDRESS_INCOMPLETE:[484,424],INCOMPATIBLE_SDP:[488,606],AUTHENTICATION_ERROR:[401,407]},ACK:"ACK",BYE:"BYE",CANCEL:"CANCEL",INFO:"INFO",INVITE:"INVITE",MESSAGE:"MESSAGE",NOTIFY:"NOTIFY",OPTIONS:"OPTIONS",REGISTER:"REGISTER",REFER:"REFER",UPDATE:"UPDATE",SUBSCRIBE:"SUBSCRIBE",DTMF_TRANSPORT:{INFO:"INFO",RFC2833:"RFC2833"},REASON_PHRASE:{100:"Trying",180:"Ringing",181:"Call Is Being Forwarded",182:"Queued",183:"Session Progress",199:"Early Dialog Terminated",200:"OK",202:"Accepted",204:"No Notification",300:"Multiple Choices",301:"Moved Permanently",302:"Moved Temporarily",305:"Use Proxy",380:"Alternative Service",400:"Bad Request",401:"Unauthorized",402:"Payment Required",403:"Forbidden",404:"Not Found",405:"Method Not Allowed",406:"Not Acceptable",407:"Proxy Authentication Required",408:"Request Timeout",410:"Gone",412:"Conditional Request Failed",413:"Request Entity Too Large",414:"Request-URI Too Long",415:"Unsupported Media Type",416:"Unsupported URI Scheme",417:"Unknown Resource-Priority",420:"Bad Extension",421:"Extension Required",422:"Session Interval Too Small",423:"Interval Too Brief",424:"Bad Location Information",428:"Use Identity Header",429:"Provide Referrer Identity",430:"Flow Failed",433:"Anonymity Disallowed",436:"Bad Identity-Info",437:"Unsupported Certificate",438:"Invalid Identity Header",439:"First Hop Lacks Outbound Support",440:"Max-Breadth Exceeded",469:"Bad Info Package",470:"Consent Needed",478:"Unresolvable Destination",480:"Temporarily Unavailable",481:"Call/Transaction Does Not Exist",482:"Loop Detected",483:"Too Many Hops",484:"Address Incomplete",485:"Ambiguous",486:"Busy Here",487:"Request Terminated",488:"Not Acceptable Here",489:"Bad Event",491:"Request Pending",493:"Undecipherable",494:"Security Agreement Required",500:"JsSIP Internal Error",501:"Not Implemented",502:"Bad Gateway",503:"Service Unavailable",504:"Server Time-out",505:"Version Not Supported",513:"Message Too Large",580:"Precondition Failure",600:"Busy Everywhere",603:"Decline",604:"Does Not Exist Anywhere",606:"Not Acceptable"},ALLOWED_METHODS:"INVITE,ACK,CANCEL,BYE,UPDATE,MESSAGE,OPTIONS,REFER,INFO,NOTIFY",ACCEPTED_BODY_TYPES:"application/sdp, application/dtmf-relay",MAX_FORWARDS:69,SESSION_EXPIRES:90,MIN_SESSION_EXPIRES:60,CONNECTION_RECOVERY_MAX_INTERVAL:30,CONNECTION_RECOVERY_MIN_INTERVAL:2}},{"../package.json":38}],3:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function s(e,t,n){return t&&r(e.prototype,t),n&&r(e,n),e}var i=e("./SIPMessage"),o=e("./Constants"),l=e("./Transactions"),u=e("./Dialog/RequestSender"),a=e("./Utils"),c=e("debug")("JsSIP:Dialog"),h={STATUS_EARLY:1,STATUS_CONFIRMED:2};t.exports=function(){function e(t,n,r){var s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:h.STATUS_CONFIRMED;if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this._owner=t,this._ua=t._ua,this._uac_pending_reply=!1,this._uas_pending_reply=!1,!n.hasHeader("contact"))return{error:"unable to create a Dialog without Contact header field"};n instanceof i.IncomingResponse&&(s=n.status_code<200?h.STATUS_EARLY:h.STATUS_CONFIRMED);var o=n.parseHeader("contact");"UAS"===r?(this._id={call_id:n.call_id,local_tag:n.to_tag,remote_tag:n.from_tag,toString:function(){return this.call_id+this.local_tag+this.remote_tag}},this._state=s,this._remote_seqnum=n.cseq,this._local_uri=n.parseHeader("to").uri,this._remote_uri=n.parseHeader("from").uri,this._remote_target=o.uri,this._route_set=n.getHeaders("record-route"),this._ack_seqnum=this._remote_seqnum):"UAC"===r&&(this._id={call_id:n.call_id,local_tag:n.from_tag,remote_tag:n.to_tag,toString:function(){return this.call_id+this.local_tag+this.remote_tag}},this._state=s,this._local_seqnum=n.cseq,this._local_uri=n.parseHeader("from").uri,this._remote_uri=n.parseHeader("to").uri,this._remote_target=o.uri,this._route_set=n.getHeaders("record-route").reverse(),this._ack_seqnum=null),this._ua.newDialog(this),c("new ".concat(r," dialog created with status ").concat(this._state===h.STATUS_EARLY?"EARLY":"CONFIRMED"))}return s(e,null,[{key:"C",get:function(){return h}}]),s(e,[{key:"update",value:function(e,t){this._state=h.STATUS_CONFIRMED,c("dialog ".concat(this._id.toString(),"  changed to CONFIRMED state")),"UAC"===t&&(this._route_set=e.getHeaders("record-route").reverse())}},{key:"terminate",value:function(){c("dialog ".concat(this._id.toString()," deleted")),this._ua.destroyDialog(this)}},{key:"sendRequest",value:function(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=a.cloneArray(n.extraHeaders),s=a.cloneObject(n.eventHandlers),i=n.body||null,o=this._createRequest(e,r,i);return s.onAuthenticated=function(){t._local_seqnum+=1},new u(this,o,s).send(),o}},{key:"receiveRequest",value:function(e){this._checkInDialogRequest(e)&&(e.method===o.ACK&&null!==this._ack_seqnum?this._ack_seqnum=null:e.method===o.INVITE&&(this._ack_seqnum=e.cseq),this._owner.receiveRequest(e))}},{key:"_createRequest",value:function(e,t,n){t=a.cloneArray(t),this._local_seqnum||(this._local_seqnum=Math.floor(1e4*Math.random()));var r=e===o.CANCEL||e===o.ACK?this._local_seqnum:this._local_seqnum+=1;return new i.OutgoingRequest(e,this._remote_target,this._ua,{cseq:r,call_id:this._id.call_id,from_uri:this._local_uri,from_tag:this._id.local_tag,to_uri:this._remote_uri,to_tag:this._id.remote_tag,route_set:this._route_set},t,n)}},{key:"_checkInDialogRequest",value:function(e){var t=this;if(this._remote_seqnum)if(e.cseq<this._remote_seqnum){if(e.method!==o.ACK)return e.reply(500),!1;if(null===this._ack_seqnum||e.cseq!==this._ack_seqnum)return!1}else e.cseq>this._remote_seqnum&&(this._remote_seqnum=e.cseq);else this._remote_seqnum=e.cseq;if(e.method===o.INVITE||e.method===o.UPDATE&&e.body){if(!0===this._uac_pending_reply)e.reply(491);else{if(!0===this._uas_pending_reply){var n=1+(10*Math.random()|0);return e.reply(500,null,["Retry-After:".concat(n)]),!1}this._uas_pending_reply=!0;e.server_transaction.on("stateChanged",function n(){e.server_transaction.state!==l.C.STATUS_ACCEPTED&&e.server_transaction.state!==l.C.STATUS_COMPLETED&&e.server_transaction.state!==l.C.STATUS_TERMINATED||(e.server_transaction.removeListener("stateChanged",n),t._uas_pending_reply=!1)})}e.hasHeader("contact")&&e.server_transaction.on("stateChanged",function(){e.server_transaction.state===l.C.STATUS_ACCEPTED&&(t._remote_target=e.parseHeader("contact").uri)})}else e.method===o.NOTIFY&&e.hasHeader("contact")&&e.server_transaction.on("stateChanged",function(){e.server_transaction.state===l.C.STATUS_COMPLETED&&(t._remote_target=e.parseHeader("contact").uri)});return!0}},{key:"id",get:function(){return this._id}},{key:"local_seqnum",get:function(){return this._local_seqnum},set:function(e){this._local_seqnum=e}},{key:"owner",get:function(){return this._owner}},{key:"uac_pending_reply",get:function(){return this._uac_pending_reply},set:function(e){this._uac_pending_reply=e}},{key:"uas_pending_reply",get:function(){return this._uas_pending_reply}}]),e}()},{"./Constants":2,"./Dialog/RequestSender":4,"./SIPMessage":19,"./Transactions":22,"./Utils":26,debug:30}],4:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var s=e("../Constants"),i=e("../Transactions"),o=e("../RTCSession"),l=e("../RequestSender"),u={onRequestTimeout:function(){},onTransportError:function(){},onSuccessResponse:function(){},onErrorResponse:function(){},onAuthenticated:function(){},onDialogError:function(){}};t.exports=function(){function e(t,n,r){for(var s in function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this._dialog=t,this._ua=t._ua,this._request=n,this._eventHandlers=r,this._reattempt=!1,this._reattemptTimer=null,u)Object.prototype.hasOwnProperty.call(u,s)&&(this._eventHandlers[s]||(this._eventHandlers[s]=u[s]))}var t,n,a;return t=e,(n=[{key:"send",value:function(){var e=this,t=new l(this._ua,this._request,{onRequestTimeout:function(){e._eventHandlers.onRequestTimeout()},onTransportError:function(){e._eventHandlers.onTransportError()},onAuthenticated:function(t){e._eventHandlers.onAuthenticated(t)},onReceiveResponse:function(t){e._receiveResponse(t)}});if(t.send(),(this._request.method===s.INVITE||this._request.method===s.UPDATE&&this._request.body)&&t.clientTransaction.state!==i.C.STATUS_TERMINATED){this._dialog.uac_pending_reply=!0;t.clientTransaction.on("stateChanged",function n(){t.clientTransaction.state!==i.C.STATUS_ACCEPTED&&t.clientTransaction.state!==i.C.STATUS_COMPLETED&&t.clientTransaction.state!==i.C.STATUS_TERMINATED||(t.clientTransaction.removeListener("stateChanged",n),e._dialog.uac_pending_reply=!1)})}}},{key:"_receiveResponse",value:function(e){var t=this;408===e.status_code||481===e.status_code?this._eventHandlers.onDialogError(e):e.method===s.INVITE&&491===e.status_code?this._reattempt?e.status_code>=200&&e.status_code<300?this._eventHandlers.onSuccessResponse(e):e.status_code>=300&&this._eventHandlers.onErrorResponse(e):(this._request.cseq=this._dialog.local_seqnum+=1,this._reattemptTimer=setTimeout(function(){t._dialog.owner.status!==o.C.STATUS_TERMINATED&&(t._reattempt=!0,t._request_sender.send())},1e3)):e.status_code>=200&&e.status_code<300?this._eventHandlers.onSuccessResponse(e):e.status_code>=300&&this._eventHandlers.onErrorResponse(e)}},{key:"request",get:function(){return this._request}}])&&r(t.prototype,n),a&&r(t,a),e}()},{"../Constants":2,"../RTCSession":12,"../RequestSender":18,"../Transactions":22}],5:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var s=e("./Utils"),i=e("debug")("JsSIP:DigestAuthentication"),o=e("debug")("JsSIP:ERROR:DigestAuthentication");o.log=console.warn.bind(console),t.exports=function(){function e(t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this._credentials=t,this._cnonce=null,this._nc=0,this._ncHex="00000000",this._algorithm=null,this._realm=null,this._nonce=null,this._opaque=null,this._stale=null,this._qop=null,this._method=null,this._uri=null,this._ha1=null,this._response=null}var t,n,l;return t=e,(n=[{key:"get",value:function(e){switch(e){case"realm":return this._realm;case"ha1":return this._ha1;default:return void o('get() | cannot get "%s" parameter',e)}}},{key:"authenticate",value:function(e,t){var n=e.method,r=e.ruri,l=e.body,u=arguments.length>2&&void 0!==arguments[2]?arguments[2]:null;if(this._algorithm=t.algorithm,this._realm=t.realm,this._nonce=t.nonce,this._opaque=t.opaque,this._stale=t.stale,this._algorithm){if("MD5"!==this._algorithm)return o('authenticate() | challenge with Digest algorithm different than "MD5", authentication aborted'),!1}else this._algorithm="MD5";if(!this._nonce)return o("authenticate() | challenge without Digest nonce, authentication aborted"),!1;if(!this._realm)return o("authenticate() | challenge without Digest realm, authentication aborted"),!1;if(!this._credentials.password){if(!this._credentials.ha1)return o("authenticate() | no plain SIP password nor ha1 provided, authentication aborted"),!1;if(this._credentials.realm!==this._realm)return o('authenticate() | no plain SIP password, and stored `realm` does not match the given `realm`, cannot authenticate [stored:"%s", given:"%s"]',this._credentials.realm,this._realm),!1}if(t.qop)if(t.qop.indexOf("auth-int")>-1)this._qop="auth-int";else{if(!(t.qop.indexOf("auth")>-1))return o('authenticate() | challenge without Digest qop different than "auth" or "auth-int", authentication aborted'),!1;this._qop="auth"}else this._qop=null;this._method=n,this._uri=r,this._cnonce=u||s.createRandomToken(12),this._nc+=1;var a,c,h=Number(this._nc).toString(16);return this._ncHex="00000000".substr(0,8-h.length)+h,4294967296===this._nc&&(this._nc=1,this._ncHex="00000001"),this._credentials.password?this._ha1=s.calculateMD5("".concat(this._credentials.username,":").concat(this._realm,":").concat(this._credentials.password)):this._ha1=this._credentials.ha1,"auth"===this._qop?(a="".concat(this._method,":").concat(this._uri),c=s.calculateMD5(a),i('authenticate() | using qop=auth [a2:"%s"]',a),this._response=s.calculateMD5("".concat(this._ha1,":").concat(this._nonce,":").concat(this._ncHex,":").concat(this._cnonce,":auth:").concat(c))):"auth-int"===this._qop?(a="".concat(this._method,":").concat(this._uri,":").concat(s.calculateMD5(l||"")),c=s.calculateMD5(a),i('authenticate() | using qop=auth-int [a2:"%s"]',a),this._response=s.calculateMD5("".concat(this._ha1,":").concat(this._nonce,":").concat(this._ncHex,":").concat(this._cnonce,":auth-int:").concat(c))):null===this._qop&&(a="".concat(this._method,":").concat(this._uri),c=s.calculateMD5(a),i('authenticate() | using qop=null [a2:"%s"]',a),this._response=s.calculateMD5("".concat(this._ha1,":").concat(this._nonce,":").concat(c))),i("authenticate() | response generated"),!0}},{key:"toString",value:function(){var e=[];if(!this._response)throw new Error("response field does not exist, cannot generate Authorization header");return e.push("algorithm=".concat(this._algorithm)),e.push('username="'.concat(this._credentials.username,'"')),e.push('realm="'.concat(this._realm,'"')),e.push('nonce="'.concat(this._nonce,'"')),e.push('uri="'.concat(this._uri,'"')),e.push('response="'.concat(this._response,'"')),this._opaque&&e.push('opaque="'.concat(this._opaque,'"')),this._qop&&(e.push("qop=".concat(this._qop)),e.push('cnonce="'.concat(this._cnonce,'"')),e.push("nc=".concat(this._ncHex))),"Digest ".concat(e.join(", "))}}])&&r(t.prototype,n),l&&r(t,l),e}()},{"./Utils":26,debug:30}],6:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&c(e,t)}function o(e){var t=a();return function(){var n,s=h(e);if(t){var i=h(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(this,n)}}function l(e){var t="function"==typeof Map?new Map:void 0;return(l=function(e){if(null===e||(n=e,-1===Function.toString.call(n).indexOf("[native code]")))return e;var n;if("function"!=typeof e)throw new TypeError("Super expression must either be null or a function");if(void 0!==t){if(t.has(e))return t.get(e);t.set(e,r)}function r(){return u(e,arguments,h(this).constructor)}return r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:!1,writable:!0,configurable:!0}}),c(r,e)})(e)}function u(e,t,n){return(u=a()?Reflect.construct:function(e,t,n){var r=[null];r.push.apply(r,t);var s=new(Function.bind.apply(e,r));return n&&c(s,n.prototype),s}).apply(null,arguments)}function a(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}function c(e,t){return(c=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function h(e){return(h=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var f=function(e){i(n,l(Error));var t=o(n);function n(e,r){var i;return s(this,n),(i=t.call(this)).code=1,i.name="CONFIGURATION_ERROR",i.parameter=e,i.value=r,i.message=i.value?"Invalid value ".concat(JSON.stringify(i.value),' for parameter "').concat(i.parameter,'"'):"Missing parameter: ".concat(i.parameter),i}return n}(),d=function(e){i(n,l(Error));var t=o(n);function n(e){var r;return s(this,n),(r=t.call(this)).code=2,r.name="INVALID_STATE_ERROR",r.status=e,r.message="Invalid status: ".concat(e),r}return n}(),_=function(e){i(n,l(Error));var t=o(n);function n(e){var r;return s(this,n),(r=t.call(this)).code=3,r.name="NOT_SUPPORTED_ERROR",r.message=e,r}return n}(),p=function(e){i(n,l(Error));var t=o(n);function n(e){var r;return s(this,n),(r=t.call(this)).code=4,r.name="NOT_READY_ERROR",r.message=e,r}return n}();t.exports={ConfigurationError:f,InvalidStateError:d,NotSupportedError:_,NotReadyError:p}},{}],7:[function(e,t,n){"use strict";t.exports=function(){function t(e){return'"'+e.replace(/\\/g,"\\\\").replace(/"/g,'\\"').replace(/\x08/g,"\\b").replace(/\t/g,"\\t").replace(/\n/g,"\\n").replace(/\f/g,"\\f").replace(/\r/g,"\\r").replace(/[\x00-\x07\x0B\x0E-\x1F\x80-\uFFFF]/g,escape)+'"'}var n={parse:function(n,r){var s={CRLF:c,DIGIT:h,ALPHA:f,HEXDIG:d,WSP:_,OCTET:p,DQUOTE:m,SP:v,HTAB:g,alphanum:y,reserved:T,unreserved:C,mark:S,escaped:E,LWS:A,SWS:b,HCOLON:R,TEXT_UTF8_TRIM:w,TEXT_UTF8char:I,UTF8_NONASCII:O,UTF8_CONT:N,LHEX:function(){var e;null===(e=h())&&(/^[a-f]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[a-f]")));return e},token:k,token_nodot:U,separators:function(){var e;40===n.charCodeAt(i)?(e="(",i++):(e=null,0===o&&a('"("'));null===e&&(41===n.charCodeAt(i)?(e=")",i++):(e=null,0===o&&a('")"')),null===e&&(60===n.charCodeAt(i)?(e="<",i++):(e=null,0===o&&a('"<"')),null===e&&(62===n.charCodeAt(i)?(e=">",i++):(e=null,0===o&&a('">"')),null===e&&(64===n.charCodeAt(i)?(e="@",i++):(e=null,0===o&&a('"@"')),null===e&&(44===n.charCodeAt(i)?(e=",",i++):(e=null,0===o&&a('","')),null===e&&(59===n.charCodeAt(i)?(e=";",i++):(e=null,0===o&&a('";"')),null===e&&(58===n.charCodeAt(i)?(e=":",i++):(e=null,0===o&&a('":"')),null===e&&(92===n.charCodeAt(i)?(e="\\",i++):(e=null,0===o&&a('"\\\\"')),null===e&&null===(e=m())&&(47===n.charCodeAt(i)?(e="/",i++):(e=null,0===o&&a('"/"')),null===e&&(91===n.charCodeAt(i)?(e="[",i++):(e=null,0===o&&a('"["')),null===e&&(93===n.charCodeAt(i)?(e="]",i++):(e=null,0===o&&a('"]"')),null===e&&(63===n.charCodeAt(i)?(e="?",i++):(e=null,0===o&&a('"?"')),null===e&&(61===n.charCodeAt(i)?(e="=",i++):(e=null,0===o&&a('"="')),null===e&&(123===n.charCodeAt(i)?(e="{",i++):(e=null,0===o&&a('"{"')),null===e&&(125===n.charCodeAt(i)?(e="}",i++):(e=null,0===o&&a('"}"')),null===e&&null===(e=v())&&(e=g()))))))))))))))));return e},word:D,STAR:P,SLASH:x,EQUAL:M,LPAREN:q,RPAREN:L,RAQUOT:H,LAQUOT:F,COMMA:j,SEMI:G,COLON:W,LDQUOT:V,RDQUOT:B,comment:function e(){var t,n,r;var s;s=i;t=q();if(null!==t){for(n=[],null===(r=K())&&null===(r=$())&&(r=e());null!==r;)n.push(r),null===(r=K())&&null===(r=$())&&(r=e());null!==n&&null!==(r=L())?t=[t,n,r]:(t=null,i=s)}else t=null,i=s;return t},ctext:K,quoted_string:Y,quoted_string_clean:z,qdtext:J,quoted_pair:$,SIP_URI_noparams:X,SIP_URI:Q,uri_scheme:Z,uri_scheme_sips:ee,uri_scheme_sip:te,userinfo:ne,user:re,user_unreserved:se,password:ie,hostport:oe,host:le,hostname:ue,domainlabel:ae,toplabel:ce,IPv6reference:he,IPv6address:fe,h16:de,ls32:_e,IPv4address:pe,dec_octet:me,port:ve,uri_parameters:ge,uri_parameter:ye,transport_param:Te,user_param:Ce,method_param:Se,ttl_param:Ee,maddr_param:Ae,lr_param:be,other_param:Re,pname:we,pvalue:Ie,paramchar:Oe,param_unreserved:Ne,headers:ke,header:Ue,hname:De,hvalue:Pe,hnv_unreserved:xe,Request_Response:function(){var e;null===(e=ht())&&(e=Me());return e},Request_Line:Me,Request_URI:qe,absoluteURI:Le,hier_part:He,net_path:Fe,abs_path:je,opaque_part:Ge,uric:We,uric_no_slash:Ve,path_segments:Be,segment:Ke,param:Ye,pchar:ze,scheme:Je,authority:$e,srvr:Xe,reg_name:Qe,query:Ze,SIP_Version:et,INVITEm:tt,ACKm:nt,OPTIONSm:rt,BYEm:st,CANCELm:it,REGISTERm:ot,SUBSCRIBEm:lt,NOTIFYm:ut,REFERm:at,Method:ct,Status_Line:ht,Status_Code:ft,extension_code:dt,Reason_Phrase:_t,Allow_Events:function(){var e,t,n,r,s,o;if(s=i,null!==(e=Lt())){for(t=[],o=i,null!==(n=j())&&null!==(r=Lt())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=j())&&null!==(r=Lt())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},Call_ID:function(){var e,t,r,s,l,u;s=i,l=i,null!==(e=D())?(u=i,64===n.charCodeAt(i)?(t="@",i++):(t=null,0===o&&a('"@"')),null!==t&&null!==(r=D())?t=[t,r]:(t=null,i=u),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=l)):(e=null,i=l);null!==e&&(c=s,e=void(jn=n.substring(i,c)));var c;null===e&&(i=s);return e},Contact:function(){var e,t,n,r,s,o,l;if(s=i,null===(e=P()))if(o=i,null!==(e=pt())){for(t=[],l=i,null!==(n=j())&&null!==(r=pt())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=j())&&null!==(r=pt())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;null!==e&&(e=function(e){var t,n;for(n=jn.multi_header.length,t=0;t<n;t++)if(null===jn.multi_header[t].parsed){jn=null;break}jn=null!==jn?jn.multi_header:-1}());null===e&&(i=s);return e},contact_param:pt,name_addr:mt,display_name:vt,contact_params:gt,c_p_q:yt,c_p_expires:Tt,delta_seconds:Ct,qvalue:St,generic_param:Et,gen_value:At,Content_Disposition:function(){var e,t,n,r,s,o;if(s=i,null!==(e=bt())){for(t=[],o=i,null!==(n=G())&&null!==(r=Rt())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=G())&&null!==(r=Rt())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},disp_type:bt,disp_param:Rt,handling_param:wt,Content_Encoding:function(){var e,t,n,r,s,o;if(s=i,null!==(e=k())){for(t=[],o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},Content_Length:function(){var e,t,n;if(n=i,null!==(t=h()))for(e=[];null!==t;)e.push(t),t=h();else e=null;null!==e&&(e=void(jn=parseInt(e.join(""))));null===e&&(i=n);return e},Content_Type:function(){var e,t;t=i,null!==(e=It())&&(r=t,e=void(jn=n.substring(i,r)));var r;null===e&&(i=t);return e},media_type:It,m_type:Ot,discrete_type:Nt,composite_type:kt,extension_token:Ut,x_token:Dt,m_subtype:Pt,m_parameter:xt,m_value:Mt,CSeq:function(){var e,t,n,r;r=i,null!==(e=qt())&&null!==(t=A())&&null!==(n=ct())?e=[e,t,n]:(e=null,i=r);return e},CSeq_value:qt,Expires:function(){var e,t;t=i,null!==(e=Ct())&&(e=void(jn=e));null===e&&(i=t);return e},Event:function(){var e,t,n,r,s,o,l;if(s=i,o=i,null!==(e=Lt())){for(t=[],l=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;null!==e&&(u=e[0],e=void(jn.event=u.join("").toLowerCase()));var u;null===e&&(i=s);return e},event_type:Lt,From:function(){var e,t,n,r,s,o,l;s=i,o=i,null===(e=X())&&(e=mt());if(null!==e){for(t=[],l=i,null!==(n=G())&&null!==(r=Ht())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=G())&&null!==(r=Ht())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;null!==e&&(e=function(e){var t=jn.tag;try{jn=new Fn(jn.uri,jn.display_name,jn.params),t&&jn.setParam("tag",t)}catch(e){jn=-1}}());null===e&&(i=s);return e},from_param:Ht,tag_param:Ft,Max_Forwards:function(){var e,t,n;if(n=i,null!==(t=h()))for(e=[];null!==t;)e.push(t),t=h();else e=null;null!==e&&(e=void(jn=parseInt(e.join(""))));null===e&&(i=n);return e},Min_Expires:function(){var e,t;t=i,null!==(e=Ct())&&(e=void(jn=e));null===e&&(i=t);return e},Name_Addr_Header:function(){var e,t,n,r,s,o,l,u,a,c;u=i,a=i,e=[],t=vt();for(;null!==t;)e.push(t),t=vt();if(null!==e)if(null!==(t=F()))if(null!==(n=Q()))if(null!==(r=H())){for(s=[],c=i,null!==(o=G())&&null!==(l=Et())?o=[o,l]:(o=null,i=c);null!==o;)s.push(o),c=i,null!==(o=G())&&null!==(l=Et())?o=[o,l]:(o=null,i=c);null!==s?e=[e,t,n,r,s]:(e=null,i=a)}else e=null,i=a;else e=null,i=a;else e=null,i=a;else e=null,i=a;null!==e&&(e=function(e){try{jn=new Fn(jn.uri,jn.display_name,jn.params)}catch(e){jn=-1}}());null===e&&(i=u);return e},Proxy_Authenticate:function(){return jt()},challenge:jt,other_challenge:Gt,auth_param:Wt,digest_cln:Vt,realm:Bt,realm_value:Kt,domain:Yt,URI:zt,nonce:Jt,nonce_value:$t,opaque:Xt,stale:Qt,algorithm:Zt,qop_options:en,qop_value:tn,Proxy_Require:function(){var e,t,n,r,s,o;if(s=i,null!==(e=k())){for(t=[],o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},Record_Route:function(){var e,t,n,r,s,o,l;if(s=i,o=i,null!==(e=nn())){for(t=[],l=i,null!==(n=j())&&null!==(r=nn())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=j())&&null!==(r=nn())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;null!==e&&(e=function(e){var t,n;for(n=jn.multi_header.length,t=0;t<n;t++)if(null===jn.multi_header[t].parsed){jn=null;break}jn=null!==jn?jn.multi_header:-1}());null===e&&(i=s);return e},rec_route:nn,Reason:function(){var e,t,r,s,l,u,c;l=i,u=i,"sip"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"SIP"'));null===e&&(e=k());if(null!==e){for(t=[],c=i,null!==(r=G())&&null!==(s=rn())?r=[r,s]:(r=null,i=c);null!==r;)t.push(r),c=i,null!==(r=G())&&null!==(s=rn())?r=[r,s]:(r=null,i=c);null!==t?e=[e,t]:(e=null,i=u)}else e=null,i=u;null!==e&&(e=function(e,t){if(jn.protocol=t.toLowerCase(),jn.params||(jn.params={}),jn.params.text&&'"'===jn.params.text[0]){var n=jn.params.text;jn.text=n.substring(1,n.length-1),delete jn.params.text}}(0,e[0]));null===e&&(i=l);return e},reason_param:rn,reason_cause:sn,Require:function(){var e,t,n,r,s,o;if(s=i,null!==(e=k())){for(t=[],o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},Route:function(){var e,t,n,r,s,o;if(s=i,null!==(e=on())){for(t=[],o=i,null!==(n=j())&&null!==(r=on())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=j())&&null!==(r=on())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},route_param:on,Subscription_State:function(){var e,t,n,r,s,o;if(s=i,null!==(e=ln())){for(t=[],o=i,null!==(n=G())&&null!==(r=un())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=G())&&null!==(r=un())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},substate_value:ln,subexp_params:un,event_reason_value:an,Subject:function(){var e;return e=null!==(e=w())?e:""},Supported:function(){var e,t,n,r,s,o;if(s=i,null!==(e=k())){for(t=[],o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=j())&&null!==(r=k())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e=null!==e?e:""},To:function(){var e,t,n,r,s,o,l;s=i,o=i,null===(e=X())&&(e=mt());if(null!==e){for(t=[],l=i,null!==(n=G())&&null!==(r=cn())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=G())&&null!==(r=cn())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;null!==e&&(e=function(e){var t=jn.tag;try{jn=new Fn(jn.uri,jn.display_name,jn.params),t&&jn.setParam("tag",t)}catch(e){jn=-1}}());null===e&&(i=s);return e},to_param:cn,Via:function(){var e,t,n,r,s,o;if(s=i,null!==(e=hn())){for(t=[],o=i,null!==(n=j())&&null!==(r=hn())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=j())&&null!==(r=hn())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},via_param:hn,via_params:fn,via_ttl:dn,via_maddr:_n,via_received:pn,via_branch:mn,response_port:vn,rport:gn,sent_protocol:yn,protocol_name:Tn,transport:Cn,sent_by:Sn,via_host:En,via_port:An,ttl:bn,WWW_Authenticate:function(){return jt()},Session_Expires:function(){var e,t,n,r,s,o;if(s=i,null!==(e=Rn())){for(t=[],o=i,null!==(n=G())&&null!==(r=wn())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=G())&&null!==(r=wn())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},s_e_expires:Rn,s_e_params:wn,s_e_refresher:In,extension_header:function(){var e,t,n,r;r=i,null!==(e=k())&&null!==(t=R())&&null!==(n=On())?e=[e,t,n]:(e=null,i=r);return e},header_value:On,message_body:function(){var e,t;e=[],t=p();for(;null!==t;)e.push(t),t=p();return e},uuid_URI:function(){var e,t,r;r=i,"uuid:"===n.substr(i,5)?(e="uuid:",i+=5):(e=null,0===o&&a('"uuid:"'));null!==e&&null!==(t=Nn())?e=[e,t]:(e=null,i=r);return e},uuid:Nn,hex4:kn,hex8:Un,hex12:Dn,Refer_To:function(){var e,t,n,r,s,o,l;s=i,o=i,null===(e=X())&&(e=mt());if(null!==e){for(t=[],l=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;null!==e&&(e=function(e){try{jn=new Fn(jn.uri,jn.display_name,jn.params)}catch(e){jn=-1}}());null===e&&(i=s);return e},Replaces:function(){var e,t,n,r,s,o;if(s=i,null!==(e=Pn())){for(t=[],o=i,null!==(n=G())&&null!==(r=xn())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=G())&&null!==(r=xn())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e},call_id:Pn,replaces_param:xn,to_tag:Mn,from_tag:qn,early_flag:Ln};if(void 0!==r){if(void 0===s[r])throw new Error("Invalid rule name: "+t(r)+".")}else r="CRLF";var i=0,o=0,l=0,u=[];function a(e){i<l||(i>l&&(l=i,u=[]),u.push(e))}function c(){var e;return"\r\n"===n.substr(i,2)?(e="\r\n",i+=2):(e=null,0===o&&a('"\\r\\n"')),e}function h(){var e;return/^[0-9]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[0-9]")),e}function f(){var e;return/^[a-zA-Z]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[a-zA-Z]")),e}function d(){var e;return/^[0-9a-fA-F]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[0-9a-fA-F]")),e}function _(){var e;return null===(e=v())&&(e=g()),e}function p(){var e;return/^[\0-\xFF]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[\\0-\\xFF]")),e}function m(){var e;return/^["]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a('["]')),e}function v(){var e;return 32===n.charCodeAt(i)?(e=" ",i++):(e=null,0===o&&a('" "')),e}function g(){var e;return 9===n.charCodeAt(i)?(e="\t",i++):(e=null,0===o&&a('"\\t"')),e}function y(){var e;return/^[a-zA-Z0-9]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[a-zA-Z0-9]")),e}function T(){var e;return 59===n.charCodeAt(i)?(e=";",i++):(e=null,0===o&&a('";"')),null===e&&(47===n.charCodeAt(i)?(e="/",i++):(e=null,0===o&&a('"/"')),null===e&&(63===n.charCodeAt(i)?(e="?",i++):(e=null,0===o&&a('"?"')),null===e&&(58===n.charCodeAt(i)?(e=":",i++):(e=null,0===o&&a('":"')),null===e&&(64===n.charCodeAt(i)?(e="@",i++):(e=null,0===o&&a('"@"')),null===e&&(38===n.charCodeAt(i)?(e="&",i++):(e=null,0===o&&a('"&"')),null===e&&(61===n.charCodeAt(i)?(e="=",i++):(e=null,0===o&&a('"="')),null===e&&(43===n.charCodeAt(i)?(e="+",i++):(e=null,0===o&&a('"+"')),null===e&&(36===n.charCodeAt(i)?(e="$",i++):(e=null,0===o&&a('"$"')),null===e&&(44===n.charCodeAt(i)?(e=",",i++):(e=null,0===o&&a('","'))))))))))),e}function C(){var e;return null===(e=y())&&(e=S()),e}function S(){var e;return 45===n.charCodeAt(i)?(e="-",i++):(e=null,0===o&&a('"-"')),null===e&&(95===n.charCodeAt(i)?(e="_",i++):(e=null,0===o&&a('"_"')),null===e&&(46===n.charCodeAt(i)?(e=".",i++):(e=null,0===o&&a('"."')),null===e&&(33===n.charCodeAt(i)?(e="!",i++):(e=null,0===o&&a('"!"')),null===e&&(126===n.charCodeAt(i)?(e="~",i++):(e=null,0===o&&a('"~"')),null===e&&(42===n.charCodeAt(i)?(e="*",i++):(e=null,0===o&&a('"*"')),null===e&&(39===n.charCodeAt(i)?(e="'",i++):(e=null,0===o&&a('"\'"')),null===e&&(40===n.charCodeAt(i)?(e="(",i++):(e=null,0===o&&a('"("')),null===e&&(41===n.charCodeAt(i)?(e=")",i++):(e=null,0===o&&a('")"')))))))))),e}function E(){var e,t,r,s,l;return s=i,l=i,37===n.charCodeAt(i)?(e="%",i++):(e=null,0===o&&a('"%"')),null!==e&&null!==(t=d())&&null!==(r=d())?e=[e,t,r]:(e=null,i=l),null!==e&&(e=e.join("")),null===e&&(i=s),e}function A(){var e,t,n,r,s,o;for(r=i,s=i,o=i,e=[],t=_();null!==t;)e.push(t),t=_();if(null!==e&&null!==(t=c())?e=[e,t]:(e=null,i=o),null!==(e=null!==e?e:"")){if(null!==(n=_()))for(t=[];null!==n;)t.push(n),n=_();else t=null;null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return null!==e&&(e=" "),null===e&&(i=r),e}function b(){var e;return e=null!==(e=A())?e:""}function R(){var e,t,r,s,l;for(s=i,l=i,e=[],null===(t=v())&&(t=g());null!==t;)e.push(t),null===(t=v())&&(t=g());return null!==e?(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e=":"),null===e&&(i=s),e}function w(){var e,t,r,s,o,l,u,a;if(o=i,l=i,null!==(t=I()))for(e=[];null!==t;)e.push(t),t=I();else e=null;if(null!==e){for(t=[],u=i,r=[],s=A();null!==s;)r.push(s),s=A();for(null!==r&&null!==(s=I())?r=[r,s]:(r=null,i=u);null!==r;){for(t.push(r),u=i,r=[],s=A();null!==s;)r.push(s),s=A();null!==r&&null!==(s=I())?r=[r,s]:(r=null,i=u)}null!==t?e=[e,t]:(e=null,i=l)}else e=null,i=l;return null!==e&&(a=o,e=n.substring(i,a)),null===e&&(i=o),e}function I(){var e;return/^[!-~]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[!-~]")),null===e&&(e=O()),e}function O(){var e;return/^[\x80-\uFFFF]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[\\x80-\\uFFFF]")),e}function N(){var e;return/^[\x80-\xBF]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[\\x80-\\xBF]")),e}function k(){var e,t,r,s;if(r=i,null===(t=y())&&(45===n.charCodeAt(i)?(t="-",i++):(t=null,0===o&&a('"-"')),null===t&&(46===n.charCodeAt(i)?(t=".",i++):(t=null,0===o&&a('"."')),null===t&&(33===n.charCodeAt(i)?(t="!",i++):(t=null,0===o&&a('"!"')),null===t&&(37===n.charCodeAt(i)?(t="%",i++):(t=null,0===o&&a('"%"')),null===t&&(42===n.charCodeAt(i)?(t="*",i++):(t=null,0===o&&a('"*"')),null===t&&(95===n.charCodeAt(i)?(t="_",i++):(t=null,0===o&&a('"_"')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(96===n.charCodeAt(i)?(t="`",i++):(t=null,0===o&&a('"`"')),null===t&&(39===n.charCodeAt(i)?(t="'",i++):(t=null,0===o&&a('"\'"')),null===t&&(126===n.charCodeAt(i)?(t="~",i++):(t=null,0===o&&a('"~"')))))))))))),null!==t)for(e=[];null!==t;)e.push(t),null===(t=y())&&(45===n.charCodeAt(i)?(t="-",i++):(t=null,0===o&&a('"-"')),null===t&&(46===n.charCodeAt(i)?(t=".",i++):(t=null,0===o&&a('"."')),null===t&&(33===n.charCodeAt(i)?(t="!",i++):(t=null,0===o&&a('"!"')),null===t&&(37===n.charCodeAt(i)?(t="%",i++):(t=null,0===o&&a('"%"')),null===t&&(42===n.charCodeAt(i)?(t="*",i++):(t=null,0===o&&a('"*"')),null===t&&(95===n.charCodeAt(i)?(t="_",i++):(t=null,0===o&&a('"_"')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(96===n.charCodeAt(i)?(t="`",i++):(t=null,0===o&&a('"`"')),null===t&&(39===n.charCodeAt(i)?(t="'",i++):(t=null,0===o&&a('"\'"')),null===t&&(126===n.charCodeAt(i)?(t="~",i++):(t=null,0===o&&a('"~"'))))))))))));else e=null;return null!==e&&(s=r,e=n.substring(i,s)),null===e&&(i=r),e}function U(){var e,t,r,s;if(r=i,null===(t=y())&&(45===n.charCodeAt(i)?(t="-",i++):(t=null,0===o&&a('"-"')),null===t&&(33===n.charCodeAt(i)?(t="!",i++):(t=null,0===o&&a('"!"')),null===t&&(37===n.charCodeAt(i)?(t="%",i++):(t=null,0===o&&a('"%"')),null===t&&(42===n.charCodeAt(i)?(t="*",i++):(t=null,0===o&&a('"*"')),null===t&&(95===n.charCodeAt(i)?(t="_",i++):(t=null,0===o&&a('"_"')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(96===n.charCodeAt(i)?(t="`",i++):(t=null,0===o&&a('"`"')),null===t&&(39===n.charCodeAt(i)?(t="'",i++):(t=null,0===o&&a('"\'"')),null===t&&(126===n.charCodeAt(i)?(t="~",i++):(t=null,0===o&&a('"~"'))))))))))),null!==t)for(e=[];null!==t;)e.push(t),null===(t=y())&&(45===n.charCodeAt(i)?(t="-",i++):(t=null,0===o&&a('"-"')),null===t&&(33===n.charCodeAt(i)?(t="!",i++):(t=null,0===o&&a('"!"')),null===t&&(37===n.charCodeAt(i)?(t="%",i++):(t=null,0===o&&a('"%"')),null===t&&(42===n.charCodeAt(i)?(t="*",i++):(t=null,0===o&&a('"*"')),null===t&&(95===n.charCodeAt(i)?(t="_",i++):(t=null,0===o&&a('"_"')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(96===n.charCodeAt(i)?(t="`",i++):(t=null,0===o&&a('"`"')),null===t&&(39===n.charCodeAt(i)?(t="'",i++):(t=null,0===o&&a('"\'"')),null===t&&(126===n.charCodeAt(i)?(t="~",i++):(t=null,0===o&&a('"~"')))))))))));else e=null;return null!==e&&(s=r,e=n.substring(i,s)),null===e&&(i=r),e}function D(){var e,t,r,s;if(r=i,null===(t=y())&&(45===n.charCodeAt(i)?(t="-",i++):(t=null,0===o&&a('"-"')),null===t&&(46===n.charCodeAt(i)?(t=".",i++):(t=null,0===o&&a('"."')),null===t&&(33===n.charCodeAt(i)?(t="!",i++):(t=null,0===o&&a('"!"')),null===t&&(37===n.charCodeAt(i)?(t="%",i++):(t=null,0===o&&a('"%"')),null===t&&(42===n.charCodeAt(i)?(t="*",i++):(t=null,0===o&&a('"*"')),null===t&&(95===n.charCodeAt(i)?(t="_",i++):(t=null,0===o&&a('"_"')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(96===n.charCodeAt(i)?(t="`",i++):(t=null,0===o&&a('"`"')),null===t&&(39===n.charCodeAt(i)?(t="'",i++):(t=null,0===o&&a('"\'"')),null===t&&(126===n.charCodeAt(i)?(t="~",i++):(t=null,0===o&&a('"~"')),null===t&&(40===n.charCodeAt(i)?(t="(",i++):(t=null,0===o&&a('"("')),null===t&&(41===n.charCodeAt(i)?(t=")",i++):(t=null,0===o&&a('")"')),null===t&&(60===n.charCodeAt(i)?(t="<",i++):(t=null,0===o&&a('"<"')),null===t&&(62===n.charCodeAt(i)?(t=">",i++):(t=null,0===o&&a('">"')),null===t&&(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null===t&&(92===n.charCodeAt(i)?(t="\\",i++):(t=null,0===o&&a('"\\\\"')),null===t&&null===(t=m())&&(47===n.charCodeAt(i)?(t="/",i++):(t=null,0===o&&a('"/"')),null===t&&(91===n.charCodeAt(i)?(t="[",i++):(t=null,0===o&&a('"["')),null===t&&(93===n.charCodeAt(i)?(t="]",i++):(t=null,0===o&&a('"]"')),null===t&&(63===n.charCodeAt(i)?(t="?",i++):(t=null,0===o&&a('"?"')),null===t&&(123===n.charCodeAt(i)?(t="{",i++):(t=null,0===o&&a('"{"')),null===t&&(125===n.charCodeAt(i)?(t="}",i++):(t=null,0===o&&a('"}"')))))))))))))))))))))))),null!==t)for(e=[];null!==t;)e.push(t),null===(t=y())&&(45===n.charCodeAt(i)?(t="-",i++):(t=null,0===o&&a('"-"')),null===t&&(46===n.charCodeAt(i)?(t=".",i++):(t=null,0===o&&a('"."')),null===t&&(33===n.charCodeAt(i)?(t="!",i++):(t=null,0===o&&a('"!"')),null===t&&(37===n.charCodeAt(i)?(t="%",i++):(t=null,0===o&&a('"%"')),null===t&&(42===n.charCodeAt(i)?(t="*",i++):(t=null,0===o&&a('"*"')),null===t&&(95===n.charCodeAt(i)?(t="_",i++):(t=null,0===o&&a('"_"')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(96===n.charCodeAt(i)?(t="`",i++):(t=null,0===o&&a('"`"')),null===t&&(39===n.charCodeAt(i)?(t="'",i++):(t=null,0===o&&a('"\'"')),null===t&&(126===n.charCodeAt(i)?(t="~",i++):(t=null,0===o&&a('"~"')),null===t&&(40===n.charCodeAt(i)?(t="(",i++):(t=null,0===o&&a('"("')),null===t&&(41===n.charCodeAt(i)?(t=")",i++):(t=null,0===o&&a('")"')),null===t&&(60===n.charCodeAt(i)?(t="<",i++):(t=null,0===o&&a('"<"')),null===t&&(62===n.charCodeAt(i)?(t=">",i++):(t=null,0===o&&a('">"')),null===t&&(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null===t&&(92===n.charCodeAt(i)?(t="\\",i++):(t=null,0===o&&a('"\\\\"')),null===t&&null===(t=m())&&(47===n.charCodeAt(i)?(t="/",i++):(t=null,0===o&&a('"/"')),null===t&&(91===n.charCodeAt(i)?(t="[",i++):(t=null,0===o&&a('"["')),null===t&&(93===n.charCodeAt(i)?(t="]",i++):(t=null,0===o&&a('"]"')),null===t&&(63===n.charCodeAt(i)?(t="?",i++):(t=null,0===o&&a('"?"')),null===t&&(123===n.charCodeAt(i)?(t="{",i++):(t=null,0===o&&a('"{"')),null===t&&(125===n.charCodeAt(i)?(t="}",i++):(t=null,0===o&&a('"}"'))))))))))))))))))))))));else e=null;return null!==e&&(s=r,e=n.substring(i,s)),null===e&&(i=r),e}function P(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(42===n.charCodeAt(i)?(t="*",i++):(t=null,0===o&&a('"*"')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e="*"),null===e&&(i=s),e}function x(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(47===n.charCodeAt(i)?(t="/",i++):(t=null,0===o&&a('"/"')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e="/"),null===e&&(i=s),e}function M(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e="="),null===e&&(i=s),e}function q(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(40===n.charCodeAt(i)?(t="(",i++):(t=null,0===o&&a('"("')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e="("),null===e&&(i=s),e}function L(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(41===n.charCodeAt(i)?(t=")",i++):(t=null,0===o&&a('")"')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e=")"),null===e&&(i=s),e}function H(){var e,t,r,s;return r=i,s=i,62===n.charCodeAt(i)?(e=">",i++):(e=null,0===o&&a('">"')),null!==e&&null!==(t=b())?e=[e,t]:(e=null,i=s),null!==e&&(e=">"),null===e&&(i=r),e}function F(){var e,t,r,s;return r=i,s=i,null!==(e=b())?(60===n.charCodeAt(i)?(t="<",i++):(t=null,0===o&&a('"<"')),null!==t?e=[e,t]:(e=null,i=s)):(e=null,i=s),null!==e&&(e="<"),null===e&&(i=r),e}function j(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(44===n.charCodeAt(i)?(t=",",i++):(t=null,0===o&&a('","')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e=","),null===e&&(i=s),e}function G(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(59===n.charCodeAt(i)?(t=";",i++):(t=null,0===o&&a('";"')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e=";"),null===e&&(i=s),e}function W(){var e,t,r,s,l;return s=i,l=i,null!==(e=b())?(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=b())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(e=":"),null===e&&(i=s),e}function V(){var e,t,n,r;return n=i,r=i,null!==(e=b())&&null!==(t=m())?e=[e,t]:(e=null,i=r),null!==e&&(e='"'),null===e&&(i=n),e}function B(){var e,t,n,r;return n=i,r=i,null!==(e=m())&&null!==(t=b())?e=[e,t]:(e=null,i=r),null!==e&&(e='"'),null===e&&(i=n),e}function K(){var e;return/^[!-']/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[!-']")),null===e&&(/^[*-[]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[*-[]")),null===e&&(/^[\]-~]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[\\]-~]")),null===e&&null===(e=O())&&(e=A()))),e}function Y(){var e,t,r,s,o,l,u;if(o=i,l=i,null!==(e=b()))if(null!==(t=m())){for(r=[],null===(s=J())&&(s=$());null!==s;)r.push(s),null===(s=J())&&(s=$());null!==r&&null!==(s=m())?e=[e,t,r,s]:(e=null,i=l)}else e=null,i=l;else e=null,i=l;return null!==e&&(u=o,e=n.substring(i,u)),null===e&&(i=o),e}function z(){var e,t,r,s,o,l,u,a;if(o=i,l=i,null!==(e=b()))if(null!==(t=m())){for(r=[],null===(s=J())&&(s=$());null!==s;)r.push(s),null===(s=J())&&(s=$());null!==r&&null!==(s=m())?e=[e,t,r,s]:(e=null,i=l)}else e=null,i=l;else e=null,i=l;return null!==e&&(u=o,e=(a=n.substring(i,u).trim()).substring(1,a.length-1).replace(/\\([\x00-\x09\x0b-\x0c\x0e-\x7f])/g,"$1")),null===e&&(i=o),e}function J(){var e;return null===(e=A())&&(33===n.charCodeAt(i)?(e="!",i++):(e=null,0===o&&a('"!"')),null===e&&(/^[#-[]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[#-[]")),null===e&&(/^[\]-~]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[\\]-~]")),null===e&&(e=O())))),e}function $(){var e,t,r;return r=i,92===n.charCodeAt(i)?(e="\\",i++):(e=null,0===o&&a('"\\\\"')),null!==e?(/^[\0-\t]/.test(n.charAt(i))?(t=n.charAt(i),i++):(t=null,0===o&&a("[\\0-\\t]")),null===t&&(/^[\x0B-\f]/.test(n.charAt(i))?(t=n.charAt(i),i++):(t=null,0===o&&a("[\\x0B-\\f]")),null===t&&(/^[\x0E-]/.test(n.charAt(i))?(t=n.charAt(i),i++):(t=null,0===o&&a("[\\x0E-]")))),null!==t?e=[e,t]:(e=null,i=r)):(e=null,i=r),e}function X(){var e,t,r,s,l,u;return l=i,u=i,null!==(e=Z())?(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=null!==(r=ne())?r:"")&&null!==(s=oe())?e=[e,t,r,s]:(e=null,i=u)):(e=null,i=u),null!==e&&(e=function(e){try{jn.uri=new Hn(jn.scheme,jn.user,jn.host,jn.port),delete jn.scheme,delete jn.user,delete jn.host,delete jn.host_type,delete jn.port}catch(e){jn=-1}}()),null===e&&(i=l),e}function Q(){var e,t,s,l,u,c,h,f;return h=i,f=i,null!==(e=Z())?(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(s=null!==(s=ne())?s:"")&&null!==(l=oe())&&null!==(u=ge())&&null!==(c=null!==(c=ke())?c:"")?e=[e,t,s,l,u,c]:(e=null,i=f)):(e=null,i=f),null!==e&&(e=function(e){try{jn.uri=new Hn(jn.scheme,jn.user,jn.host,jn.port,jn.uri_params,jn.uri_headers),delete jn.scheme,delete jn.user,delete jn.host,delete jn.host_type,delete jn.port,delete jn.uri_params,"SIP_URI"===r&&(jn=jn.uri)}catch(e){jn=-1}}()),null===e&&(i=h),e}function Z(){var e;return null===(e=ee())&&(e=te()),e}function ee(){var e,t,r;return t=i,"sips"===n.substr(i,4).toLowerCase()?(e=n.substr(i,4),i+=4):(e=null,0===o&&a('"sips"')),null!==e&&(r=e,e=void(jn.scheme=r.toLowerCase())),null===e&&(i=t),e}function te(){var e,t,r;return t=i,"sip"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"sip"')),null!==e&&(r=e,e=void(jn.scheme=r.toLowerCase())),null===e&&(i=t),e}function ne(){var e,t,r,s,l,u,c;return s=i,l=i,null!==(e=re())?(u=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=ie())?t=[t,r]:(t=null,i=u),null!==(t=null!==t?t:"")?(64===n.charCodeAt(i)?(r="@",i++):(r=null,0===o&&a('"@"')),null!==r?e=[e,t,r]:(e=null,i=l)):(e=null,i=l)):(e=null,i=l),null!==e&&(c=s,e=void(jn.user=decodeURIComponent(n.substring(i-1,c)))),null===e&&(i=s),e}function re(){var e,t;if(null===(t=C())&&null===(t=E())&&(t=se()),null!==t)for(e=[];null!==t;)e.push(t),null===(t=C())&&null===(t=E())&&(t=se());else e=null;return e}function se(){var e;return 38===n.charCodeAt(i)?(e="&",i++):(e=null,0===o&&a('"&"')),null===e&&(61===n.charCodeAt(i)?(e="=",i++):(e=null,0===o&&a('"="')),null===e&&(43===n.charCodeAt(i)?(e="+",i++):(e=null,0===o&&a('"+"')),null===e&&(36===n.charCodeAt(i)?(e="$",i++):(e=null,0===o&&a('"$"')),null===e&&(44===n.charCodeAt(i)?(e=",",i++):(e=null,0===o&&a('","')),null===e&&(59===n.charCodeAt(i)?(e=";",i++):(e=null,0===o&&a('";"')),null===e&&(63===n.charCodeAt(i)?(e="?",i++):(e=null,0===o&&a('"?"')),null===e&&(47===n.charCodeAt(i)?(e="/",i++):(e=null,0===o&&a('"/"'))))))))),e}function ie(){var e,t,r,s;for(r=i,e=[],null===(t=C())&&null===(t=E())&&(38===n.charCodeAt(i)?(t="&",i++):(t=null,0===o&&a('"&"')),null===t&&(61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(36===n.charCodeAt(i)?(t="$",i++):(t=null,0===o&&a('"$"')),null===t&&(44===n.charCodeAt(i)?(t=",",i++):(t=null,0===o&&a('","')))))));null!==t;)e.push(t),null===(t=C())&&null===(t=E())&&(38===n.charCodeAt(i)?(t="&",i++):(t=null,0===o&&a('"&"')),null===t&&(61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')),null===t&&(36===n.charCodeAt(i)?(t="$",i++):(t=null,0===o&&a('"$"')),null===t&&(44===n.charCodeAt(i)?(t=",",i++):(t=null,0===o&&a('","')))))));return null!==e&&(s=r,e=void(jn.password=n.substring(i,s))),null===e&&(i=r),e}function oe(){var e,t,r,s,l;return s=i,null!==(e=le())?(l=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=ve())?t=[t,r]:(t=null,i=l),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=s)):(e=null,i=s),e}function le(){var e,t,r;return t=i,null===(e=ue())&&null===(e=pe())&&(e=he()),null!==e&&(r=t,jn.host=n.substring(i,r).toLowerCase(),e=jn.host),null===e&&(i=t),e}function ue(){var e,t,r,s,l,u,c;for(s=i,l=i,e=[],u=i,null!==(t=ae())?(46===n.charCodeAt(i)?(r=".",i++):(r=null,0===o&&a('"."')),null!==r?t=[t,r]:(t=null,i=u)):(t=null,i=u);null!==t;)e.push(t),u=i,null!==(t=ae())?(46===n.charCodeAt(i)?(r=".",i++):(r=null,0===o&&a('"."')),null!==r?t=[t,r]:(t=null,i=u)):(t=null,i=u);return null!==e&&null!==(t=ce())?(46===n.charCodeAt(i)?(r=".",i++):(r=null,0===o&&a('"."')),null!==(r=null!==r?r:"")?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(c=s,jn.host_type="domain",e=n.substring(i,c)),null===e&&(i=s),e}function ae(){var e,t,r,s;if(s=i,null!==(e=y())){for(t=[],null===(r=y())&&(45===n.charCodeAt(i)?(r="-",i++):(r=null,0===o&&a('"-"')),null===r&&(95===n.charCodeAt(i)?(r="_",i++):(r=null,0===o&&a('"_"'))));null!==r;)t.push(r),null===(r=y())&&(45===n.charCodeAt(i)?(r="-",i++):(r=null,0===o&&a('"-"')),null===r&&(95===n.charCodeAt(i)?(r="_",i++):(r=null,0===o&&a('"_"'))));null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e}function ce(){var e,t,r,s;if(s=i,null!==(e=f())){for(t=[],null===(r=y())&&(45===n.charCodeAt(i)?(r="-",i++):(r=null,0===o&&a('"-"')),null===r&&(95===n.charCodeAt(i)?(r="_",i++):(r=null,0===o&&a('"_"'))));null!==r;)t.push(r),null===(r=y())&&(45===n.charCodeAt(i)?(r="-",i++):(r=null,0===o&&a('"-"')),null===r&&(95===n.charCodeAt(i)?(r="_",i++):(r=null,0===o&&a('"_"'))));null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e}function he(){var e,t,r,s,l,u;return s=i,l=i,91===n.charCodeAt(i)?(e="[",i++):(e=null,0===o&&a('"["')),null!==e&&null!==(t=fe())?(93===n.charCodeAt(i)?(r="]",i++):(r=null,0===o&&a('"]"')),null!==r?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(u=s,jn.host_type="IPv6",e=n.substring(i,u)),null===e&&(i=s),e}function fe(){var e,t,r,s,l,u,c,h,f,d,_,p,m,v,g,y,T;return v=i,g=i,null!==(e=de())?(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?(58===n.charCodeAt(i)?(s=":",i++):(s=null,0===o&&a('":"')),null!==s&&null!==(l=de())?(58===n.charCodeAt(i)?(u=":",i++):(u=null,0===o&&a('":"')),null!==u&&null!==(c=de())?(58===n.charCodeAt(i)?(h=":",i++):(h=null,0===o&&a('":"')),null!==h&&null!==(f=de())?(58===n.charCodeAt(i)?(d=":",i++):(d=null,0===o&&a('":"')),null!==d&&null!==(_=de())?(58===n.charCodeAt(i)?(p=":",i++):(p=null,0===o&&a('":"')),null!==p&&null!==(m=_e())?e=[e,t,r,s,l,u,c,h,f,d,_,p,m]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,"::"===n.substr(i,2)?(e="::",i+=2):(e=null,0===o&&a('"::"')),null!==e&&null!==(t=de())?(58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?(58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=de())?(58===n.charCodeAt(i)?(c=":",i++):(c=null,0===o&&a('":"')),null!==c&&null!==(h=de())?(58===n.charCodeAt(i)?(f=":",i++):(f=null,0===o&&a('":"')),null!==f&&null!==(d=de())?(58===n.charCodeAt(i)?(_=":",i++):(_=null,0===o&&a('":"')),null!==_&&null!==(p=_e())?e=[e,t,r,s,l,u,c,h,f,d,_,p]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,"::"===n.substr(i,2)?(e="::",i+=2):(e=null,0===o&&a('"::"')),null!==e&&null!==(t=de())?(58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?(58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=de())?(58===n.charCodeAt(i)?(c=":",i++):(c=null,0===o&&a('":"')),null!==c&&null!==(h=de())?(58===n.charCodeAt(i)?(f=":",i++):(f=null,0===o&&a('":"')),null!==f&&null!==(d=_e())?e=[e,t,r,s,l,u,c,h,f,d]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,"::"===n.substr(i,2)?(e="::",i+=2):(e=null,0===o&&a('"::"')),null!==e&&null!==(t=de())?(58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?(58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=de())?(58===n.charCodeAt(i)?(c=":",i++):(c=null,0===o&&a('":"')),null!==c&&null!==(h=_e())?e=[e,t,r,s,l,u,c,h]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,"::"===n.substr(i,2)?(e="::",i+=2):(e=null,0===o&&a('"::"')),null!==e&&null!==(t=de())?(58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?(58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=_e())?e=[e,t,r,s,l,u]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,"::"===n.substr(i,2)?(e="::",i+=2):(e=null,0===o&&a('"::"')),null!==e&&null!==(t=de())?(58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=_e())?e=[e,t,r,s]:(e=null,i=g)):(e=null,i=g),null===e&&(g=i,"::"===n.substr(i,2)?(e="::",i+=2):(e=null,0===o&&a('"::"')),null!==e&&null!==(t=_e())?e=[e,t]:(e=null,i=g),null===e&&(g=i,"::"===n.substr(i,2)?(e="::",i+=2):(e=null,0===o&&a('"::"')),null!==e&&null!==(t=de())?e=[e,t]:(e=null,i=g),null===e&&(g=i,null!==(e=de())?("::"===n.substr(i,2)?(t="::",i+=2):(t=null,0===o&&a('"::"')),null!==t&&null!==(r=de())?(58===n.charCodeAt(i)?(s=":",i++):(s=null,0===o&&a('":"')),null!==s&&null!==(l=de())?(58===n.charCodeAt(i)?(u=":",i++):(u=null,0===o&&a('":"')),null!==u&&null!==(c=de())?(58===n.charCodeAt(i)?(h=":",i++):(h=null,0===o&&a('":"')),null!==h&&null!==(f=de())?(58===n.charCodeAt(i)?(d=":",i++):(d=null,0===o&&a('":"')),null!==d&&null!==(_=_e())?e=[e,t,r,s,l,u,c,h,f,d,_]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,null!==(e=de())?(y=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?t=[t,r]:(t=null,i=y),null!==(t=null!==t?t:"")?("::"===n.substr(i,2)?(r="::",i+=2):(r=null,0===o&&a('"::"')),null!==r&&null!==(s=de())?(58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=de())?(58===n.charCodeAt(i)?(c=":",i++):(c=null,0===o&&a('":"')),null!==c&&null!==(h=de())?(58===n.charCodeAt(i)?(f=":",i++):(f=null,0===o&&a('":"')),null!==f&&null!==(d=_e())?e=[e,t,r,s,l,u,c,h,f,d]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,null!==(e=de())?(y=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?t=[t,r]:(t=null,i=y),null!==(t=null!==t?t:"")?(y=i,58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?r=[r,s]:(r=null,i=y),null!==(r=null!==r?r:"")?("::"===n.substr(i,2)?(s="::",i+=2):(s=null,0===o&&a('"::"')),null!==s&&null!==(l=de())?(58===n.charCodeAt(i)?(u=":",i++):(u=null,0===o&&a('":"')),null!==u&&null!==(c=de())?(58===n.charCodeAt(i)?(h=":",i++):(h=null,0===o&&a('":"')),null!==h&&null!==(f=_e())?e=[e,t,r,s,l,u,c,h,f]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,null!==(e=de())?(y=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?t=[t,r]:(t=null,i=y),null!==(t=null!==t?t:"")?(y=i,58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?r=[r,s]:(r=null,i=y),null!==(r=null!==r?r:"")?(y=i,58===n.charCodeAt(i)?(s=":",i++):(s=null,0===o&&a('":"')),null!==s&&null!==(l=de())?s=[s,l]:(s=null,i=y),null!==(s=null!==s?s:"")?("::"===n.substr(i,2)?(l="::",i+=2):(l=null,0===o&&a('"::"')),null!==l&&null!==(u=de())?(58===n.charCodeAt(i)?(c=":",i++):(c=null,0===o&&a('":"')),null!==c&&null!==(h=_e())?e=[e,t,r,s,l,u,c,h]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,null!==(e=de())?(y=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?t=[t,r]:(t=null,i=y),null!==(t=null!==t?t:"")?(y=i,58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?r=[r,s]:(r=null,i=y),null!==(r=null!==r?r:"")?(y=i,58===n.charCodeAt(i)?(s=":",i++):(s=null,0===o&&a('":"')),null!==s&&null!==(l=de())?s=[s,l]:(s=null,i=y),null!==(s=null!==s?s:"")?(y=i,58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=de())?l=[l,u]:(l=null,i=y),null!==(l=null!==l?l:"")?("::"===n.substr(i,2)?(u="::",i+=2):(u=null,0===o&&a('"::"')),null!==u&&null!==(c=_e())?e=[e,t,r,s,l,u,c]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,null!==(e=de())?(y=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?t=[t,r]:(t=null,i=y),null!==(t=null!==t?t:"")?(y=i,58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?r=[r,s]:(r=null,i=y),null!==(r=null!==r?r:"")?(y=i,58===n.charCodeAt(i)?(s=":",i++):(s=null,0===o&&a('":"')),null!==s&&null!==(l=de())?s=[s,l]:(s=null,i=y),null!==(s=null!==s?s:"")?(y=i,58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=de())?l=[l,u]:(l=null,i=y),null!==(l=null!==l?l:"")?(y=i,58===n.charCodeAt(i)?(u=":",i++):(u=null,0===o&&a('":"')),null!==u&&null!==(c=de())?u=[u,c]:(u=null,i=y),null!==(u=null!==u?u:"")?("::"===n.substr(i,2)?(c="::",i+=2):(c=null,0===o&&a('"::"')),null!==c&&null!==(h=de())?e=[e,t,r,s,l,u,c,h]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g),null===e&&(g=i,null!==(e=de())?(y=i,58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?t=[t,r]:(t=null,i=y),null!==(t=null!==t?t:"")?(y=i,58===n.charCodeAt(i)?(r=":",i++):(r=null,0===o&&a('":"')),null!==r&&null!==(s=de())?r=[r,s]:(r=null,i=y),null!==(r=null!==r?r:"")?(y=i,58===n.charCodeAt(i)?(s=":",i++):(s=null,0===o&&a('":"')),null!==s&&null!==(l=de())?s=[s,l]:(s=null,i=y),null!==(s=null!==s?s:"")?(y=i,58===n.charCodeAt(i)?(l=":",i++):(l=null,0===o&&a('":"')),null!==l&&null!==(u=de())?l=[l,u]:(l=null,i=y),null!==(l=null!==l?l:"")?(y=i,58===n.charCodeAt(i)?(u=":",i++):(u=null,0===o&&a('":"')),null!==u&&null!==(c=de())?u=[u,c]:(u=null,i=y),null!==(u=null!==u?u:"")?(y=i,58===n.charCodeAt(i)?(c=":",i++):(c=null,0===o&&a('":"')),null!==c&&null!==(h=de())?c=[c,h]:(c=null,i=y),null!==(c=null!==c?c:"")?("::"===n.substr(i,2)?(h="::",i+=2):(h=null,0===o&&a('"::"')),null!==h?e=[e,t,r,s,l,u,c,h]:(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g)):(e=null,i=g))))))))))))))),null!==e&&(T=v,jn.host_type="IPv6",e=n.substring(i,T)),null===e&&(i=v),e}function de(){var e,t,n,r,s;return s=i,null!==(e=d())&&null!==(t=null!==(t=d())?t:"")&&null!==(n=null!==(n=d())?n:"")&&null!==(r=null!==(r=d())?r:"")?e=[e,t,n,r]:(e=null,i=s),e}function _e(){var e,t,r,s;return s=i,null!==(e=de())?(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t&&null!==(r=de())?e=[e,t,r]:(e=null,i=s)):(e=null,i=s),null===e&&(e=pe()),e}function pe(){var e,t,r,s,l,u,c,h,f,d;return h=i,f=i,null!==(e=me())?(46===n.charCodeAt(i)?(t=".",i++):(t=null,0===o&&a('"."')),null!==t&&null!==(r=me())?(46===n.charCodeAt(i)?(s=".",i++):(s=null,0===o&&a('"."')),null!==s&&null!==(l=me())?(46===n.charCodeAt(i)?(u=".",i++):(u=null,0===o&&a('"."')),null!==u&&null!==(c=me())?e=[e,t,r,s,l,u,c]:(e=null,i=f)):(e=null,i=f)):(e=null,i=f)):(e=null,i=f),null!==e&&(d=h,jn.host_type="IPv4",e=n.substring(i,d)),null===e&&(i=h),e}function me(){var e,t,r,s;return s=i,"25"===n.substr(i,2)?(e="25",i+=2):(e=null,0===o&&a('"25"')),null!==e?(/^[0-5]/.test(n.charAt(i))?(t=n.charAt(i),i++):(t=null,0===o&&a("[0-5]")),null!==t?e=[e,t]:(e=null,i=s)):(e=null,i=s),null===e&&(s=i,50===n.charCodeAt(i)?(e="2",i++):(e=null,0===o&&a('"2"')),null!==e?(/^[0-4]/.test(n.charAt(i))?(t=n.charAt(i),i++):(t=null,0===o&&a("[0-4]")),null!==t&&null!==(r=h())?e=[e,t,r]:(e=null,i=s)):(e=null,i=s),null===e&&(s=i,49===n.charCodeAt(i)?(e="1",i++):(e=null,0===o&&a('"1"')),null!==e&&null!==(t=h())&&null!==(r=h())?e=[e,t,r]:(e=null,i=s),null===e&&(s=i,/^[1-9]/.test(n.charAt(i))?(e=n.charAt(i),i++):(e=null,0===o&&a("[1-9]")),null!==e&&null!==(t=h())?e=[e,t]:(e=null,i=s),null===e&&(e=h())))),e}function ve(){var e,t,n,r,s,o,l,u;return o=i,l=i,null!==(e=null!==(e=h())?e:"")&&null!==(t=null!==(t=h())?t:"")&&null!==(n=null!==(n=h())?n:"")&&null!==(r=null!==(r=h())?r:"")&&null!==(s=null!==(s=h())?s:"")?e=[e,t,n,r,s]:(e=null,i=l),null!==e&&(u=e,u=parseInt(u.join("")),jn.port=u,e=u),null===e&&(i=o),e}function ge(){var e,t,r,s;for(e=[],s=i,59===n.charCodeAt(i)?(t=";",i++):(t=null,0===o&&a('";"')),null!==t&&null!==(r=ye())?t=[t,r]:(t=null,i=s);null!==t;)e.push(t),s=i,59===n.charCodeAt(i)?(t=";",i++):(t=null,0===o&&a('";"')),null!==t&&null!==(r=ye())?t=[t,r]:(t=null,i=s);return e}function ye(){var e;return null===(e=Te())&&null===(e=Ce())&&null===(e=Se())&&null===(e=Ee())&&null===(e=Ae())&&null===(e=be())&&(e=Re()),e}function Te(){var e,t,r,s,l;return r=i,s=i,"transport="===n.substr(i,10).toLowerCase()?(e=n.substr(i,10),i+=10):(e=null,0===o&&a('"transport="')),null!==e?("udp"===n.substr(i,3).toLowerCase()?(t=n.substr(i,3),i+=3):(t=null,0===o&&a('"udp"')),null===t&&("tcp"===n.substr(i,3).toLowerCase()?(t=n.substr(i,3),i+=3):(t=null,0===o&&a('"tcp"')),null===t&&("sctp"===n.substr(i,4).toLowerCase()?(t=n.substr(i,4),i+=4):(t=null,0===o&&a('"sctp"')),null===t&&("tls"===n.substr(i,3).toLowerCase()?(t=n.substr(i,3),i+=3):(t=null,0===o&&a('"tls"')),null===t&&(t=k())))),null!==t?e=[e,t]:(e=null,i=s)):(e=null,i=s),null!==e&&(l=e[1],jn.uri_params||(jn.uri_params={}),e=void(jn.uri_params.transport=l.toLowerCase())),null===e&&(i=r),e}function Ce(){var e,t,r,s,l;return r=i,s=i,"user="===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"user="')),null!==e?("phone"===n.substr(i,5).toLowerCase()?(t=n.substr(i,5),i+=5):(t=null,0===o&&a('"phone"')),null===t&&("ip"===n.substr(i,2).toLowerCase()?(t=n.substr(i,2),i+=2):(t=null,0===o&&a('"ip"')),null===t&&(t=k())),null!==t?e=[e,t]:(e=null,i=s)):(e=null,i=s),null!==e&&(l=e[1],jn.uri_params||(jn.uri_params={}),e=void(jn.uri_params.user=l.toLowerCase())),null===e&&(i=r),e}function Se(){var e,t,r,s,l;return r=i,s=i,"method="===n.substr(i,7).toLowerCase()?(e=n.substr(i,7),i+=7):(e=null,0===o&&a('"method="')),null!==e&&null!==(t=ct())?e=[e,t]:(e=null,i=s),null!==e&&(l=e[1],jn.uri_params||(jn.uri_params={}),e=void(jn.uri_params.method=l)),null===e&&(i=r),e}function Ee(){var e,t,r,s,l;return r=i,s=i,"ttl="===n.substr(i,4).toLowerCase()?(e=n.substr(i,4),i+=4):(e=null,0===o&&a('"ttl="')),null!==e&&null!==(t=bn())?e=[e,t]:(e=null,i=s),null!==e&&(l=e[1],jn.params||(jn.params={}),e=void(jn.params.ttl=l)),null===e&&(i=r),e}function Ae(){var e,t,r,s,l;return r=i,s=i,"maddr="===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"maddr="')),null!==e&&null!==(t=le())?e=[e,t]:(e=null,i=s),null!==e&&(l=e[1],jn.uri_params||(jn.uri_params={}),e=void(jn.uri_params.maddr=l)),null===e&&(i=r),e}function be(){var e,t,r,s,l,u;return s=i,l=i,"lr"===n.substr(i,2).toLowerCase()?(e=n.substr(i,2),i+=2):(e=null,0===o&&a('"lr"')),null!==e?(u=i,61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null!==t&&null!==(r=k())?t=[t,r]:(t=null,i=u),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=l)):(e=null,i=l),null!==e&&(jn.uri_params||(jn.uri_params={}),e=void(jn.uri_params.lr=void 0)),null===e&&(i=s),e}function Re(){var e,t,r,s,l,u,c,h;return s=i,l=i,null!==(e=we())?(u=i,61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null!==t&&null!==(r=Ie())?t=[t,r]:(t=null,i=u),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=l)):(e=null,i=l),null!==e&&(c=e[0],h=e[1],jn.uri_params||(jn.uri_params={}),h=void 0===h?void 0:h[1],e=void(jn.uri_params[c.toLowerCase()]=h)),null===e&&(i=s),e}function we(){var e,t,n;if(n=i,null!==(t=Oe()))for(e=[];null!==t;)e.push(t),t=Oe();else e=null;return null!==e&&(e=e.join("")),null===e&&(i=n),e}function Ie(){var e,t,n;if(n=i,null!==(t=Oe()))for(e=[];null!==t;)e.push(t),t=Oe();else e=null;return null!==e&&(e=e.join("")),null===e&&(i=n),e}function Oe(){var e;return null===(e=Ne())&&null===(e=C())&&(e=E()),e}function Ne(){var e;return 91===n.charCodeAt(i)?(e="[",i++):(e=null,0===o&&a('"["')),null===e&&(93===n.charCodeAt(i)?(e="]",i++):(e=null,0===o&&a('"]"')),null===e&&(47===n.charCodeAt(i)?(e="/",i++):(e=null,0===o&&a('"/"')),null===e&&(58===n.charCodeAt(i)?(e=":",i++):(e=null,0===o&&a('":"')),null===e&&(38===n.charCodeAt(i)?(e="&",i++):(e=null,0===o&&a('"&"')),null===e&&(43===n.charCodeAt(i)?(e="+",i++):(e=null,0===o&&a('"+"')),null===e&&(36===n.charCodeAt(i)?(e="$",i++):(e=null,0===o&&a('"$"')))))))),e}function ke(){var e,t,r,s,l,u,c;if(u=i,63===n.charCodeAt(i)?(e="?",i++):(e=null,0===o&&a('"?"')),null!==e)if(null!==(t=Ue())){for(r=[],c=i,38===n.charCodeAt(i)?(s="&",i++):(s=null,0===o&&a('"&"')),null!==s&&null!==(l=Ue())?s=[s,l]:(s=null,i=c);null!==s;)r.push(s),c=i,38===n.charCodeAt(i)?(s="&",i++):(s=null,0===o&&a('"&"')),null!==s&&null!==(l=Ue())?s=[s,l]:(s=null,i=c);null!==r?e=[e,t,r]:(e=null,i=u)}else e=null,i=u;else e=null,i=u;return e}function Ue(){var e,t,r,s,l,u,c;return s=i,l=i,null!==(e=De())?(61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null!==t&&null!==(r=Pe())?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(u=e[0],c=e[2],u=u.join("").toLowerCase(),c=c.join(""),jn.uri_headers||(jn.uri_headers={}),e=void(jn.uri_headers[u]?jn.uri_headers[u].push(c):jn.uri_headers[u]=[c])),null===e&&(i=s),e}function De(){var e,t;if(null===(t=xe())&&null===(t=C())&&(t=E()),null!==t)for(e=[];null!==t;)e.push(t),null===(t=xe())&&null===(t=C())&&(t=E());else e=null;return e}function Pe(){var e,t;for(e=[],null===(t=xe())&&null===(t=C())&&(t=E());null!==t;)e.push(t),null===(t=xe())&&null===(t=C())&&(t=E());return e}function xe(){var e;return 91===n.charCodeAt(i)?(e="[",i++):(e=null,0===o&&a('"["')),null===e&&(93===n.charCodeAt(i)?(e="]",i++):(e=null,0===o&&a('"]"')),null===e&&(47===n.charCodeAt(i)?(e="/",i++):(e=null,0===o&&a('"/"')),null===e&&(63===n.charCodeAt(i)?(e="?",i++):(e=null,0===o&&a('"?"')),null===e&&(58===n.charCodeAt(i)?(e=":",i++):(e=null,0===o&&a('":"')),null===e&&(43===n.charCodeAt(i)?(e="+",i++):(e=null,0===o&&a('"+"')),null===e&&(36===n.charCodeAt(i)?(e="$",i++):(e=null,0===o&&a('"$"')))))))),e}function Me(){var e,t,n,r,s,o;return o=i,null!==(e=ct())&&null!==(t=v())&&null!==(n=qe())&&null!==(r=v())&&null!==(s=et())?e=[e,t,n,r,s]:(e=null,i=o),e}function qe(){var e;return null===(e=Q())&&(e=Le()),e}function Le(){var e,t,r,s;return s=i,null!==(e=Je())?(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null!==t?(null===(r=He())&&(r=Ge()),null!==r?e=[e,t,r]:(e=null,i=s)):(e=null,i=s)):(e=null,i=s),e}function He(){var e,t,r,s,l;return s=i,null===(e=Fe())&&(e=je()),null!==e?(l=i,63===n.charCodeAt(i)?(t="?",i++):(t=null,0===o&&a('"?"')),null!==t&&null!==(r=Ze())?t=[t,r]:(t=null,i=l),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=s)):(e=null,i=s),e}function Fe(){var e,t,r,s;return s=i,"//"===n.substr(i,2)?(e="//",i+=2):(e=null,0===o&&a('"//"')),null!==e&&null!==(t=$e())&&null!==(r=null!==(r=je())?r:"")?e=[e,t,r]:(e=null,i=s),e}function je(){var e,t,r;return r=i,47===n.charCodeAt(i)?(e="/",i++):(e=null,0===o&&a('"/"')),null!==e&&null!==(t=Be())?e=[e,t]:(e=null,i=r),e}function Ge(){var e,t,n,r;if(r=i,null!==(e=Ve())){for(t=[],n=We();null!==n;)t.push(n),n=We();null!==t?e=[e,t]:(e=null,i=r)}else e=null,i=r;return e}function We(){var e;return null===(e=T())&&null===(e=C())&&(e=E()),e}function Ve(){var e;return null===(e=C())&&null===(e=E())&&(59===n.charCodeAt(i)?(e=";",i++):(e=null,0===o&&a('";"')),null===e&&(63===n.charCodeAt(i)?(e="?",i++):(e=null,0===o&&a('"?"')),null===e&&(58===n.charCodeAt(i)?(e=":",i++):(e=null,0===o&&a('":"')),null===e&&(64===n.charCodeAt(i)?(e="@",i++):(e=null,0===o&&a('"@"')),null===e&&(38===n.charCodeAt(i)?(e="&",i++):(e=null,0===o&&a('"&"')),null===e&&(61===n.charCodeAt(i)?(e="=",i++):(e=null,0===o&&a('"="')),null===e&&(43===n.charCodeAt(i)?(e="+",i++):(e=null,0===o&&a('"+"')),null===e&&(36===n.charCodeAt(i)?(e="$",i++):(e=null,0===o&&a('"$"')),null===e&&(44===n.charCodeAt(i)?(e=",",i++):(e=null,0===o&&a('","'))))))))))),e}function Be(){var e,t,r,s,l,u;if(l=i,null!==(e=Ke())){for(t=[],u=i,47===n.charCodeAt(i)?(r="/",i++):(r=null,0===o&&a('"/"')),null!==r&&null!==(s=Ke())?r=[r,s]:(r=null,i=u);null!==r;)t.push(r),u=i,47===n.charCodeAt(i)?(r="/",i++):(r=null,0===o&&a('"/"')),null!==r&&null!==(s=Ke())?r=[r,s]:(r=null,i=u);null!==t?e=[e,t]:(e=null,i=l)}else e=null,i=l;return e}function Ke(){var e,t,r,s,l,u;for(l=i,e=[],t=ze();null!==t;)e.push(t),t=ze();if(null!==e){for(t=[],u=i,59===n.charCodeAt(i)?(r=";",i++):(r=null,0===o&&a('";"')),null!==r&&null!==(s=Ye())?r=[r,s]:(r=null,i=u);null!==r;)t.push(r),u=i,59===n.charCodeAt(i)?(r=";",i++):(r=null,0===o&&a('";"')),null!==r&&null!==(s=Ye())?r=[r,s]:(r=null,i=u);null!==t?e=[e,t]:(e=null,i=l)}else e=null,i=l;return e}function Ye(){var e,t;for(e=[],t=ze();null!==t;)e.push(t),t=ze();return e}function ze(){var e;return null===(e=C())&&null===(e=E())&&(58===n.charCodeAt(i)?(e=":",i++):(e=null,0===o&&a('":"')),null===e&&(64===n.charCodeAt(i)?(e="@",i++):(e=null,0===o&&a('"@"')),null===e&&(38===n.charCodeAt(i)?(e="&",i++):(e=null,0===o&&a('"&"')),null===e&&(61===n.charCodeAt(i)?(e="=",i++):(e=null,0===o&&a('"="')),null===e&&(43===n.charCodeAt(i)?(e="+",i++):(e=null,0===o&&a('"+"')),null===e&&(36===n.charCodeAt(i)?(e="$",i++):(e=null,0===o&&a('"$"')),null===e&&(44===n.charCodeAt(i)?(e=",",i++):(e=null,0===o&&a('","'))))))))),e}function Je(){var e,t,r,s,l,u;if(s=i,l=i,null!==(e=f())){for(t=[],null===(r=f())&&null===(r=h())&&(43===n.charCodeAt(i)?(r="+",i++):(r=null,0===o&&a('"+"')),null===r&&(45===n.charCodeAt(i)?(r="-",i++):(r=null,0===o&&a('"-"')),null===r&&(46===n.charCodeAt(i)?(r=".",i++):(r=null,0===o&&a('"."')))));null!==r;)t.push(r),null===(r=f())&&null===(r=h())&&(43===n.charCodeAt(i)?(r="+",i++):(r=null,0===o&&a('"+"')),null===r&&(45===n.charCodeAt(i)?(r="-",i++):(r=null,0===o&&a('"-"')),null===r&&(46===n.charCodeAt(i)?(r=".",i++):(r=null,0===o&&a('"."')))));null!==t?e=[e,t]:(e=null,i=l)}else e=null,i=l;return null!==e&&(u=s,e=void(jn.scheme=n.substring(i,u))),null===e&&(i=s),e}function $e(){var e;return null===(e=Xe())&&(e=Qe()),e}function Xe(){var e,t,r,s;return r=i,s=i,null!==(e=ne())?(64===n.charCodeAt(i)?(t="@",i++):(t=null,0===o&&a('"@"')),null!==t?e=[e,t]:(e=null,i=s)):(e=null,i=s),null!==(e=null!==e?e:"")&&null!==(t=oe())?e=[e,t]:(e=null,i=r),e=null!==e?e:""}function Qe(){var e,t;if(null===(t=C())&&null===(t=E())&&(36===n.charCodeAt(i)?(t="$",i++):(t=null,0===o&&a('"$"')),null===t&&(44===n.charCodeAt(i)?(t=",",i++):(t=null,0===o&&a('","')),null===t&&(59===n.charCodeAt(i)?(t=";",i++):(t=null,0===o&&a('";"')),null===t&&(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null===t&&(64===n.charCodeAt(i)?(t="@",i++):(t=null,0===o&&a('"@"')),null===t&&(38===n.charCodeAt(i)?(t="&",i++):(t=null,0===o&&a('"&"')),null===t&&(61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"')))))))))),null!==t)for(e=[];null!==t;)e.push(t),null===(t=C())&&null===(t=E())&&(36===n.charCodeAt(i)?(t="$",i++):(t=null,0===o&&a('"$"')),null===t&&(44===n.charCodeAt(i)?(t=",",i++):(t=null,0===o&&a('","')),null===t&&(59===n.charCodeAt(i)?(t=";",i++):(t=null,0===o&&a('";"')),null===t&&(58===n.charCodeAt(i)?(t=":",i++):(t=null,0===o&&a('":"')),null===t&&(64===n.charCodeAt(i)?(t="@",i++):(t=null,0===o&&a('"@"')),null===t&&(38===n.charCodeAt(i)?(t="&",i++):(t=null,0===o&&a('"&"')),null===t&&(61===n.charCodeAt(i)?(t="=",i++):(t=null,0===o&&a('"="')),null===t&&(43===n.charCodeAt(i)?(t="+",i++):(t=null,0===o&&a('"+"'))))))))));else e=null;return e}function Ze(){var e,t;for(e=[],t=We();null!==t;)e.push(t),t=We();return e}function et(){var e,t,r,s,l,u,c,f,d;if(c=i,f=i,"sip"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"SIP"')),null!==e)if(47===n.charCodeAt(i)?(t="/",i++):(t=null,0===o&&a('"/"')),null!==t){if(null!==(s=h()))for(r=[];null!==s;)r.push(s),s=h();else r=null;if(null!==r)if(46===n.charCodeAt(i)?(s=".",i++):(s=null,0===o&&a('"."')),null!==s){if(null!==(u=h()))for(l=[];null!==u;)l.push(u),u=h();else l=null;null!==l?e=[e,t,r,s,l]:(e=null,i=f)}else e=null,i=f;else e=null,i=f}else e=null,i=f;else e=null,i=f;return null!==e&&(d=c,e=void(jn.sip_version=n.substring(i,d))),null===e&&(i=c),e}function tt(){var e;return"INVITE"===n.substr(i,6)?(e="INVITE",i+=6):(e=null,0===o&&a('"INVITE"')),e}function nt(){var e;return"ACK"===n.substr(i,3)?(e="ACK",i+=3):(e=null,0===o&&a('"ACK"')),e}function rt(){var e;return"OPTIONS"===n.substr(i,7)?(e="OPTIONS",i+=7):(e=null,0===o&&a('"OPTIONS"')),e}function st(){var e;return"BYE"===n.substr(i,3)?(e="BYE",i+=3):(e=null,0===o&&a('"BYE"')),e}function it(){var e;return"CANCEL"===n.substr(i,6)?(e="CANCEL",i+=6):(e=null,0===o&&a('"CANCEL"')),e}function ot(){var e;return"REGISTER"===n.substr(i,8)?(e="REGISTER",i+=8):(e=null,0===o&&a('"REGISTER"')),e}function lt(){var e;return"SUBSCRIBE"===n.substr(i,9)?(e="SUBSCRIBE",i+=9):(e=null,0===o&&a('"SUBSCRIBE"')),e}function ut(){var e;return"NOTIFY"===n.substr(i,6)?(e="NOTIFY",i+=6):(e=null,0===o&&a('"NOTIFY"')),e}function at(){var e;return"REFER"===n.substr(i,5)?(e="REFER",i+=5):(e=null,0===o&&a('"REFER"')),e}function ct(){var e,t,r;return t=i,null===(e=tt())&&null===(e=nt())&&null===(e=rt())&&null===(e=st())&&null===(e=it())&&null===(e=ot())&&null===(e=lt())&&null===(e=ut())&&null===(e=at())&&(e=k()),null!==e&&(r=t,jn.method=n.substring(i,r),e=jn.method),null===e&&(i=t),e}function ht(){var e,t,n,r,s,o;return o=i,null!==(e=et())&&null!==(t=v())&&null!==(n=ft())&&null!==(r=v())&&null!==(s=_t())?e=[e,t,n,r,s]:(e=null,i=o),e}function ft(){var e,t,n;return t=i,null!==(e=dt())&&(n=e,e=void(jn.status_code=parseInt(n.join("")))),null===e&&(i=t),e}function dt(){var e,t,n,r;return r=i,null!==(e=h())&&null!==(t=h())&&null!==(n=h())?e=[e,t,n]:(e=null,i=r),e}function _t(){var e,t,r,s;for(r=i,e=[],null===(t=T())&&null===(t=C())&&null===(t=E())&&null===(t=O())&&null===(t=N())&&null===(t=v())&&(t=g());null!==t;)e.push(t),null===(t=T())&&null===(t=C())&&null===(t=E())&&null===(t=O())&&null===(t=N())&&null===(t=v())&&(t=g());return null!==e&&(s=r,e=void(jn.reason_phrase=n.substring(i,s))),null===e&&(i=r),e}function pt(){var e,t,n,r,s,o,l;if(s=i,o=i,null===(e=X())&&(e=mt()),null!==e){for(t=[],l=i,null!==(n=G())&&null!==(r=gt())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=G())&&null!==(r=gt())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;return null!==e&&(e=function(e){var t;jn.multi_header||(jn.multi_header=[]);try{t=new Fn(jn.uri,jn.display_name,jn.params),delete jn.uri,delete jn.display_name,delete jn.params}catch(e){t=null}jn.multi_header.push({possition:i,offset:e,parsed:t})}(s)),null===e&&(i=s),e}function mt(){var e,t,n,r,s;return s=i,null!==(e=null!==(e=vt())?e:"")&&null!==(t=F())&&null!==(n=Q())&&null!==(r=H())?e=[e,t,n,r]:(e=null,i=s),e}function vt(){var e,t,n,r,s,o,l,u;if(s=i,o=i,null!==(e=k())){for(t=[],l=i,null!==(n=A())&&null!==(r=k())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=A())&&null!==(r=k())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;return null===e&&(e=z()),null!==e&&(u=e,e=void(jn.display_name="string"==typeof u?u:u[1].reduce(function(e,t){return e+t[0]+t[1]},u[0]))),null===e&&(i=s),e}function gt(){var e;return null===(e=yt())&&null===(e=Tt())&&(e=Et()),e}function yt(){var e,t,r,s,l,u;return s=i,l=i,"q"===n.substr(i,1).toLowerCase()?(e=n.substr(i,1),i++):(e=null,0===o&&a('"q"')),null!==e&&null!==(t=M())&&null!==(r=St())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],jn.params||(jn.params={}),e=void(jn.params.q=u)),null===e&&(i=s),e}function Tt(){var e,t,r,s,l,u;return s=i,l=i,"expires"===n.substr(i,7).toLowerCase()?(e=n.substr(i,7),i+=7):(e=null,0===o&&a('"expires"')),null!==e&&null!==(t=M())&&null!==(r=Ct())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],jn.params||(jn.params={}),e=void(jn.params.expires=u)),null===e&&(i=s),e}function Ct(){var e,t,n;if(n=i,null!==(t=h()))for(e=[];null!==t;)e.push(t),t=h();else e=null;return null!==e&&(e=parseInt(e.join(""))),null===e&&(i=n),e}function St(){var e,t,r,s,l,u,c,f,d;return u=i,c=i,48===n.charCodeAt(i)?(e="0",i++):(e=null,0===o&&a('"0"')),null!==e?(f=i,46===n.charCodeAt(i)?(t=".",i++):(t=null,0===o&&a('"."')),null!==t&&null!==(r=null!==(r=h())?r:"")&&null!==(s=null!==(s=h())?s:"")&&null!==(l=null!==(l=h())?l:"")?t=[t,r,s,l]:(t=null,i=f),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=c)):(e=null,i=c),null!==e&&(d=u,e=parseFloat(n.substring(i,d))),null===e&&(i=u),e}function Et(){var e,t,n,r,s,o,l,u;return r=i,s=i,null!==(e=k())?(o=i,null!==(t=M())&&null!==(n=At())?t=[t,n]:(t=null,i=o),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=s)):(e=null,i=s),null!==e&&(l=e[0],u=e[1],jn.params||(jn.params={}),u=void 0===u?void 0:u[1],e=void(jn.params[l.toLowerCase()]=u)),null===e&&(i=r),e}function At(){var e;return null===(e=k())&&null===(e=le())&&(e=Y()),e}function bt(){var e;return"render"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"render"')),null===e&&("session"===n.substr(i,7).toLowerCase()?(e=n.substr(i,7),i+=7):(e=null,0===o&&a('"session"')),null===e&&("icon"===n.substr(i,4).toLowerCase()?(e=n.substr(i,4),i+=4):(e=null,0===o&&a('"icon"')),null===e&&("alert"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"alert"')),null===e&&(e=k())))),e}function Rt(){var e;return null===(e=wt())&&(e=Et()),e}function wt(){var e,t,r,s;return s=i,"handling"===n.substr(i,8).toLowerCase()?(e=n.substr(i,8),i+=8):(e=null,0===o&&a('"handling"')),null!==e&&null!==(t=M())?("optional"===n.substr(i,8).toLowerCase()?(r=n.substr(i,8),i+=8):(r=null,0===o&&a('"optional"')),null===r&&("required"===n.substr(i,8).toLowerCase()?(r=n.substr(i,8),i+=8):(r=null,0===o&&a('"required"')),null===r&&(r=k())),null!==r?e=[e,t,r]:(e=null,i=s)):(e=null,i=s),e}function It(){var e,t,n,r,s,o,l,u;if(l=i,null!==(e=Ot()))if(null!==(t=x()))if(null!==(n=Pt())){for(r=[],u=i,null!==(s=G())&&null!==(o=xt())?s=[s,o]:(s=null,i=u);null!==s;)r.push(s),u=i,null!==(s=G())&&null!==(o=xt())?s=[s,o]:(s=null,i=u);null!==r?e=[e,t,n,r]:(e=null,i=l)}else e=null,i=l;else e=null,i=l;else e=null,i=l;return e}function Ot(){var e;return null===(e=Nt())&&(e=kt()),e}function Nt(){var e;return"text"===n.substr(i,4).toLowerCase()?(e=n.substr(i,4),i+=4):(e=null,0===o&&a('"text"')),null===e&&("image"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"image"')),null===e&&("audio"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"audio"')),null===e&&("video"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"video"')),null===e&&("application"===n.substr(i,11).toLowerCase()?(e=n.substr(i,11),i+=11):(e=null,0===o&&a('"application"')),null===e&&(e=Ut()))))),e}function kt(){var e;return"message"===n.substr(i,7).toLowerCase()?(e=n.substr(i,7),i+=7):(e=null,0===o&&a('"message"')),null===e&&("multipart"===n.substr(i,9).toLowerCase()?(e=n.substr(i,9),i+=9):(e=null,0===o&&a('"multipart"')),null===e&&(e=Ut())),e}function Ut(){var e;return null===(e=k())&&(e=Dt()),e}function Dt(){var e,t,r;return r=i,"x-"===n.substr(i,2).toLowerCase()?(e=n.substr(i,2),i+=2):(e=null,0===o&&a('"x-"')),null!==e&&null!==(t=k())?e=[e,t]:(e=null,i=r),e}function Pt(){var e;return null===(e=Ut())&&(e=k()),e}function xt(){var e,t,n,r;return r=i,null!==(e=k())&&null!==(t=M())&&null!==(n=Mt())?e=[e,t,n]:(e=null,i=r),e}function Mt(){var e;return null===(e=k())&&(e=Y()),e}function qt(){var e,t,n,r;if(n=i,null!==(t=h()))for(e=[];null!==t;)e.push(t),t=h();else e=null;return null!==e&&(r=e,e=void(jn.value=parseInt(r.join("")))),null===e&&(i=n),e}function Lt(){var e,t,r,s,l,u;if(l=i,null!==(e=U())){for(t=[],u=i,46===n.charCodeAt(i)?(r=".",i++):(r=null,0===o&&a('"."')),null!==r&&null!==(s=U())?r=[r,s]:(r=null,i=u);null!==r;)t.push(r),u=i,46===n.charCodeAt(i)?(r=".",i++):(r=null,0===o&&a('"."')),null!==r&&null!==(s=U())?r=[r,s]:(r=null,i=u);null!==t?e=[e,t]:(e=null,i=l)}else e=null,i=l;return e}function Ht(){var e;return null===(e=Ft())&&(e=Et()),e}function Ft(){var e,t,r,s,l,u;return s=i,l=i,"tag"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"tag"')),null!==e&&null!==(t=M())&&null!==(r=k())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],e=void(jn.tag=u)),null===e&&(i=s),e}function jt(){var e,t,r,s,l,u,c,h;if(c=i,"digest"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"Digest"')),null!==e)if(null!==(t=A()))if(null!==(r=Vt())){for(s=[],h=i,null!==(l=j())&&null!==(u=Vt())?l=[l,u]:(l=null,i=h);null!==l;)s.push(l),h=i,null!==(l=j())&&null!==(u=Vt())?l=[l,u]:(l=null,i=h);null!==s?e=[e,t,r,s]:(e=null,i=c)}else e=null,i=c;else e=null,i=c;else e=null,i=c;return null===e&&(e=Gt()),e}function Gt(){var e,t,n,r,s,o,l,u;if(l=i,null!==(e=k()))if(null!==(t=A()))if(null!==(n=Wt())){for(r=[],u=i,null!==(s=j())&&null!==(o=Wt())?s=[s,o]:(s=null,i=u);null!==s;)r.push(s),u=i,null!==(s=j())&&null!==(o=Wt())?s=[s,o]:(s=null,i=u);null!==r?e=[e,t,n,r]:(e=null,i=l)}else e=null,i=l;else e=null,i=l;else e=null,i=l;return e}function Wt(){var e,t,n,r;return r=i,null!==(e=k())&&null!==(t=M())?(null===(n=k())&&(n=Y()),null!==n?e=[e,t,n]:(e=null,i=r)):(e=null,i=r),e}function Vt(){var e;return null===(e=Bt())&&null===(e=Yt())&&null===(e=Jt())&&null===(e=Xt())&&null===(e=Qt())&&null===(e=Zt())&&null===(e=en())&&(e=Wt()),e}function Bt(){var e,t,r,s;return s=i,"realm"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"realm"')),null!==e&&null!==(t=M())&&null!==(r=Kt())?e=[e,t,r]:(e=null,i=s),e}function Kt(){var e,t,n;return t=i,null!==(e=z())&&(n=e,e=void(jn.realm=n)),null===e&&(i=t),e}function Yt(){var e,t,r,s,l,u,c,h,f;if(h=i,"domain"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"domain"')),null!==e)if(null!==(t=M()))if(null!==(r=V()))if(null!==(s=zt())){if(l=[],f=i,null!==(c=v()))for(u=[];null!==c;)u.push(c),c=v();else u=null;for(null!==u&&null!==(c=zt())?u=[u,c]:(u=null,i=f);null!==u;){if(l.push(u),f=i,null!==(c=v()))for(u=[];null!==c;)u.push(c),c=v();else u=null;null!==u&&null!==(c=zt())?u=[u,c]:(u=null,i=f)}null!==l&&null!==(u=B())?e=[e,t,r,s,l,u]:(e=null,i=h)}else e=null,i=h;else e=null,i=h;else e=null,i=h;else e=null,i=h;return e}function zt(){var e;return null===(e=Le())&&(e=je()),e}function Jt(){var e,t,r,s;return s=i,"nonce"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"nonce"')),null!==e&&null!==(t=M())&&null!==(r=$t())?e=[e,t,r]:(e=null,i=s),e}function $t(){var e,t,n;return t=i,null!==(e=z())&&(n=e,e=void(jn.nonce=n)),null===e&&(i=t),e}function Xt(){var e,t,r,s,l,u;return s=i,l=i,"opaque"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"opaque"')),null!==e&&null!==(t=M())&&null!==(r=z())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],e=void(jn.opaque=u)),null===e&&(i=s),e}function Qt(){var e,t,r,s,l;return s=i,"stale"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"stale"')),null!==e&&null!==(t=M())?(l=i,"true"===n.substr(i,4).toLowerCase()?(r=n.substr(i,4),i+=4):(r=null,0===o&&a('"true"')),null!==r&&(r=void(jn.stale=!0)),null===r&&(i=l),null===r&&(l=i,"false"===n.substr(i,5).toLowerCase()?(r=n.substr(i,5),i+=5):(r=null,0===o&&a('"false"')),null!==r&&(r=void(jn.stale=!1)),null===r&&(i=l)),null!==r?e=[e,t,r]:(e=null,i=s)):(e=null,i=s),e}function Zt(){var e,t,r,s,l,u;return s=i,l=i,"algorithm"===n.substr(i,9).toLowerCase()?(e=n.substr(i,9),i+=9):(e=null,0===o&&a('"algorithm"')),null!==e&&null!==(t=M())?("md5"===n.substr(i,3).toLowerCase()?(r=n.substr(i,3),i+=3):(r=null,0===o&&a('"MD5"')),null===r&&("md5-sess"===n.substr(i,8).toLowerCase()?(r=n.substr(i,8),i+=8):(r=null,0===o&&a('"MD5-sess"')),null===r&&(r=k())),null!==r?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(u=e[2],e=void(jn.algorithm=u.toUpperCase())),null===e&&(i=s),e}function en(){var e,t,r,s,l,u,c,h,f,d;if(h=i,"qop"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"qop"')),null!==e)if(null!==(t=M()))if(null!==(r=V())){if(f=i,null!==(s=tn())){for(l=[],d=i,44===n.charCodeAt(i)?(u=",",i++):(u=null,0===o&&a('","')),null!==u&&null!==(c=tn())?u=[u,c]:(u=null,i=d);null!==u;)l.push(u),d=i,44===n.charCodeAt(i)?(u=",",i++):(u=null,0===o&&a('","')),null!==u&&null!==(c=tn())?u=[u,c]:(u=null,i=d);null!==l?s=[s,l]:(s=null,i=f)}else s=null,i=f;null!==s&&null!==(l=B())?e=[e,t,r,s,l]:(e=null,i=h)}else e=null,i=h;else e=null,i=h;else e=null,i=h;return e}function tn(){var e,t,r;return t=i,"auth-int"===n.substr(i,8).toLowerCase()?(e=n.substr(i,8),i+=8):(e=null,0===o&&a('"auth-int"')),null===e&&("auth"===n.substr(i,4).toLowerCase()?(e=n.substr(i,4),i+=4):(e=null,0===o&&a('"auth"')),null===e&&(e=k())),null!==e&&(r=e,jn.qop||(jn.qop=[]),e=void jn.qop.push(r.toLowerCase())),null===e&&(i=t),e}function nn(){var e,t,n,r,s,o,l;if(s=i,o=i,null!==(e=mt())){for(t=[],l=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=l);null!==n;)t.push(n),l=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=l);null!==t?e=[e,t]:(e=null,i=o)}else e=null,i=o;return null!==e&&(e=function(e){var t;jn.multi_header||(jn.multi_header=[]);try{t=new Fn(jn.uri,jn.display_name,jn.params),delete jn.uri,delete jn.display_name,delete jn.params}catch(e){t=null}jn.multi_header.push({possition:i,offset:e,parsed:t})}(s)),null===e&&(i=s),e}function rn(){var e;return null===(e=sn())&&(e=Et()),e}function sn(){var e,t,r,s,l,u,c;if(l=i,u=i,"cause"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"cause"')),null!==e)if(null!==(t=M())){if(null!==(s=h()))for(r=[];null!==s;)r.push(s),s=h();else r=null;null!==r?e=[e,t,r]:(e=null,i=u)}else e=null,i=u;else e=null,i=u;return null!==e&&(c=e[2],e=void(jn.cause=parseInt(c.join("")))),null===e&&(i=l),e}function on(){var e,t,n,r,s,o;if(s=i,null!==(e=mt())){for(t=[],o=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=o);null!==n;)t.push(n),o=i,null!==(n=G())&&null!==(r=Et())?n=[n,r]:(n=null,i=o);null!==t?e=[e,t]:(e=null,i=s)}else e=null,i=s;return e}function ln(){var e,t,r;return t=i,"active"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"active"')),null===e&&("pending"===n.substr(i,7).toLowerCase()?(e=n.substr(i,7),i+=7):(e=null,0===o&&a('"pending"')),null===e&&("terminated"===n.substr(i,10).toLowerCase()?(e=n.substr(i,10),i+=10):(e=null,0===o&&a('"terminated"')),null===e&&(e=k()))),null!==e&&(r=t,e=void(jn.state=n.substring(i,r))),null===e&&(i=t),e}function un(){var e,t,r,s,l,u,c,h;return s=i,l=i,"reason"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"reason"')),null!==e&&null!==(t=M())&&null!==(r=an())?e=[e,t,r]:(e=null,i=l),null!==e&&(e=void(void 0!==(u=e[2])&&(jn.reason=u))),null===e&&(i=s),null===e&&(s=i,l=i,"expires"===n.substr(i,7).toLowerCase()?(e=n.substr(i,7),i+=7):(e=null,0===o&&a('"expires"')),null!==e&&null!==(t=M())&&null!==(r=Ct())?e=[e,t,r]:(e=null,i=l),null!==e&&(e=void(void 0!==(h=e[2])&&(jn.expires=h))),null===e&&(i=s),null===e&&(s=i,l=i,"retry_after"===n.substr(i,11).toLowerCase()?(e=n.substr(i,11),i+=11):(e=null,0===o&&a('"retry_after"')),null!==e&&null!==(t=M())&&null!==(r=Ct())?e=[e,t,r]:(e=null,i=l),null!==e&&(e=void(void 0!==(c=e[2])&&(jn.retry_after=c))),null===e&&(i=s),null===e&&(e=Et()))),e}function an(){var e;return"deactivated"===n.substr(i,11).toLowerCase()?(e=n.substr(i,11),i+=11):(e=null,0===o&&a('"deactivated"')),null===e&&("probation"===n.substr(i,9).toLowerCase()?(e=n.substr(i,9),i+=9):(e=null,0===o&&a('"probation"')),null===e&&("rejected"===n.substr(i,8).toLowerCase()?(e=n.substr(i,8),i+=8):(e=null,0===o&&a('"rejected"')),null===e&&("timeout"===n.substr(i,7).toLowerCase()?(e=n.substr(i,7),i+=7):(e=null,0===o&&a('"timeout"')),null===e&&("giveup"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"giveup"')),null===e&&("noresource"===n.substr(i,10).toLowerCase()?(e=n.substr(i,10),i+=10):(e=null,0===o&&a('"noresource"')),null===e&&("invariant"===n.substr(i,9).toLowerCase()?(e=n.substr(i,9),i+=9):(e=null,0===o&&a('"invariant"')),null===e&&(e=k()))))))),e}function cn(){var e;return null===(e=Ft())&&(e=Et()),e}function hn(){var e,t,n,r,s,o,l,u;if(l=i,null!==(e=yn()))if(null!==(t=A()))if(null!==(n=Sn())){for(r=[],u=i,null!==(s=G())&&null!==(o=fn())?s=[s,o]:(s=null,i=u);null!==s;)r.push(s),u=i,null!==(s=G())&&null!==(o=fn())?s=[s,o]:(s=null,i=u);null!==r?e=[e,t,n,r]:(e=null,i=l)}else e=null,i=l;else e=null,i=l;else e=null,i=l;return e}function fn(){var e;return null===(e=dn())&&null===(e=_n())&&null===(e=pn())&&null===(e=mn())&&null===(e=vn())&&(e=Et()),e}function dn(){var e,t,r,s,l,u;return s=i,l=i,"ttl"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"ttl"')),null!==e&&null!==(t=M())&&null!==(r=bn())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],e=void(jn.ttl=u)),null===e&&(i=s),e}function _n(){var e,t,r,s,l,u;return s=i,l=i,"maddr"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"maddr"')),null!==e&&null!==(t=M())&&null!==(r=le())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],e=void(jn.maddr=u)),null===e&&(i=s),e}function pn(){var e,t,r,s,l,u;return s=i,l=i,"received"===n.substr(i,8).toLowerCase()?(e=n.substr(i,8),i+=8):(e=null,0===o&&a('"received"')),null!==e&&null!==(t=M())?(null===(r=pe())&&(r=fe()),null!==r?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(u=e[2],e=void(jn.received=u)),null===e&&(i=s),e}function mn(){var e,t,r,s,l,u;return s=i,l=i,"branch"===n.substr(i,6).toLowerCase()?(e=n.substr(i,6),i+=6):(e=null,0===o&&a('"branch"')),null!==e&&null!==(t=M())&&null!==(r=k())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],e=void(jn.branch=u)),null===e&&(i=s),e}function vn(){var e,t,r,s,l;return s=i,"rport"===n.substr(i,5).toLowerCase()?(e=n.substr(i,5),i+=5):(e=null,0===o&&a('"rport"')),null!==e?(l=i,null!==(t=M())&&null!==(r=gn())?t=[t,r]:(t=null,i=l),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=s)):(e=null,i=s),e}function gn(){var e,t,n,r,s,o,l,u;return o=i,l=i,null!==(e=null!==(e=h())?e:"")&&null!==(t=null!==(t=h())?t:"")&&null!==(n=null!==(n=h())?n:"")&&null!==(r=null!==(r=h())?r:"")&&null!==(s=null!==(s=h())?s:"")?e=[e,t,n,r,s]:(e=null,i=l),null!==e&&(u=e,e=void(jn.rport=parseInt(u.join("")))),null===e&&(i=o),e}function yn(){var e,t,n,r,s,o;return o=i,null!==(e=Tn())&&null!==(t=x())&&null!==(n=k())&&null!==(r=x())&&null!==(s=Cn())?e=[e,t,n,r,s]:(e=null,i=o),e}function Tn(){var e,t,r;return t=i,"sip"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"SIP"')),null===e&&(e=k()),null!==e&&(r=e,e=void(jn.protocol=r)),null===e&&(i=t),e}function Cn(){var e,t,r;return t=i,"udp"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"UDP"')),null===e&&("tcp"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"TCP"')),null===e&&("tls"===n.substr(i,3).toLowerCase()?(e=n.substr(i,3),i+=3):(e=null,0===o&&a('"TLS"')),null===e&&("sctp"===n.substr(i,4).toLowerCase()?(e=n.substr(i,4),i+=4):(e=null,0===o&&a('"SCTP"')),null===e&&(e=k())))),null!==e&&(r=e,e=void(jn.transport=r)),null===e&&(i=t),e}function Sn(){var e,t,n,r,s;return r=i,null!==(e=En())?(s=i,null!==(t=W())&&null!==(n=An())?t=[t,n]:(t=null,i=s),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=r)):(e=null,i=r),e}function En(){var e,t,r;return t=i,null===(e=pe())&&null===(e=he())&&(e=ue()),null!==e&&(r=t,e=void(jn.host=n.substring(i,r))),null===e&&(i=t),e}function An(){var e,t,n,r,s,o,l,u;return o=i,l=i,null!==(e=null!==(e=h())?e:"")&&null!==(t=null!==(t=h())?t:"")&&null!==(n=null!==(n=h())?n:"")&&null!==(r=null!==(r=h())?r:"")&&null!==(s=null!==(s=h())?s:"")?e=[e,t,n,r,s]:(e=null,i=l),null!==e&&(u=e,e=void(jn.port=parseInt(u.join("")))),null===e&&(i=o),e}function bn(){var e,t,n,r,s;return r=i,s=i,null!==(e=h())&&null!==(t=null!==(t=h())?t:"")&&null!==(n=null!==(n=h())?n:"")?e=[e,t,n]:(e=null,i=s),null!==e&&(e=parseInt(e.join(""))),null===e&&(i=r),e}function Rn(){var e,t,n;return t=i,null!==(e=Ct())&&(n=e,e=void(jn.expires=n)),null===e&&(i=t),e}function wn(){var e;return null===(e=In())&&(e=Et()),e}function In(){var e,t,r,s,l,u;return s=i,l=i,"refresher"===n.substr(i,9).toLowerCase()?(e=n.substr(i,9),i+=9):(e=null,0===o&&a('"refresher"')),null!==e&&null!==(t=M())?("uac"===n.substr(i,3).toLowerCase()?(r=n.substr(i,3),i+=3):(r=null,0===o&&a('"uac"')),null===r&&("uas"===n.substr(i,3).toLowerCase()?(r=n.substr(i,3),i+=3):(r=null,0===o&&a('"uas"'))),null!==r?e=[e,t,r]:(e=null,i=l)):(e=null,i=l),null!==e&&(u=e[2],e=void(jn.refresher=u.toLowerCase())),null===e&&(i=s),e}function On(){var e,t;for(e=[],null===(t=I())&&null===(t=N())&&(t=A());null!==t;)e.push(t),null===(t=I())&&null===(t=N())&&(t=A());return e}function Nn(){var e,t,r,s,l,u,c,h,f,d,_,p;return d=i,_=i,null!==(e=Un())?(45===n.charCodeAt(i)?(t="-",i++):(t=null,0===o&&a('"-"')),null!==t&&null!==(r=kn())?(45===n.charCodeAt(i)?(s="-",i++):(s=null,0===o&&a('"-"')),null!==s&&null!==(l=kn())?(45===n.charCodeAt(i)?(u="-",i++):(u=null,0===o&&a('"-"')),null!==u&&null!==(c=kn())?(45===n.charCodeAt(i)?(h="-",i++):(h=null,0===o&&a('"-"')),null!==h&&null!==(f=Dn())?e=[e,t,r,s,l,u,c,h,f]:(e=null,i=_)):(e=null,i=_)):(e=null,i=_)):(e=null,i=_)):(e=null,i=_),null!==e&&(p=d,e[0],e=void(jn=n.substring(i+5,p))),null===e&&(i=d),e}function kn(){var e,t,n,r,s;return s=i,null!==(e=d())&&null!==(t=d())&&null!==(n=d())&&null!==(r=d())?e=[e,t,n,r]:(e=null,i=s),e}function Un(){var e,t,n;return n=i,null!==(e=kn())&&null!==(t=kn())?e=[e,t]:(e=null,i=n),e}function Dn(){var e,t,n,r;return r=i,null!==(e=kn())&&null!==(t=kn())&&null!==(n=kn())?e=[e,t,n]:(e=null,i=r),e}function Pn(){var e,t,r,s,l,u,c;return s=i,l=i,null!==(e=D())?(u=i,64===n.charCodeAt(i)?(t="@",i++):(t=null,0===o&&a('"@"')),null!==t&&null!==(r=D())?t=[t,r]:(t=null,i=u),null!==(t=null!==t?t:"")?e=[e,t]:(e=null,i=l)):(e=null,i=l),null!==e&&(c=s,e=void(jn.call_id=n.substring(i,c))),null===e&&(i=s),e}function xn(){var e;return null===(e=Mn())&&null===(e=qn())&&null===(e=Ln())&&(e=Et()),e}function Mn(){var e,t,r,s,l,u;return s=i,l=i,"to-tag"===n.substr(i,6)?(e="to-tag",i+=6):(e=null,0===o&&a('"to-tag"')),null!==e&&null!==(t=M())&&null!==(r=k())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],e=void(jn.to_tag=u)),null===e&&(i=s),e}function qn(){var e,t,r,s,l,u;return s=i,l=i,"from-tag"===n.substr(i,8)?(e="from-tag",i+=8):(e=null,0===o&&a('"from-tag"')),null!==e&&null!==(t=M())&&null!==(r=k())?e=[e,t,r]:(e=null,i=l),null!==e&&(u=e[2],e=void(jn.from_tag=u)),null===e&&(i=s),e}function Ln(){var e,t;return t=i,"early-only"===n.substr(i,10)?(e="early-only",i+=10):(e=null,0===o&&a('"early-only"')),null!==e&&(e=void(jn.early_only=!0)),null===e&&(i=t),e}var Hn=e("./URI"),Fn=e("./NameAddrHeader"),jn={};if(null===s[r]()||i!==n.length){var Gn=Math.max(i,l),Wn=Gn<n.length?n.charAt(Gn):null,Vn=function(){for(var e=1,t=1,r=!1,s=0;s<Math.max(i,l);s++){var o=n.charAt(s);"\n"===o?(r||e++,t=1,r=!1):"\r"===o||"\u2028"===o||"\u2029"===o?(e++,t=1,r=!0):(t++,r=!1)}return{line:e,column:t}}();return new this.SyntaxError(function(e){e.sort();for(var t=null,n=[],r=0;r<e.length;r++)e[r]!==t&&(n.push(e[r]),t=e[r]);return n}(u),Wn,Gn,Vn.line,Vn.column),-1}return jn},toSource:function(){return this._source},SyntaxError:function(e,n,r,s,i){this.name="SyntaxError",this.expected=e,this.found=n,this.message=function(e,n){var r;switch(e.length){case 0:r="end of input";break;case 1:r=e[0];break;default:r=e.slice(0,e.length-1).join(", ")+" or "+e[e.length-1]}return"Expected "+r+" but "+(n?t(n):"end of input")+" found."}(e,n),this.offset=r,this.line=s,this.column=i}};return n.SyntaxError.prototype=Error.prototype,n}()},{"./NameAddrHeader":10,"./URI":25}],8:[function(e,t,n){"use strict";var r=e("../package.json"),s=e("./Constants"),i=e("./Exceptions"),o=e("./Utils"),l=e("./UA"),u=e("./URI"),a=e("./NameAddrHeader"),c=e("./Grammar"),h=e("./WebSocketInterface");e("debug")("JsSIP")("version %s",r.version),t.exports={C:s,Exceptions:i,Utils:o,UA:l,URI:u,NameAddrHeader:a,WebSocketInterface:h,Grammar:c,debug:e("debug"),get name(){return r.title},get version(){return r.version}}},{"../package.json":38,"./Constants":2,"./Exceptions":6,"./Grammar":7,"./NameAddrHeader":10,"./UA":24,"./URI":25,"./Utils":26,"./WebSocketInterface":27,debug:30}],9:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function i(e,t){return(i=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function o(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=l(e);if(t){var i=l(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(this,n)}}function l(e){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var u=e("events").EventEmitter,a=e("./Constants"),c=e("./SIPMessage"),h=e("./Utils"),f=e("./RequestSender"),d=e("./Exceptions"),_=e("debug")("JsSIP:Message");t.exports=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&i(e,t)}(p,u);var t,n,r,l=o(p);function p(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,p),(t=l.call(this))._ua=e,t._request=null,t._closed=!1,t._direction=null,t._local_identity=null,t._remote_identity=null,t._is_replied=!1,t._data={},t}return t=p,(n=[{key:"send",value:function(e,t){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},s=e;if(void 0===e||void 0===t)throw new TypeError("Not enough arguments");if(!(e=this._ua.normalizeTarget(e)))throw new TypeError("Invalid target: ".concat(s));var i=h.cloneArray(r.extraHeaders),o=h.cloneObject(r.eventHandlers),l=r.contentType||"text/plain";for(var u in o)Object.prototype.hasOwnProperty.call(o,u)&&this.on(u,o[u]);i.push("Content-Type: ".concat(l)),this._request=new c.OutgoingRequest(a.MESSAGE,e,this._ua,null,i),t&&(this._request.body=t);var d=new f(this._ua,this._request,{onRequestTimeout:function(){n._onRequestTimeout()},onTransportError:function(){n._onTransportError()},onReceiveResponse:function(e){n._receiveResponse(e)}});this._newMessage("local",this._request),d.send()}},{key:"init_incoming",value:function(e){this._request=e,this._newMessage("remote",e),this._is_replied||(this._is_replied=!0,e.reply(200)),this._close()}},{key:"accept",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=h.cloneArray(e.extraHeaders),n=e.body;if("incoming"!==this._direction)throw new d.NotSupportedError('"accept" not supported for outgoing Message');if(this._is_replied)throw new Error("incoming Message already replied");this._is_replied=!0,this._request.reply(200,null,t,n)}},{key:"reject",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.status_code||480,n=e.reason_phrase,r=h.cloneArray(e.extraHeaders),s=e.body;if("incoming"!==this._direction)throw new d.NotSupportedError('"reject" not supported for outgoing Message');if(this._is_replied)throw new Error("incoming Message already replied");if(t<300||t>=700)throw new TypeError("Invalid status_code: ".concat(t));this._is_replied=!0,this._request.reply(t,n,r,s)}},{key:"_receiveResponse",value:function(e){if(!this._closed)switch(!0){case/^1[0-9]{2}$/.test(e.status_code):break;case/^2[0-9]{2}$/.test(e.status_code):this._succeeded("remote",e);break;default:var t=h.sipErrorCause(e.status_code);this._failed("remote",e,t)}}},{key:"_onRequestTimeout",value:function(){this._closed||this._failed("system",null,a.causes.REQUEST_TIMEOUT)}},{key:"_onTransportError",value:function(){this._closed||this._failed("system",null,a.causes.CONNECTION_ERROR)}},{key:"_close",value:function(){this._closed=!0,this._ua.destroyMessage(this)}},{key:"_newMessage",value:function(e,t){"remote"===e?(this._direction="incoming",this._local_identity=t.to,this._remote_identity=t.from):"local"===e&&(this._direction="outgoing",this._local_identity=t.from,this._remote_identity=t.to),this._ua.newMessage(this,{originator:e,message:this,request:t})}},{key:"_failed",value:function(e,t,n){_("MESSAGE failed"),this._close(),_('emit "failed"'),this.emit("failed",{originator:e,response:t||null,cause:n})}},{key:"_succeeded",value:function(e,t){_("MESSAGE succeeded"),this._close(),_('emit "succeeded"'),this.emit("succeeded",{originator:e,response:t})}},{key:"direction",get:function(){return this._direction}},{key:"local_identity",get:function(){return this._local_identity}},{key:"remote_identity",get:function(){return this._remote_identity}}])&&s(t.prototype,n),r&&s(t,r),p}()},{"./Constants":2,"./Exceptions":6,"./RequestSender":18,"./SIPMessage":19,"./Utils":26,debug:30,events:29}],10:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function s(e,t,n){return t&&r(e.prototype,t),n&&r(e,n),e}var i=e("./URI"),o=e("./Grammar");t.exports=function(){function e(t,n,r){if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),!(t&&t instanceof i))throw new TypeError('missing or invalid "uri" parameter');for(var s in this._uri=t,this._parameters={},this.display_name=n,r)Object.prototype.hasOwnProperty.call(r,s)&&this.setParam(s,r[s])}return s(e,null,[{key:"parse",value:function(e){return-1!==(e=o.parse(e,"Name_Addr_Header"))?e:void 0}}]),s(e,[{key:"setParam",value:function(e,t){e&&(this._parameters[e.toLowerCase()]=null==t?null:t.toString())}},{key:"getParam",value:function(e){if(e)return this._parameters[e.toLowerCase()]}},{key:"hasParam",value:function(e){if(e)return!!this._parameters.hasOwnProperty(e.toLowerCase())}},{key:"deleteParam",value:function(e){if(e=e.toLowerCase(),this._parameters.hasOwnProperty(e)){var t=this._parameters[e];return delete this._parameters[e],t}}},{key:"clearParams",value:function(){this._parameters={}}},{key:"clone",value:function(){return new e(this._uri.clone(),this._display_name,JSON.parse(JSON.stringify(this._parameters)))}},{key:"_quote",value:function(e){return e.replace(/\\/g,"\\\\").replace(/"/g,'\\"')}},{key:"toString",value:function(){var e=this._display_name?'"'.concat(this._quote(this._display_name),'" '):"";for(var t in e+="<".concat(this._uri.toString(),">"),this._parameters)Object.prototype.hasOwnProperty.call(this._parameters,t)&&(e+=";".concat(t),null!==this._parameters[t]&&(e+="=".concat(this._parameters[t])));return e}},{key:"uri",get:function(){return this._uri}},{key:"display_name",get:function(){return this._display_name},set:function(e){this._display_name=0===e?"0":e}}]),e}()},{"./Grammar":7,"./URI":25}],11:[function(e,t,n){"use strict";function r(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return s(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return s(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,i=function(){};return{s:i,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,l=!0,u=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return l=e.done,e},e:function(e){u=!0,o=e},f:function(){try{l||null==n.return||n.return()}finally{if(u)throw o}}}}function s(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var i=e("./Grammar"),o=e("./SIPMessage"),l=e("debug")("JsSIP:ERROR:Parser");function u(e,t){var n=t,r=0,s=0;if(e.substring(n,n+2).match(/(^\r\n)/))return-2;for(;0===r;){if(-1===(s=e.indexOf("\r\n",n)))return s;!e.substring(s+2,s+4).match(/(^\r\n)/)&&e.charAt(s+2).match(/(^\s+)/)?n=s+2:r=s}return r}function a(e,t,n,s){var l,u=t.indexOf(":",n),a=t.substring(n,u).trim(),c=t.substring(u+1,s).trim();switch(a.toLowerCase()){case"via":case"v":e.addHeader("via",c),1===e.getHeaders("via").length?(l=e.parseHeader("Via"))&&(e.via=l,e.via_branch=l.branch):l=0;break;case"from":case"f":e.setHeader("from",c),(l=e.parseHeader("from"))&&(e.from=l,e.from_tag=l.getParam("tag"));break;case"to":case"t":e.setHeader("to",c),(l=e.parseHeader("to"))&&(e.to=l,e.to_tag=l.getParam("tag"));break;case"record-route":if(-1===(l=i.parse(c,"Record_Route")))l=void 0;else{var h,f=r(l);try{for(f.s();!(h=f.n()).done;){var d=h.value;e.addHeader("record-route",c.substring(d.possition,d.offset)),e.headers["Record-Route"][e.getHeaders("record-route").length-1].parsed=d.parsed}}catch(e){f.e(e)}finally{f.f()}}break;case"call-id":case"i":e.setHeader("call-id",c),(l=e.parseHeader("call-id"))&&(e.call_id=c);break;case"contact":case"m":if(-1===(l=i.parse(c,"Contact")))l=void 0;else{var _,p=r(l);try{for(p.s();!(_=p.n()).done;){var m=_.value;e.addHeader("contact",c.substring(m.possition,m.offset)),e.headers.Contact[e.getHeaders("contact").length-1].parsed=m.parsed}}catch(e){p.e(e)}finally{p.f()}}break;case"content-length":case"l":e.setHeader("content-length",c),l=e.parseHeader("content-length");break;case"content-type":case"c":e.setHeader("content-type",c),l=e.parseHeader("content-type");break;case"cseq":e.setHeader("cseq",c),(l=e.parseHeader("cseq"))&&(e.cseq=l.value),e instanceof o.IncomingResponse&&(e.method=l.method);break;case"max-forwards":e.setHeader("max-forwards",c),l=e.parseHeader("max-forwards");break;case"www-authenticate":e.setHeader("www-authenticate",c),l=e.parseHeader("www-authenticate");break;case"proxy-authenticate":e.setHeader("proxy-authenticate",c),l=e.parseHeader("proxy-authenticate");break;case"session-expires":case"x":e.setHeader("session-expires",c),(l=e.parseHeader("session-expires"))&&(e.session_expires=l.expires,e.session_expires_refresher=l.refresher);break;case"refer-to":case"r":e.setHeader("refer-to",c),(l=e.parseHeader("refer-to"))&&(e.refer_to=l);break;case"replaces":e.setHeader("replaces",c),(l=e.parseHeader("replaces"))&&(e.replaces=l);break;case"event":case"o":e.setHeader("event",c),(l=e.parseHeader("event"))&&(e.event=l);break;default:e.addHeader(a,c),l=0}return void 0!==l||{error:'error parsing header "'.concat(a,'"')}}l.log=console.warn.bind(console),n.parseMessage=function(e,t){var n,r,s=e.indexOf("\r\n");if(-1!==s){var c=e.substring(0,s),h=i.parse(c,"Request_Response");if(-1!==h){h.status_code?((n=new o.IncomingResponse).status_code=h.status_code,n.reason_phrase=h.reason_phrase):((n=new o.IncomingRequest(t)).method=h.method,n.ruri=h.uri),n.data=e;for(var f=s+2;;){if(-2===(s=u(e,f))){r=f+2;break}if(-1===s)return void l("parseMessage() | malformed message");if(!0!==(h=a(n,e,f,s)))return void l("parseMessage() |",h.error);f=s+2}if(n.hasHeader("content-length")){var d=n.getHeader("content-length");n.body=e.substr(r,d)}else n.body=e.substring(r);return n}l('parseMessage() | error parsing first line of SIP message: "'.concat(c,'"'))}else l("parseMessage() | no CRLF found, not a SIP message")}},{"./Grammar":7,"./SIPMessage":19,debug:30}],12:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return i(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return i(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,s=function(){};return{s:s,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:s}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,l=!0,u=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return l=e.done,e},e:function(e){u=!0,o=e},f:function(){try{l||null==n.return||n.return()}finally{if(u)throw o}}}}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function o(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function l(e,t,n){return t&&o(e.prototype,t),n&&o(e,n),e}function u(e,t){return(u=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function a(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=c(e);if(t){var i=c(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(this,n)}}function c(e){return(c=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var h=e("events").EventEmitter,f=e("sdp-transform"),d=e("./Constants"),_=e("./Exceptions"),p=e("./Transactions"),m=e("./Utils"),v=e("./Timers"),g=e("./SIPMessage"),y=e("./Dialog"),T=e("./RequestSender"),C=e("./RTCSession/DTMF"),S=e("./RTCSession/Info"),E=e("./RTCSession/ReferNotifier"),A=e("./RTCSession/ReferSubscriber"),b=e("./URI"),R=e("debug")("JsSIP:RTCSession"),w=e("debug")("JsSIP:ERROR:RTCSession");w.log=console.warn.bind(console);var I={STATUS_NULL:0,STATUS_INVITE_SENT:1,STATUS_1XX_RECEIVED:2,STATUS_INVITE_RECEIVED:3,STATUS_WAITING_FOR_ANSWER:4,STATUS_ANSWERED:5,STATUS_WAITING_FOR_ACK:6,STATUS_CANCELED:7,STATUS_TERMINATED:8,STATUS_CONFIRMED:9},O=["audio","video"];t.exports=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&u(e,t)}(n,h);var t=a(n);function n(e){var r;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,n),R("new"),(r=t.call(this))._id=null,r._ua=e,r._status=I.STATUS_NULL,r._dialog=null,r._earlyDialogs={},r._contact=null,r._from_tag=null,r._to_tag=null,r._connection=null,r._connectionPromiseQueue=Promise.resolve(),r._request=null,r._is_canceled=!1,r._cancel_reason="",r._is_confirmed=!1,r._late_sdp=!1,r._rtcOfferConstraints=null,r._rtcAnswerConstraints=null,r._localMediaStream=null,r._localMediaStreamLocallyGenerated=!1,r._rtcReady=!0,r._timers={ackTimer:null,expiresTimer:null,invite2xxTimer:null,userNoAnswerTimer:null},r._direction=null,r._local_identity=null,r._remote_identity=null,r._start_time=null,r._end_time=null,r._tones=null,r._audioMuted=!1,r._videoMuted=!1,r._localHold=!1,r._remoteHold=!1,r._sessionTimers={enabled:r._ua.configuration.session_timers,refreshMethod:r._ua.configuration.session_timers_refresh_method,defaultExpires:d.SESSION_EXPIRES,currentExpires:null,running:!1,refresher:!1,timer:null},r._referSubscribers={},r._data={},r}return l(n,null,[{key:"C",get:function(){return I}}]),l(n,[{key:"isInProgress",value:function(){switch(this._status){case I.STATUS_NULL:case I.STATUS_INVITE_SENT:case I.STATUS_1XX_RECEIVED:case I.STATUS_INVITE_RECEIVED:case I.STATUS_WAITING_FOR_ANSWER:return!0;default:return!1}}},{key:"isEstablished",value:function(){switch(this._status){case I.STATUS_ANSWERED:case I.STATUS_WAITING_FOR_ACK:case I.STATUS_CONFIRMED:return!0;default:return!1}}},{key:"isEnded",value:function(){switch(this._status){case I.STATUS_CANCELED:case I.STATUS_TERMINATED:return!0;default:return!1}}},{key:"isMuted",value:function(){return{audio:this._audioMuted,video:this._videoMuted}}},{key:"isOnHold",value:function(){return{local:this._localHold,remote:this._remoteHold}}},{key:"connect",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2?arguments[2]:void 0;R("connect()");var r=e,s=m.cloneObject(t.eventHandlers),i=m.cloneArray(t.extraHeaders),o=m.cloneObject(t.mediaConstraints,{audio:!0,video:!0}),l=t.mediaStream||null,u=m.cloneObject(t.pcConfig,{iceServers:[]}),a=t.rtcConstraints||null,c=t.rtcOfferConstraints||null;if(this._rtcOfferConstraints=c,this._rtcAnswerConstraints=t.rtcAnswerConstraints||null,this._data=t.data||this._data,void 0===e)throw new TypeError("Not enough arguments");if(this._status!==I.STATUS_NULL)throw new _.InvalidStateError(this._status);if(!window.RTCPeerConnection)throw new _.NotSupportedError("WebRTC not supported");if(!(e=this._ua.normalizeTarget(e)))throw new TypeError("Invalid target: ".concat(r));for(var h in this._sessionTimers.enabled&&m.isDecimal(t.sessionTimersExpires)&&(t.sessionTimersExpires>=d.MIN_SESSION_EXPIRES?this._sessionTimers.defaultExpires=t.sessionTimersExpires:this._sessionTimers.defaultExpires=d.SESSION_EXPIRES),s)Object.prototype.hasOwnProperty.call(s,h)&&this.on(h,s[h]);this._from_tag=m.newTag();var f=t.anonymous||!1,p={from_tag:this._from_tag};this._contact=this._ua.contact.toString({anonymous:f,outbound:!0}),f?(p.from_display_name="Anonymous",p.from_uri=new b("sip","anonymous","anonymous.invalid"),i.push("P-Preferred-Identity: ".concat(this._ua.configuration.uri.toString())),i.push("Privacy: id")):t.fromUserName&&(p.from_uri=new b("sip",t.fromUserName,this._ua.configuration.uri.host),i.push("P-Preferred-Identity: ".concat(this._ua.configuration.uri.toString()))),t.fromDisplayName&&(p.from_display_name=t.fromDisplayName),i.push("Contact: ".concat(this._contact)),i.push("Content-Type: application/sdp"),this._sessionTimers.enabled&&i.push("Session-Expires: ".concat(this._sessionTimers.defaultExpires).concat(this._ua.configuration.session_timers_force_refresher?";refresher=uac":"")),this._request=new g.InitialOutgoingInviteRequest(e,this._ua,p,i),this._id=this._request.call_id+this._from_tag,this._createRTCConnection(u,a),this._direction="outgoing",this._local_identity=this._request.from,this._remote_identity=this._request.to,n&&n(this),this._newRTCSession("local",this._request),this._sendInitialRequest(o,c,l)}},{key:"init_incoming",value:function(e,t){var n,r=this;R("init_incoming()");var s=e.hasHeader("Content-Type")?e.getHeader("Content-Type").toLowerCase():void 0;e.body&&"application/sdp"!==s?e.reply(415):(this._status=I.STATUS_INVITE_RECEIVED,this._from_tag=e.from_tag,this._id=e.call_id+this._from_tag,this._request=e,this._contact=this._ua.contact.toString(),e.hasHeader("expires")&&(n=1e3*e.getHeader("expires")),e.to_tag=m.newTag(),this._createDialog(e,"UAS",!0)?(e.body?this._late_sdp=!1:this._late_sdp=!0,this._status=I.STATUS_WAITING_FOR_ANSWER,this._timers.userNoAnswerTimer=setTimeout(function(){e.reply(408),r._failed("local",null,d.causes.NO_ANSWER)},this._ua.configuration.no_answer_timeout),n&&(this._timers.expiresTimer=setTimeout(function(){r._status===I.STATUS_WAITING_FOR_ANSWER&&(e.reply(487),r._failed("system",null,d.causes.EXPIRES))},n)),this._direction="incoming",this._local_identity=e.to,this._remote_identity=e.from,t&&t(this),this._newRTCSession("remote",e),this._status!==I.STATUS_TERMINATED&&(e.reply(180,null,["Contact: ".concat(this._contact)]),this._progress("local",null))):e.reply(500,"Missing Contact header field"))}},{key:"answer",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};R("answer()");var n=this._request,r=m.cloneArray(t.extraHeaders),i=m.cloneObject(t.mediaConstraints),o=t.mediaStream||null,l=m.cloneObject(t.pcConfig,{iceServers:[]}),u=t.rtcConstraints||null,a=t.rtcAnswerConstraints||null,c=m.cloneObject(t.rtcOfferConstraints),h=!1,f=!1,p=!1,v=!1;if(this._rtcAnswerConstraints=a,this._rtcOfferConstraints=t.rtcOfferConstraints||null,this._data=t.data||this._data,"incoming"!==this._direction)throw new _.NotSupportedError('"answer" not supported for outgoing RTCSession');if(this._status!==I.STATUS_WAITING_FOR_ANSWER)throw new _.InvalidStateError(this._status);if(this._sessionTimers.enabled&&m.isDecimal(t.sessionTimersExpires)&&(t.sessionTimersExpires>=d.MIN_SESSION_EXPIRES?this._sessionTimers.defaultExpires=t.sessionTimersExpires:this._sessionTimers.defaultExpires=d.SESSION_EXPIRES),this._status=I.STATUS_ANSWERED,this._createDialog(n,"UAS")){clearTimeout(this._timers.userNoAnswerTimer),r.unshift("Contact: ".concat(this._contact));var g=n.parseSDP();Array.isArray(g.media)||(g.media=[g.media]);var y,T=s(g.media);try{for(T.s();!(y=T.n()).done;){var C=y.value;"audio"===C.type&&(h=!0,C.direction&&"sendrecv"!==C.direction||(p=!0)),"video"===C.type&&(f=!0,C.direction&&"sendrecv"!==C.direction||(v=!0))}}catch(e){T.e(e)}finally{T.f()}if(o&&!1===i.audio){var S,E=s(o.getAudioTracks());try{for(E.s();!(S=E.n()).done;){var A=S.value;o.removeTrack(A)}}catch(e){E.e(e)}finally{E.f()}}if(o&&!1===i.video){var b,O=s(o.getVideoTracks());try{for(O.s();!(b=O.n()).done;){var N=b.value;o.removeTrack(N)}}catch(e){O.e(e)}finally{O.f()}}o||void 0!==i.audio||(i.audio=p),o||void 0!==i.video||(i.video=v),o||h||c.offerToReceiveAudio||(i.audio=!1),o||f||c.offerToReceiveVideo||(i.video=!1),this._createRTCConnection(l,u),Promise.resolve().then(function(){return o||(i.audio||i.video?(e._localMediaStreamLocallyGenerated=!0,navigator.mediaDevices.getUserMedia(i).catch(function(t){if(e._status===I.STATUS_TERMINATED)throw new Error("terminated");throw n.reply(480),e._failed("local",null,d.causes.USER_DENIED_MEDIA_ACCESS),w('emit "getusermediafailed" [error:%o]',t),e.emit("getusermediafailed",t),new Error("getUserMedia() failed")})):void 0)}).then(function(t){if(e._status===I.STATUS_TERMINATED)throw new Error("terminated");e._localMediaStream=t,t&&t.getTracks().forEach(function(n){e._connection.addTrack(n,t)})}).then(function(){if(!e._late_sdp){var t={originator:"remote",type:"offer",sdp:n.body};R('emit "sdp"'),e.emit("sdp",t);var r=new RTCSessionDescription({type:"offer",sdp:t.sdp});return e._connectionPromiseQueue=e._connectionPromiseQueue.then(function(){return e._connection.setRemoteDescription(r)}).catch(function(t){throw n.reply(488),e._failed("system",null,d.causes.WEBRTC_ERROR),w('emit "peerconnection:setremotedescriptionfailed" [error:%o]',t),e.emit("peerconnection:setremotedescriptionfailed",t),new Error("peerconnection.setRemoteDescription() failed")}),e._connectionPromiseQueue}}).then(function(){if(e._status===I.STATUS_TERMINATED)throw new Error("terminated");return e._connecting(n),e._late_sdp?e._createLocalDescription("offer",e._rtcOfferConstraints).catch(function(){throw n.reply(500),new Error("_createLocalDescription() failed")}):e._createLocalDescription("answer",a).catch(function(){throw n.reply(500),new Error("_createLocalDescription() failed")})}).then(function(t){if(e._status===I.STATUS_TERMINATED)throw new Error("terminated");e._handleSessionTimersInIncomingRequest(n,r),n.reply(200,null,r,t,function(){e._status=I.STATUS_WAITING_FOR_ACK,e._setInvite2xxTimer(n,t),e._setACKTimer(),e._accepted("local")},function(){e._failed("system",null,d.causes.CONNECTION_ERROR)})}).catch(function(t){e._status!==I.STATUS_TERMINATED&&w(t)})}else n.reply(500,"Error creating dialog")}},{key:"terminate",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};R("terminate()");var n,r=t.cause||d.causes.BYE,s=m.cloneArray(t.extraHeaders),i=t.body,o=t.status_code,l=t.reason_phrase;if(this._status===I.STATUS_TERMINATED)throw new _.InvalidStateError(this._status);switch(this._status){case I.STATUS_NULL:case I.STATUS_INVITE_SENT:case I.STATUS_1XX_RECEIVED:if(R("canceling session"),o&&(o<200||o>=700))throw new TypeError("Invalid status_code: ".concat(o));o&&(l=l||d.REASON_PHRASE[o]||"",n="SIP ;cause=".concat(o,' ;text="').concat(l,'"')),this._status===I.STATUS_NULL||this._status===I.STATUS_INVITE_SENT?(this._is_canceled=!0,this._cancel_reason=n):this._status===I.STATUS_1XX_RECEIVED&&this._request.cancel(n),this._status=I.STATUS_CANCELED,this._failed("local",null,d.causes.CANCELED);break;case I.STATUS_WAITING_FOR_ANSWER:case I.STATUS_ANSWERED:if(R("rejecting session"),(o=o||480)<300||o>=700)throw new TypeError("Invalid status_code: ".concat(o));this._request.reply(o,l,s,i),this._failed("local",null,d.causes.REJECTED);break;case I.STATUS_WAITING_FOR_ACK:case I.STATUS_CONFIRMED:if(R("terminating session"),l=t.reason_phrase||d.REASON_PHRASE[o]||"",o&&(o<200||o>=700))throw new TypeError("Invalid status_code: ".concat(o));if(o&&s.push("Reason: SIP ;cause=".concat(o,'; text="').concat(l,'"')),this._status===I.STATUS_WAITING_FOR_ACK&&"incoming"===this._direction&&this._request.server_transaction.state!==p.C.STATUS_TERMINATED){var u=this._dialog;this.receiveRequest=function(t){t.method===d.ACK&&(e.sendRequest(d.BYE,{extraHeaders:s,body:i}),u.terminate())},this._request.server_transaction.on("stateChanged",function(){e._request.server_transaction.state===p.C.STATUS_TERMINATED&&(e.sendRequest(d.BYE,{extraHeaders:s,body:i}),u.terminate())}),this._ended("local",null,r),this._dialog=u,this._ua.newDialog(u)}else this.sendRequest(d.BYE,{extraHeaders:s,body:i}),this._ended("local",null,r)}}},{key:"sendDTMF",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};R("sendDTMF() | tones: %s",e);var n=0,r=t.duration||null,s=t.interToneGap||null,i=t.transportType||d.DTMF_TRANSPORT.INFO;if(void 0===e)throw new TypeError("Not enough arguments");if(this._status!==I.STATUS_CONFIRMED&&this._status!==I.STATUS_WAITING_FOR_ACK)throw new _.InvalidStateError(this._status);if(i!==d.DTMF_TRANSPORT.INFO&&i!==d.DTMF_TRANSPORT.RFC2833)throw new TypeError("invalid transportType: ".concat(i));if("number"==typeof e&&(e=e.toString()),!e||"string"!=typeof e||!e.match(/^[0-9A-DR#*,]+$/i))throw new TypeError("Invalid tones: ".concat(e));if(r&&!m.isDecimal(r))throw new TypeError("Invalid tone duration: ".concat(r));if(r?r<C.C.MIN_DURATION?(R('"duration" value is lower than the minimum allowed, setting it to '.concat(C.C.MIN_DURATION," milliseconds")),r=C.C.MIN_DURATION):r>C.C.MAX_DURATION?(R('"duration" value is greater than the maximum allowed, setting it to '.concat(C.C.MAX_DURATION," milliseconds")),r=C.C.MAX_DURATION):r=Math.abs(r):r=C.C.DEFAULT_DURATION,t.duration=r,s&&!m.isDecimal(s))throw new TypeError("Invalid interToneGap: ".concat(s));if(s?s<C.C.MIN_INTER_TONE_GAP?(R('"interToneGap" value is lower than the minimum allowed, setting it to '.concat(C.C.MIN_INTER_TONE_GAP," milliseconds")),s=C.C.MIN_INTER_TONE_GAP):s=Math.abs(s):s=C.C.DEFAULT_INTER_TONE_GAP,i!==d.DTMF_TRANSPORT.RFC2833)this._tones?this._tones+=e:(this._tones=e,function e(){var i=this;var o;if(this._status===I.STATUS_TERMINATED||!this._tones||n>=this._tones.length)return void(this._tones=null);var l=this._tones[n];n+=1;if(","===l)o=2e3;else{var u=new C(this);t.eventHandlers={onFailed:function(){i._tones=null}},u.send(l,t),o=r+s}setTimeout(e.bind(this),o)}.call(this));else{var o=this._getDTMFRTPSender();o&&(e=o.toneBuffer+e,o.insertDTMF(e,r,s))}}},{key:"sendInfo",value:function(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(R("sendInfo()"),this._status!==I.STATUS_CONFIRMED&&this._status!==I.STATUS_WAITING_FOR_ACK)throw new _.InvalidStateError(this._status);new S(this).send(e,t,n)}},{key:"mute",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{audio:!0,video:!1};R("mute()");var t=!1,n=!1;!1===this._audioMuted&&e.audio&&(t=!0,this._audioMuted=!0,this._toggleMuteAudio(!0)),!1===this._videoMuted&&e.video&&(n=!0,this._videoMuted=!0,this._toggleMuteVideo(!0)),!0!==t&&!0!==n||this._onmute({audio:t,video:n})}},{key:"unmute",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{audio:!0,video:!0};R("unmute()");var t=!1,n=!1;!0===this._audioMuted&&e.audio&&(t=!0,this._audioMuted=!1,!1===this._localHold&&this._toggleMuteAudio(!1)),!0===this._videoMuted&&e.video&&(n=!0,this._videoMuted=!1,!1===this._localHold&&this._toggleMuteVideo(!1)),!0!==t&&!0!==n||this._onunmute({audio:t,video:n})}},{key:"hold",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1?arguments[1]:void 0;if(R("hold()"),this._status!==I.STATUS_WAITING_FOR_ACK&&this._status!==I.STATUS_CONFIRMED)return!1;if(!0===this._localHold)return!1;if(!this._isReadyToReOffer())return!1;this._localHold=!0,this._onhold("local");var r={succeeded:function(){n&&n()},failed:function(){e.terminate({cause:d.causes.WEBRTC_ERROR,status_code:500,reason_phrase:"Hold Failed"})}};return t.useUpdate?this._sendUpdate({sdpOffer:!0,eventHandlers:r,extraHeaders:t.extraHeaders}):this._sendReinvite({eventHandlers:r,extraHeaders:t.extraHeaders}),!0}},{key:"unhold",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1?arguments[1]:void 0;if(R("unhold()"),this._status!==I.STATUS_WAITING_FOR_ACK&&this._status!==I.STATUS_CONFIRMED)return!1;if(!1===this._localHold)return!1;if(!this._isReadyToReOffer())return!1;this._localHold=!1,this._onunhold("local");var r={succeeded:function(){n&&n()},failed:function(){e.terminate({cause:d.causes.WEBRTC_ERROR,status_code:500,reason_phrase:"Unhold Failed"})}};return t.useUpdate?this._sendUpdate({sdpOffer:!0,eventHandlers:r,extraHeaders:t.extraHeaders}):this._sendReinvite({eventHandlers:r,extraHeaders:t.extraHeaders}),!0}},{key:"renegotiate",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=arguments.length>1?arguments[1]:void 0;R("renegotiate()");var r=t.rtcOfferConstraints||null;if(this._status!==I.STATUS_WAITING_FOR_ACK&&this._status!==I.STATUS_CONFIRMED)return!1;if(!this._isReadyToReOffer())return!1;var s={succeeded:function(){n&&n()},failed:function(){e.terminate({cause:d.causes.WEBRTC_ERROR,status_code:500,reason_phrase:"Media Renegotiation Failed"})}};return this._setLocalMediaStatus(),t.useUpdate?this._sendUpdate({sdpOffer:!0,eventHandlers:s,rtcOfferConstraints:r,extraHeaders:t.extraHeaders}):this._sendReinvite({eventHandlers:s,rtcOfferConstraints:r,extraHeaders:t.extraHeaders}),!0}},{key:"refer",value:function(e,t){var n=this;R("refer()");var r=e;if(this._status!==I.STATUS_WAITING_FOR_ACK&&this._status!==I.STATUS_CONFIRMED)return!1;if(!(e=this._ua.normalizeTarget(e)))throw new TypeError("Invalid target: ".concat(r));var s=new A(this);s.sendRefer(e,t);var i=s.id;return this._referSubscribers[i]=s,s.on("requestFailed",function(){delete n._referSubscribers[i]}),s.on("accepted",function(){delete n._referSubscribers[i]}),s.on("failed",function(){delete n._referSubscribers[i]}),s}},{key:"sendRequest",value:function(e,t){return R("sendRequest()"),this._dialog.sendRequest(e,t)}},{key:"receiveRequest",value:function(e){var t=this;if(R("receiveRequest()"),e.method===d.CANCEL)this._status!==I.STATUS_WAITING_FOR_ANSWER&&this._status!==I.STATUS_ANSWERED||(this._status=I.STATUS_CANCELED,this._request.reply(487),this._failed("remote",e,d.causes.CANCELED));else switch(e.method){case d.ACK:if(this._status!==I.STATUS_WAITING_FOR_ACK)return;if(this._status=I.STATUS_CONFIRMED,clearTimeout(this._timers.ackTimer),clearTimeout(this._timers.invite2xxTimer),this._late_sdp){if(!e.body){this.terminate({cause:d.causes.MISSING_SDP,status_code:400});break}var n={originator:"remote",type:"answer",sdp:e.body};R('emit "sdp"'),this.emit("sdp",n);var r=new RTCSessionDescription({type:"answer",sdp:n.sdp});this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){return t._connection.setRemoteDescription(r)}).then(function(){t._is_confirmed||t._confirmed("remote",e)}).catch(function(e){t.terminate({cause:d.causes.BAD_MEDIA_DESCRIPTION,status_code:488}),w('emit "peerconnection:setremotedescriptionfailed" [error:%o]',e),t.emit("peerconnection:setremotedescriptionfailed",e)})}else this._is_confirmed||this._confirmed("remote",e);break;case d.BYE:this._status===I.STATUS_CONFIRMED||this._status===I.STATUS_WAITING_FOR_ACK?(e.reply(200),this._ended("remote",e,d.causes.BYE)):this._status===I.STATUS_INVITE_RECEIVED||this._status===I.STATUS_WAITING_FOR_ANSWER?(e.reply(200),this._request.reply(487,"BYE Received"),this._ended("remote",e,d.causes.BYE)):e.reply(403,"Wrong Status");break;case d.INVITE:this._status===I.STATUS_CONFIRMED?e.hasHeader("replaces")?this._receiveReplaces(e):this._receiveReinvite(e):e.reply(403,"Wrong Status");break;case d.INFO:if(this._status===I.STATUS_1XX_RECEIVED||this._status===I.STATUS_WAITING_FOR_ANSWER||this._status===I.STATUS_ANSWERED||this._status===I.STATUS_WAITING_FOR_ACK||this._status===I.STATUS_CONFIRMED){var s=e.hasHeader("Content-Type")?e.getHeader("Content-Type").toLowerCase():void 0;s&&s.match(/^application\/dtmf-relay/i)?new C(this).init_incoming(e):void 0!==s?new S(this).init_incoming(e):e.reply(415)}else e.reply(403,"Wrong Status");break;case d.UPDATE:this._status===I.STATUS_CONFIRMED?this._receiveUpdate(e):e.reply(403,"Wrong Status");break;case d.REFER:this._status===I.STATUS_CONFIRMED?this._receiveRefer(e):e.reply(403,"Wrong Status");break;case d.NOTIFY:this._status===I.STATUS_CONFIRMED?this._receiveNotify(e):e.reply(403,"Wrong Status");break;default:e.reply(501)}}},{key:"onTransportError",value:function(){w("onTransportError()"),this._status!==I.STATUS_TERMINATED&&this.terminate({status_code:500,reason_phrase:d.causes.CONNECTION_ERROR,cause:d.causes.CONNECTION_ERROR})}},{key:"onRequestTimeout",value:function(){w("onRequestTimeout()"),this._status!==I.STATUS_TERMINATED&&this.terminate({status_code:408,reason_phrase:d.causes.REQUEST_TIMEOUT,cause:d.causes.REQUEST_TIMEOUT})}},{key:"onDialogError",value:function(){w("onDialogError()"),this._status!==I.STATUS_TERMINATED&&this.terminate({status_code:500,reason_phrase:d.causes.DIALOG_ERROR,cause:d.causes.DIALOG_ERROR})}},{key:"newDTMF",value:function(e){R("newDTMF()"),this.emit("newDTMF",e)}},{key:"newInfo",value:function(e){R("newInfo()"),this.emit("newInfo",e)}},{key:"_isReadyToReOffer",value:function(){return this._rtcReady?this._dialog?!0!==this._dialog.uac_pending_reply&&!0!==this._dialog.uas_pending_reply||(R("_isReadyToReOffer() | there is another INVITE/UPDATE transaction in progress"),!1):(R("_isReadyToReOffer() | session not established yet"),!1):(R("_isReadyToReOffer() | internal WebRTC status not ready"),!1)}},{key:"_close",value:function(){if(R("close()"),this._status!==I.STATUS_TERMINATED){if(this._status=I.STATUS_TERMINATED,this._connection)try{this._connection.close()}catch(e){w("close() | error closing the RTCPeerConnection: %o",e)}for(var e in this._localMediaStream&&this._localMediaStreamLocallyGenerated&&(R("close() | closing local MediaStream"),m.closeMediaStream(this._localMediaStream)),this._timers)Object.prototype.hasOwnProperty.call(this._timers,e)&&clearTimeout(this._timers[e]);for(var t in clearTimeout(this._sessionTimers.timer),this._dialog&&(this._dialog.terminate(),delete this._dialog),this._earlyDialogs)Object.prototype.hasOwnProperty.call(this._earlyDialogs,t)&&(this._earlyDialogs[t].terminate(),delete this._earlyDialogs[t]);for(var n in this._referSubscribers)Object.prototype.hasOwnProperty.call(this._referSubscribers,n)&&delete this._referSubscribers[n];this._ua.destroyRTCSession(this)}}},{key:"_setInvite2xxTimer",value:function(e,t){var n=v.T1;this._timers.invite2xxTimer=setTimeout(function r(){this._status===I.STATUS_WAITING_FOR_ACK&&(e.reply(200,null,["Contact: ".concat(this._contact)],t),n<v.T2&&(n*=2)>v.T2&&(n=v.T2),this._timers.invite2xxTimer=setTimeout(r.bind(this),n))}.bind(this),n)}},{key:"_setACKTimer",value:function(){var e=this;this._timers.ackTimer=setTimeout(function(){e._status===I.STATUS_WAITING_FOR_ACK&&(R("no ACK received, terminating the session"),clearTimeout(e._timers.invite2xxTimer),e.sendRequest(d.BYE),e._ended("remote",null,d.causes.NO_ACK))},v.TIMER_H)}},{key:"_createRTCConnection",value:function(e,t){var n=this;this._connection=new RTCPeerConnection(e,t),this._connection.addEventListener("iceconnectionstatechange",function(){"failed"===n._connection.iceConnectionState&&n.terminate({cause:d.causes.RTP_TIMEOUT,status_code:408,reason_phrase:d.causes.RTP_TIMEOUT})}),R('emit "peerconnection"'),this.emit("peerconnection",{peerconnection:this._connection})}},{key:"_createLocalDescription",value:function(e,t){var n=this;if(R("createLocalDescription()"),"offer"!==e&&"answer"!==e)throw new Error('createLocalDescription() | invalid type "'.concat(e,'"'));var r=this._connection;return this._rtcReady=!1,Promise.resolve().then(function(){return"offer"===e?r.createOffer(t).catch(function(e){return w('emit "peerconnection:createofferfailed" [error:%o]',e),n.emit("peerconnection:createofferfailed",e),Promise.reject(e)}):r.createAnswer(t).catch(function(e){return w('emit "peerconnection:createanswerfailed" [error:%o]',e),n.emit("peerconnection:createanswerfailed",e),Promise.reject(e)})}).then(function(e){return r.setLocalDescription(e).catch(function(e){return n._rtcReady=!0,w('emit "peerconnection:setlocaldescriptionfailed" [error:%o]',e),n.emit("peerconnection:setlocaldescriptionfailed",e),Promise.reject(e)})}).then(function(){if(!("complete"!==r.iceGatheringState||t&&t.iceRestart)){n._rtcReady=!0;var s={originator:"local",type:e,sdp:r.localDescription.sdp};return R('emit "sdp"'),n.emit("sdp",s),Promise.resolve(s.sdp)}return new Promise(function(t){var s,i,o=!1,l=function(){r.removeEventListener("icecandidate",s),r.removeEventListener("icegatheringstatechange",i),o=!0,n._rtcReady=!0;var l={originator:"local",type:e,sdp:r.localDescription.sdp};R('emit "sdp"'),n.emit("sdp",l),t(l.sdp)};r.addEventListener("icecandidate",s=function(e){var t=e.candidate;t?n.emit("icecandidate",{candidate:t,ready:l}):o||l()}),r.addEventListener("icegatheringstatechange",i=function(){"complete"!==r.iceGatheringState||o||l()})})})}},{key:"_createDialog",value:function(e,t,n){var r="UAS"===t?e.to_tag:e.from_tag,s="UAS"===t?e.from_tag:e.to_tag,i=e.call_id+r+s,o=this._earlyDialogs[i];if(n)return!!o||((o=new y(this,e,t,y.C.STATUS_EARLY)).error?(R(o.error),this._failed("remote",e,d.causes.INTERNAL_ERROR),!1):(this._earlyDialogs[i]=o,!0));if(this._from_tag=e.from_tag,this._to_tag=e.to_tag,o)return o.update(e,t),this._dialog=o,delete this._earlyDialogs[i],!0;var l=new y(this,e,t);return l.error?(R(l.error),this._failed("remote",e,d.causes.INTERNAL_ERROR),!1):(this._dialog=l,!0)}},{key:"_receiveReinvite",value:function(e){var t=this;R("receiveReinvite()");var n=e.hasHeader("Content-Type")?e.getHeader("Content-Type").toLowerCase():void 0,r={request:e,callback:void 0,reject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};s=!0;var n=t.status_code||403,r=t.reason_phrase||"",i=m.cloneArray(t.extraHeaders);if(this._status!==I.STATUS_CONFIRMED)return!1;if(n<300||n>=700)throw new TypeError("Invalid status_code: ".concat(n));e.reply(n,r,i)}.bind(this)},s=!1;if(this.emit("reinvite",r),!s){if(this._late_sdp=!1,!e.body)return this._late_sdp=!0,this._remoteHold&&(this._remoteHold=!1,this._onunhold("remote")),void(this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){return t._createLocalDescription("offer",t._rtcOfferConstraints)}).then(function(e){i.call(t,e)}).catch(function(){e.reply(500)}));if("application/sdp"!==n)return R("invalid Content-Type"),void e.reply(415);this._processInDialogSdpOffer(e).then(function(e){t._status!==I.STATUS_TERMINATED&&i.call(t,e)}).catch(function(e){w(e)})}function i(t){var n=this,s=["Contact: ".concat(this._contact)];this._handleSessionTimersInIncomingRequest(e,s),this._late_sdp&&(t=this._mangleOffer(t)),e.reply(200,null,s,t,function(){n._status=I.STATUS_WAITING_FOR_ACK,n._setInvite2xxTimer(e,t),n._setACKTimer()}),"function"==typeof r.callback&&r.callback()}}},{key:"_receiveUpdate",value:function(e){var t=this;R("receiveUpdate()");var n=e.hasHeader("Content-Type")?e.getHeader("Content-Type").toLowerCase():void 0,r={request:e,callback:void 0,reject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};s=!0;var n=t.status_code||403,r=t.reason_phrase||"",i=m.cloneArray(t.extraHeaders);if(this._status!==I.STATUS_CONFIRMED)return!1;if(n<300||n>=700)throw new TypeError("Invalid status_code: ".concat(n));e.reply(n,r,i)}.bind(this)},s=!1;if(this.emit("update",r),!s)if(e.body){if("application/sdp"!==n)return R("invalid Content-Type"),void e.reply(415);this._processInDialogSdpOffer(e).then(function(e){t._status!==I.STATUS_TERMINATED&&i.call(t,e)}).catch(function(e){w(e)})}else i.call(this,null);function i(t){var n=["Contact: ".concat(this._contact)];this._handleSessionTimersInIncomingRequest(e,n),e.reply(200,null,n,t),"function"==typeof r.callback&&r.callback()}}},{key:"_processInDialogSdpOffer",value:function(e){var t=this;R("_processInDialogSdpOffer()");var n,r=e.parseSDP(),i=!1,o=s(r.media);try{for(o.s();!(n=o.n()).done;){var l=n.value;if(-1!==O.indexOf(l.type)){var u=l.direction||r.direction||"sendrecv";if("sendonly"!==u&&"inactive"!==u){i=!1;break}i=!0}}}catch(e){o.e(e)}finally{o.f()}var a={originator:"remote",type:"offer",sdp:e.body};R('emit "sdp"'),this.emit("sdp",a);var c=new RTCSessionDescription({type:"offer",sdp:a.sdp});return this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){if(t._status===I.STATUS_TERMINATED)throw new Error("terminated");return t._connection.setRemoteDescription(c).catch(function(n){throw e.reply(488),w('emit "peerconnection:setremotedescriptionfailed" [error:%o]',n),t.emit("peerconnection:setremotedescriptionfailed",n),n})}).then(function(){if(t._status===I.STATUS_TERMINATED)throw new Error("terminated");!0===t._remoteHold&&!1===i?(t._remoteHold=!1,t._onunhold("remote")):!1===t._remoteHold&&!0===i&&(t._remoteHold=!0,t._onhold("remote"))}).then(function(){if(t._status===I.STATUS_TERMINATED)throw new Error("terminated");return t._createLocalDescription("answer",t._rtcAnswerConstraints).catch(function(t){throw e.reply(500),w('emit "peerconnection:createtelocaldescriptionfailed" [error:%o]',t),t})}).catch(function(e){w("_processInDialogSdpOffer() failed [error: %o]",e)}),this._connectionPromiseQueue}},{key:"_receiveRefer",value:function(e){var t=this;if(R("receiveRefer()"),!e.refer_to)return R("no Refer-To header field present in REFER"),void e.reply(400);if(e.refer_to.uri.scheme!==d.SIP)return R("Refer-To header field points to a non-SIP URI scheme"),void e.reply(416);e.reply(202);var r=new E(this,e.cseq);R('emit "refer"'),this.emit("refer",{request:e,accept:function(s,i){(function(t){var s=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(t="function"==typeof t?t:null,this._status!==I.STATUS_WAITING_FOR_ACK&&this._status!==I.STATUS_CONFIRMED)return!1;var i=new n(this._ua);if(i.on("progress",function(e){var t=e.response;r.notify(t.status_code,t.reason_phrase)}),i.on("accepted",function(e){var t=e.response;r.notify(t.status_code,t.reason_phrase)}),i.on("_failed",function(e){var t=e.message,n=e.cause;t?r.notify(t.status_code,t.reason_phrase):r.notify(487,n)}),e.refer_to.uri.hasHeader("replaces")){var o=decodeURIComponent(e.refer_to.uri.getHeader("replaces"));s.extraHeaders=m.cloneArray(s.extraHeaders),s.extraHeaders.push("Replaces: ".concat(o))}i.connect(e.refer_to.uri.toAor(),s,t)}).call(t,s,i)},reject:function(){(function(){r.notify(603)}).call(t)}})}},{key:"_receiveNotify",value:function(e){switch(R("receiveNotify()"),e.event||e.reply(400),e.event.event){case"refer":var t,n;if(e.event.params&&e.event.params.id)t=e.event.params.id,n=this._referSubscribers[t];else{if(1!==Object.keys(this._referSubscribers).length)return void e.reply(400,"Missing event id parameter");n=this._referSubscribers[Object.keys(this._referSubscribers)[0]]}if(!n)return void e.reply(481,"Subscription does not exist");n.receiveNotify(e),e.reply(200);break;default:e.reply(489)}}},{key:"_receiveReplaces",value:function(e){var t=this;R("receiveReplaces()"),this.emit("replaces",{request:e,accept:function(r){(function(t){var r=this;if(this._status!==I.STATUS_WAITING_FOR_ACK&&this._status!==I.STATUS_CONFIRMED)return!1;var s=new n(this._ua);s.on("confirmed",function(){r.terminate()}),s.init_incoming(e,t)}).call(t,r)},reject:function(){(function(){R("Replaced INVITE rejected by the user"),e.reply(486)}).call(t)}})}},{key:"_sendInitialRequest",value:function(e,t,n){var r=this,s=new T(this._ua,this._request,{onRequestTimeout:function(){r.onRequestTimeout()},onTransportError:function(){r.onTransportError()},onAuthenticated:function(e){r._request=e},onReceiveResponse:function(e){r._receiveInviteResponse(e)}});Promise.resolve().then(function(){return n||(e.audio||e.video?(r._localMediaStreamLocallyGenerated=!0,navigator.mediaDevices.getUserMedia(e).catch(function(e){if(r._status===I.STATUS_TERMINATED)throw new Error("terminated");throw r._failed("local",null,d.causes.USER_DENIED_MEDIA_ACCESS),w('emit "getusermediafailed" [error:%o]',e),r.emit("getusermediafailed",e),e})):void 0)}).then(function(e){if(r._status===I.STATUS_TERMINATED)throw new Error("terminated");return r._localMediaStream=e,e&&e.getTracks().forEach(function(t){r._connection.addTrack(t,e)}),r._connecting(r._request),r._createLocalDescription("offer",t).catch(function(e){throw r._failed("local",null,d.causes.WEBRTC_ERROR),e})}).then(function(e){if(r._is_canceled||r._status===I.STATUS_TERMINATED)throw new Error("terminated");r._request.body=e,r._status=I.STATUS_INVITE_SENT,R('emit "sending" [request:%o]',r._request),r.emit("sending",{request:r._request}),s.send()}).catch(function(e){r._status!==I.STATUS_TERMINATED&&w(e)})}},{key:"_getDTMFRTPSender",value:function(){var e=this._connection.getSenders().find(function(e){return e.track&&"audio"===e.track.kind});if(e&&e.dtmf)return e.dtmf;w("sendDTMF() | no local audio track to send DTMF with")}},{key:"_receiveInviteResponse",value:function(e){var t=this;if(R("receiveInviteResponse()"),this._dialog&&e.status_code>=200&&e.status_code<=299){if(this._dialog.id.call_id===e.call_id&&this._dialog.id.local_tag===e.from_tag&&this._dialog.id.remote_tag===e.to_tag)return void this.sendRequest(d.ACK);var n=new y(this,e,"UAC");return void 0!==n.error?void R(n.error):(this.sendRequest(d.ACK),void this.sendRequest(d.BYE))}if(this._is_canceled)e.status_code>=100&&e.status_code<200?this._request.cancel(this._cancel_reason):e.status_code>=200&&e.status_code<299&&this._acceptAndTerminate(e);else if(this._status===I.STATUS_INVITE_SENT||this._status===I.STATUS_1XX_RECEIVED)switch(!0){case/^100$/.test(e.status_code):this._status=I.STATUS_1XX_RECEIVED;break;case/^1[0-9]{2}$/.test(e.status_code):if(!e.to_tag){R("1xx response received without to tag");break}if(e.hasHeader("contact")&&!this._createDialog(e,"UAC",!0))break;if(this._status=I.STATUS_1XX_RECEIVED,!e.body){this._progress("remote",e);break}var r={originator:"remote",type:"answer",sdp:e.body};R('emit "sdp"'),this.emit("sdp",r);var s=new RTCSessionDescription({type:"answer",sdp:r.sdp});this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){return t._connection.setRemoteDescription(s)}).then(function(){return t._progress("remote",e)}).catch(function(e){w('emit "peerconnection:setremotedescriptionfailed" [error:%o]',e),t.emit("peerconnection:setremotedescriptionfailed",e)});break;case/^2[0-9]{2}$/.test(e.status_code):if(this._status=I.STATUS_CONFIRMED,!e.body){this._acceptAndTerminate(e,400,d.causes.MISSING_SDP),this._failed("remote",e,d.causes.BAD_MEDIA_DESCRIPTION);break}if(!this._createDialog(e,"UAC"))break;var i={originator:"remote",type:"answer",sdp:e.body};R('emit "sdp"'),this.emit("sdp",i);var o=new RTCSessionDescription({type:"answer",sdp:i.sdp});this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){if("stable"===t._connection.signalingState)return t._connection.createOffer(t._rtcOfferConstraints).then(function(e){return t._connection.setLocalDescription(e)}).catch(function(n){t._acceptAndTerminate(e,500,n.toString()),t._failed("local",e,d.causes.WEBRTC_ERROR)})}).then(function(){t._connection.setRemoteDescription(o).then(function(){t._handleSessionTimersInIncomingResponse(e),t._accepted("remote",e),t.sendRequest(d.ACK),t._confirmed("local",null)}).catch(function(n){t._acceptAndTerminate(e,488,"Not Acceptable Here"),t._failed("remote",e,d.causes.BAD_MEDIA_DESCRIPTION),w('emit "peerconnection:setremotedescriptionfailed" [error:%o]',n),t.emit("peerconnection:setremotedescriptionfailed",n)})});break;default:var l=m.sipErrorCause(e.status_code);this._failed("remote",e,l)}}},{key:"_sendReinvite",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};R("sendReinvite()");var n=m.cloneArray(t.extraHeaders),r=m.cloneObject(t.eventHandlers),s=t.rtcOfferConstraints||this._rtcOfferConstraints||null,i=!1;function o(e){r.failed&&r.failed(e)}n.push("Contact: ".concat(this._contact)),n.push("Content-Type: application/sdp"),this._sessionTimers.running&&n.push("Session-Expires: ".concat(this._sessionTimers.currentExpires,";refresher=").concat(this._sessionTimers.refresher?"uac":"uas")),this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){return e._createLocalDescription("offer",s)}).then(function(t){var s={originator:"local",type:"offer",sdp:t=e._mangleOffer(t)};R('emit "sdp"'),e.emit("sdp",s),e.sendRequest(d.INVITE,{extraHeaders:n,body:t,eventHandlers:{onSuccessResponse:function(t){(function(e){var t=this;if(this._status===I.STATUS_TERMINATED)return;if(this.sendRequest(d.ACK),i)return;if(this._handleSessionTimersInIncomingResponse(e),!e.body)return void o.call(this);if(!e.hasHeader("Content-Type")||"application/sdp"!==e.getHeader("Content-Type").toLowerCase())return void o.call(this);var n={originator:"remote",type:"answer",sdp:e.body};R('emit "sdp"'),this.emit("sdp",n);var s=new RTCSessionDescription({type:"answer",sdp:n.sdp});this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){return t._connection.setRemoteDescription(s)}).then(function(){r.succeeded&&r.succeeded(e)}).catch(function(e){o.call(t),w('emit "peerconnection:setremotedescriptionfailed" [error:%o]',e),t.emit("peerconnection:setremotedescriptionfailed",e)})}).call(e,t),i=!0},onErrorResponse:function(t){o.call(e,t)},onTransportError:function(){e.onTransportError()},onRequestTimeout:function(){e.onRequestTimeout()},onDialogError:function(){e.onDialogError()}}})}).catch(function(){o()})}},{key:"_sendUpdate",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};R("sendUpdate()");var n=m.cloneArray(t.extraHeaders),r=m.cloneObject(t.eventHandlers),s=t.rtcOfferConstraints||this._rtcOfferConstraints||null,i=t.sdpOffer||!1,o=!1;function l(e){var t=this;if(this._status!==I.STATUS_TERMINATED&&!o)if(this._handleSessionTimersInIncomingResponse(e),i){if(!e.body)return void u.call(this);if(!e.hasHeader("Content-Type")||"application/sdp"!==e.getHeader("Content-Type").toLowerCase())return void u.call(this);var n={originator:"remote",type:"answer",sdp:e.body};R('emit "sdp"'),this.emit("sdp",n);var s=new RTCSessionDescription({type:"answer",sdp:n.sdp});this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){return t._connection.setRemoteDescription(s)}).then(function(){r.succeeded&&r.succeeded(e)}).catch(function(e){u.call(t),w('emit "peerconnection:setremotedescriptionfailed" [error:%o]',e),t.emit("peerconnection:setremotedescriptionfailed",e)})}else r.succeeded&&r.succeeded(e)}function u(e){r.failed&&r.failed(e)}n.push("Contact: ".concat(this._contact)),this._sessionTimers.running&&n.push("Session-Expires: ".concat(this._sessionTimers.currentExpires,";refresher=").concat(this._sessionTimers.refresher?"uac":"uas")),i?(n.push("Content-Type: application/sdp"),this._connectionPromiseQueue=this._connectionPromiseQueue.then(function(){return e._createLocalDescription("offer",s)}).then(function(t){var r={originator:"local",type:"offer",sdp:t=e._mangleOffer(t)};R('emit "sdp"'),e.emit("sdp",r),e.sendRequest(d.UPDATE,{extraHeaders:n,body:t,eventHandlers:{onSuccessResponse:function(t){l.call(e,t),o=!0},onErrorResponse:function(t){u.call(e,t)},onTransportError:function(){e.onTransportError()},onRequestTimeout:function(){e.onRequestTimeout()},onDialogError:function(){e.onDialogError()}}})}).catch(function(){u.call(e)})):this.sendRequest(d.UPDATE,{extraHeaders:n,eventHandlers:{onSuccessResponse:function(t){l.call(e,t)},onErrorResponse:function(t){u.call(e,t)},onTransportError:function(){e.onTransportError()},onRequestTimeout:function(){e.onRequestTimeout()},onDialogError:function(){e.onDialogError()}}})}},{key:"_acceptAndTerminate",value:function(e,t,n){R("acceptAndTerminate()");var r=[];t&&(n=n||d.REASON_PHRASE[t]||"",r.push("Reason: SIP ;cause=".concat(t,'; text="').concat(n,'"'))),(this._dialog||this._createDialog(e,"UAC"))&&(this.sendRequest(d.ACK),this.sendRequest(d.BYE,{extraHeaders:r})),this._status=I.STATUS_TERMINATED}},{key:"_mangleOffer",value:function(e){if(!this._localHold&&!this._remoteHold)return e;if(e=f.parse(e),this._localHold&&!this._remoteHold){R("mangleOffer() | me on hold, mangling offer");var t,n=s(e.media);try{for(n.s();!(t=n.n()).done;){var r=t.value;-1!==O.indexOf(r.type)&&(r.direction?"sendrecv"===r.direction?r.direction="sendonly":"recvonly"===r.direction&&(r.direction="inactive"):r.direction="sendonly")}}catch(e){n.e(e)}finally{n.f()}}else if(this._localHold&&this._remoteHold){R("mangleOffer() | both on hold, mangling offer");var i,o=s(e.media);try{for(o.s();!(i=o.n()).done;){var l=i.value;-1!==O.indexOf(l.type)&&(l.direction="inactive")}}catch(e){o.e(e)}finally{o.f()}}else if(this._remoteHold){R("mangleOffer() | remote on hold, mangling offer");var u,a=s(e.media);try{for(a.s();!(u=a.n()).done;){var c=u.value;-1!==O.indexOf(c.type)&&(c.direction?"sendrecv"===c.direction?c.direction="recvonly":"recvonly"===c.direction&&(c.direction="inactive"):c.direction="recvonly")}}catch(e){a.e(e)}finally{a.f()}}return f.write(e)}},{key:"_setLocalMediaStatus",value:function(){var e=!0,t=!0;(this._localHold||this._remoteHold)&&(e=!1,t=!1),this._audioMuted&&(e=!1),this._videoMuted&&(t=!1),this._toggleMuteAudio(!e),this._toggleMuteVideo(!t)}},{key:"_handleSessionTimersInIncomingRequest",value:function(e,t){var n;this._sessionTimers.enabled&&(e.session_expires&&e.session_expires>=d.MIN_SESSION_EXPIRES?(this._sessionTimers.currentExpires=e.session_expires,n=e.session_expires_refresher||"uas"):(this._sessionTimers.currentExpires=this._sessionTimers.defaultExpires,n="uas"),t.push("Session-Expires: ".concat(this._sessionTimers.currentExpires,";refresher=").concat(n)),this._sessionTimers.refresher="uas"===n,this._runSessionTimer())}},{key:"_handleSessionTimersInIncomingResponse",value:function(e){var t;this._sessionTimers.enabled&&(e.session_expires&&e.session_expires>=d.MIN_SESSION_EXPIRES?(this._sessionTimers.currentExpires=e.session_expires,t=e.session_expires_refresher||"uac"):(this._sessionTimers.currentExpires=this._sessionTimers.defaultExpires,t="uac"),this._sessionTimers.refresher="uac"===t,this._runSessionTimer())}},{key:"_runSessionTimer",value:function(){var e=this,t=this._sessionTimers.currentExpires;this._sessionTimers.running=!0,clearTimeout(this._sessionTimers.timer),this._sessionTimers.refresher?this._sessionTimers.timer=setTimeout(function(){e._status!==I.STATUS_TERMINATED&&(R("runSessionTimer() | sending session refresh request"),e._sessionTimers.refreshMethod===d.UPDATE?e._sendUpdate():e._sendReinvite())},500*t):this._sessionTimers.timer=setTimeout(function(){e._status!==I.STATUS_TERMINATED&&(w("runSessionTimer() | timer expired, terminating the session"),e.terminate({cause:d.causes.REQUEST_TIMEOUT,status_code:408,reason_phrase:"Session Timer Expired"}))},1100*t)}},{key:"_toggleMuteAudio",value:function(e){var t,n=s(this._connection.getSenders().filter(function(e){return e.track&&"audio"===e.track.kind}));try{for(n.s();!(t=n.n()).done;){t.value.track.enabled=!e}}catch(e){n.e(e)}finally{n.f()}}},{key:"_toggleMuteVideo",value:function(e){var t,n=s(this._connection.getSenders().filter(function(e){return e.track&&"video"===e.track.kind}));try{for(n.s();!(t=n.n()).done;){t.value.track.enabled=!e}}catch(e){n.e(e)}finally{n.f()}}},{key:"_newRTCSession",value:function(e,t){R("newRTCSession()"),this._ua.newRTCSession(this,{originator:e,session:this,request:t})}},{key:"_connecting",value:function(e){R("session connecting"),R('emit "connecting"'),this.emit("connecting",{request:e})}},{key:"_progress",value:function(e,t){R("session progress"),R('emit "progress"'),this.emit("progress",{originator:e,response:t||null})}},{key:"_accepted",value:function(e,t){R("session accepted"),this._start_time=new Date,R('emit "accepted"'),this.emit("accepted",{originator:e,response:t||null})}},{key:"_confirmed",value:function(e,t){R("session confirmed"),this._is_confirmed=!0,R('emit "confirmed"'),this.emit("confirmed",{originator:e,ack:t||null})}},{key:"_ended",value:function(e,t,n){R("session ended"),this._end_time=new Date,this._close(),R('emit "ended"'),this.emit("ended",{originator:e,message:t||null,cause:n})}},{key:"_failed",value:function(e,t,n){R("session failed"),R('emit "_failed"'),this.emit("_failed",{originator:e,message:t||null,cause:n}),this._close(),R('emit "failed"'),this.emit("failed",{originator:e,message:t||null,cause:n})}},{key:"_onhold",value:function(e){R("session onhold"),this._setLocalMediaStatus(),R('emit "hold"'),this.emit("hold",{originator:e})}},{key:"_onunhold",value:function(e){R("session onunhold"),this._setLocalMediaStatus(),R('emit "unhold"'),this.emit("unhold",{originator:e})}},{key:"_onmute",value:function(e){var t=e.audio,n=e.video;R("session onmute"),this._setLocalMediaStatus(),R('emit "muted"'),this.emit("muted",{audio:t,video:n})}},{key:"_onunmute",value:function(e){var t=e.audio,n=e.video;R("session onunmute"),this._setLocalMediaStatus(),R('emit "unmuted"'),this.emit("unmuted",{audio:t,video:n})}},{key:"C",get:function(){return I}},{key:"causes",get:function(){return d.causes}},{key:"id",get:function(){return this._id}},{key:"connection",get:function(){return this._connection}},{key:"contact",get:function(){return this._contact}},{key:"direction",get:function(){return this._direction}},{key:"local_identity",get:function(){return this._local_identity}},{key:"remote_identity",get:function(){return this._remote_identity}},{key:"start_time",get:function(){return this._start_time}},{key:"end_time",get:function(){return this._end_time}},{key:"data",get:function(){return this._data},set:function(e){this._data=e}},{key:"status",get:function(){return this._status}}]),n}()},{"./Constants":2,"./Dialog":3,"./Exceptions":6,"./RTCSession/DTMF":13,"./RTCSession/Info":14,"./RTCSession/ReferNotifier":15,"./RTCSession/ReferSubscriber":16,"./RequestSender":18,"./SIPMessage":19,"./Timers":21,"./Transactions":22,"./URI":25,"./Utils":26,debug:30,events:29,"sdp-transform":35}],13:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function i(e,t){return(i=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function o(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=l(e);if(t){var i=l(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(this,n)}}function l(e){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var u=e("events").EventEmitter,a=e("../Constants"),c=e("../Exceptions"),h=e("../Utils"),f=e("debug")("JsSIP:RTCSession:DTMF");e("debug")("JsSIP:ERROR:RTCSession:DTMF").log=console.warn.bind(console);var d={MIN_DURATION:70,MAX_DURATION:6e3,DEFAULT_DURATION:100,MIN_INTER_TONE_GAP:50,DEFAULT_INTER_TONE_GAP:500};t.exports=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&i(e,t)}(_,u);var t,n,r,l=o(_);function _(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,_),(t=l.call(this))._session=e,t._direction=null,t._tone=null,t._duration=null,t._request=null,t}return t=_,(n=[{key:"send",value:function(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};if(void 0===e)throw new TypeError("Not enough arguments");if(this._direction="outgoing",this._session.status!==this._session.C.STATUS_CONFIRMED&&this._session.status!==this._session.C.STATUS_WAITING_FOR_ACK)throw new c.InvalidStateError(this._session.status);var r=h.cloneArray(n.extraHeaders);if(this.eventHandlers=h.cloneObject(n.eventHandlers),"string"==typeof e)e=e.toUpperCase();else{if("number"!=typeof e)throw new TypeError("Invalid tone: ".concat(e));e=e.toString()}if(!e.match(/^[0-9A-DR#*]$/))throw new TypeError("Invalid tone: ".concat(e));this._tone=e,this._duration=n.duration,r.push("Content-Type: application/dtmf-relay");var s="Signal=".concat(this._tone,"\r\n");s+="Duration=".concat(this._duration),this._session.newDTMF({originator:"local",dtmf:this,request:this._request}),this._session.sendRequest(a.INFO,{extraHeaders:r,eventHandlers:{onSuccessResponse:function(e){t.emit("succeeded",{originator:"remote",response:e})},onErrorResponse:function(e){t.eventHandlers.onFailed&&t.eventHandlers.onFailed(),t.emit("failed",{originator:"remote",response:e})},onRequestTimeout:function(){t._session.onRequestTimeout()},onTransportError:function(){t._session.onTransportError()},onDialogError:function(){t._session.onDialogError()}},body:s})}},{key:"init_incoming",value:function(e){var t=/^(Signal\s*?=\s*?)([0-9A-D#*]{1})(\s)?.*/,n=/^(Duration\s?=\s?)([0-9]{1,4})(\s)?.*/;if(this._direction="incoming",this._request=e,e.reply(200),e.body){var r=e.body.split("\n");r.length>=1&&t.test(r[0])&&(this._tone=r[0].replace(t,"$2")),r.length>=2&&n.test(r[1])&&(this._duration=parseInt(r[1].replace(n,"$2"),10))}this._duration||(this._duration=d.DEFAULT_DURATION),this._tone?this._session.newDTMF({originator:"remote",dtmf:this,request:e}):f("invalid INFO DTMF received, discarded")}},{key:"tone",get:function(){return this._tone}},{key:"duration",get:function(){return this._duration}}])&&s(t.prototype,n),r&&s(t,r),_}(),t.exports.C=d},{"../Constants":2,"../Exceptions":6,"../Utils":26,debug:30,events:29}],14:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function i(e,t){return(i=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function o(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=l(e);if(t){var i=l(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(this,n)}}function l(e){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var u=e("events").EventEmitter;e("debug")("JsSIP:ERROR:RTCSession:Info").log=console.warn.bind(console);var a=e("../Constants"),c=e("../Exceptions"),h=e("../Utils");t.exports=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&i(e,t)}(f,u);var t,n,r,l=o(f);function f(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,f),(t=l.call(this))._session=e,t._direction=null,t._contentType=null,t._body=null,t}return t=f,(n=[{key:"send",value:function(e,t){var n=this,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};if(this._direction="outgoing",void 0===e)throw new TypeError("Not enough arguments");if(this._session.status!==this._session.C.STATUS_CONFIRMED&&this._session.status!==this._session.C.STATUS_WAITING_FOR_ACK)throw new c.InvalidStateError(this._session.status);this._contentType=e,this._body=t;var s=h.cloneArray(r.extraHeaders);s.push("Content-Type: ".concat(e)),this._session.newInfo({originator:"local",info:this,request:this.request}),this._session.sendRequest(a.INFO,{extraHeaders:s,eventHandlers:{onSuccessResponse:function(e){n.emit("succeeded",{originator:"remote",response:e})},onErrorResponse:function(e){n.emit("failed",{originator:"remote",response:e})},onTransportError:function(){n._session.onTransportError()},onRequestTimeout:function(){n._session.onRequestTimeout()},onDialogError:function(){n._session.onDialogError()}},body:t})}},{key:"init_incoming",value:function(e){this._direction="incoming",this.request=e,e.reply(200),this._contentType=e.hasHeader("Content-Type")?e.getHeader("Content-Type").toLowerCase():void 0,this._body=e.body,this._session.newInfo({originator:"remote",info:this,request:e})}},{key:"contentType",get:function(){return this._contentType}},{key:"body",get:function(){return this._body}}])&&s(t.prototype,n),r&&s(t,r),f}()},{"../Constants":2,"../Exceptions":6,"../Utils":26,debug:30,events:29}],15:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var s=e("../Constants"),i=e("debug")("JsSIP:RTCSession:ReferNotifier"),o={event_type:"refer",body_type:"message/sipfrag;version=2.0",expires:300};t.exports=function(){function e(t,n,r){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this._session=t,this._id=n,this._expires=r||o.expires,this._active=!0,this.notify(100)}var t,n,l;return t=e,(n=[{key:"notify",value:function(e,t){var n;(i("notify()"),!1!==this._active)&&(t=t||s.REASON_PHRASE[e]||"",n=e>=200?"terminated;reason=noresource":"active;expires=".concat(this._expires),this._session.sendRequest(s.NOTIFY,{extraHeaders:["Event: ".concat(o.event_type,";id=").concat(this._id),"Subscription-State: ".concat(n),"Content-Type: ".concat(o.body_type)],body:"SIP/2.0 ".concat(e," ").concat(t),eventHandlers:{onErrorResponse:function(){this._active=!1}}}))}}])&&r(t.prototype,n),l&&r(t,l),e}()},{"../Constants":2,debug:30}],16:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function i(e,t){return(i=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function o(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=l(e);if(t){var i=l(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(this,n)}}function l(e){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var u=e("events").EventEmitter,a=e("../Constants"),c=e("../Grammar"),h=e("../Utils"),f=e("debug")("JsSIP:RTCSession:ReferSubscriber");t.exports=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&i(e,t)}(d,u);var t,n,r,l=o(d);function d(e){var t;return function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,d),(t=l.call(this))._id=null,t._session=e,t}return t=d,(n=[{key:"sendRefer",value:function(e){var t=this,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};f("sendRefer()");var r=h.cloneArray(n.extraHeaders),s=h.cloneObject(n.eventHandlers);for(var i in s)Object.prototype.hasOwnProperty.call(s,i)&&this.on(i,s[i]);var o=null;n.replaces&&(o=n.replaces._request.call_id,o+=";to-tag=".concat(n.replaces._to_tag),o+=";from-tag=".concat(n.replaces._from_tag),o=encodeURIComponent(o));var l="Refer-To: <".concat(e).concat(o?"?Replaces=".concat(o):"",">");r.push(l);var u="Referred-By: <".concat(this._session._ua._configuration.uri._scheme,":").concat(this._session._ua._configuration.uri._user,"@").concat(this._session._ua._configuration.uri._host,">");r.push(u),r.push("Contact: ".concat(this._session.contact));var c=this._session.sendRequest(a.REFER,{extraHeaders:r,eventHandlers:{onSuccessResponse:function(e){t._requestSucceeded(e)},onErrorResponse:function(e){t._requestFailed(e,a.causes.REJECTED)},onTransportError:function(){t._requestFailed(null,a.causes.CONNECTION_ERROR)},onRequestTimeout:function(){t._requestFailed(null,a.causes.REQUEST_TIMEOUT)},onDialogError:function(){t._requestFailed(null,a.causes.DIALOG_ERROR)}}});this._id=c.cseq}},{key:"receiveNotify",value:function(e){if(f("receiveNotify()"),e.body){var t=c.parse(e.body.trim(),"Status_Line");if(-1!==t)switch(!0){case/^100$/.test(t.status_code):this.emit("trying",{request:e,status_line:t});break;case/^1[0-9]{2}$/.test(t.status_code):this.emit("progress",{request:e,status_line:t});break;case/^2[0-9]{2}$/.test(t.status_code):this.emit("accepted",{request:e,status_line:t});break;default:this.emit("failed",{request:e,status_line:t})}else f('receiveNotify() | error parsing NOTIFY body: "'.concat(e.body,'"'))}}},{key:"_requestSucceeded",value:function(e){f("REFER succeeded"),f('emit "requestSucceeded"'),this.emit("requestSucceeded",{response:e})}},{key:"_requestFailed",value:function(e,t){f("REFER failed"),f('emit "requestFailed"'),this.emit("requestFailed",{response:e||null,cause:t})}},{key:"id",get:function(){return this._id}}])&&s(t.prototype,n),r&&s(t,r),d}()},{"../Constants":2,"../Grammar":7,"../Utils":26,debug:30,events:29}],17:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var s=e("./Utils"),i=e("./Constants"),o=e("./SIPMessage"),l=e("./RequestSender"),u=e("debug")("JsSIP:Registrator");t.exports=function(){function e(t,n){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e);this._ua=t,this._transport=n,this._registrar=t.configuration.registrar_server,this._expires=t.configuration.register_expires,this._call_id=s.createRandomToken(22),this._cseq=0,this._to_uri=t.configuration.uri,this._registrationTimer=null,this._registering=!1,this._registered=!1,this._contact=this._ua.contact.toString(),this._contact+=";+sip.ice",this._extraHeaders=[],this._extraContactParams="",this._contact+=";reg-id=".concat(1),this._contact+=';+sip.instance="<urn:uuid:'.concat(this._ua.configuration.instance_id,'>"')}var t,n,a;return t=e,(n=[{key:"setExtraHeaders",value:function(e){Array.isArray(e)||(e=[]),this._extraHeaders=e.slice()}},{key:"setExtraContactParams",value:function(e){for(var t in e instanceof Object||(e={}),this._extraContactParams="",e)if(Object.prototype.hasOwnProperty.call(e,t)){var n=e[t];this._extraContactParams+=";".concat(t),n&&(this._extraContactParams+="=".concat(n))}}},{key:"register",value:function(){var e=this;if(this._registering)u("Register request in progress...");else{var t=this._extraHeaders.slice();t.push("Contact: ".concat(this._contact,";expires=").concat(this._expires).concat(this._extraContactParams)),t.push("Expires: ".concat(this._expires));var n=new o.OutgoingRequest(i.REGISTER,this._registrar,this._ua,{to_uri:this._to_uri,call_id:this._call_id,cseq:this._cseq+=1},t),r=new l(this._ua,n,{onRequestTimeout:function(){e._registrationFailure(null,i.causes.REQUEST_TIMEOUT)},onTransportError:function(){e._registrationFailure(null,i.causes.CONNECTION_ERROR)},onAuthenticated:function(){e._cseq+=1},onReceiveResponse:function(t){if(t.cseq===e._cseq)switch(null!==e._registrationTimer&&(clearTimeout(e._registrationTimer),e._registrationTimer=null),!0){case/^1[0-9]{2}$/.test(t.status_code):break;case/^2[0-9]{2}$/.test(t.status_code):if(e._registering=!1,!t.hasHeader("Contact")){u("no Contact header in response to REGISTER, response ignored");break}var n=t.headers.Contact.reduce(function(e,t){return e.concat(t.parsed)},[]).find(function(t){return t.uri.user===e._ua.contact.uri.user});if(!n){u("no Contact header pointing to us, response ignored");break}var r=n.getParam("expires");!r&&t.hasHeader("expires")&&(r=t.getHeader("expires")),r||(r=e._expires),(r=Number(r))<10&&(r=10);var o=r>64?1e3*r/2+Math.floor(1e3*(r/2-32)*Math.random()):1e3*r-5e3;e._registrationTimer=setTimeout(function(){e._registrationTimer=null,0===e._ua.listeners("registrationExpiring").length?e.register():e._ua.emit("registrationExpiring")},o),n.hasParam("temp-gruu")&&(e._ua.contact.temp_gruu=n.getParam("temp-gruu").replace(/"/g,"")),n.hasParam("pub-gruu")&&(e._ua.contact.pub_gruu=n.getParam("pub-gruu").replace(/"/g,"")),e._registered||(e._registered=!0,e._ua.registered({response:t}));break;case/^423$/.test(t.status_code):t.hasHeader("min-expires")?(e._expires=Number(t.getHeader("min-expires")),e._expires<10&&(e._expires=10),e.register()):(u("423 response received for REGISTER without Min-Expires"),e._registrationFailure(t,i.causes.SIP_FAILURE_CODE));break;default:var l=s.sipErrorCause(t.status_code);e._registrationFailure(t,l)}}});this._registering=!0,r.send()}}},{key:"unregister",value:function(){var e=this,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};if(this._registered){this._registered=!1,null!==this._registrationTimer&&(clearTimeout(this._registrationTimer),this._registrationTimer=null);var n=this._extraHeaders.slice();t.all?n.push("Contact: *".concat(this._extraContactParams)):n.push("Contact: ".concat(this._contact,";expires=0").concat(this._extraContactParams)),n.push("Expires: 0");var r=new o.OutgoingRequest(i.REGISTER,this._registrar,this._ua,{to_uri:this._to_uri,call_id:this._call_id,cseq:this._cseq+=1},n);new l(this._ua,r,{onRequestTimeout:function(){e._unregistered(null,i.causes.REQUEST_TIMEOUT)},onTransportError:function(){e._unregistered(null,i.causes.CONNECTION_ERROR)},onAuthenticated:function(){e._cseq+=1},onReceiveResponse:function(t){switch(!0){case/^1[0-9]{2}$/.test(t.status_code):break;case/^2[0-9]{2}$/.test(t.status_code):e._unregistered(t);break;default:var n=s.sipErrorCause(t.status_code);e._unregistered(t,n)}}}).send()}else u("already unregistered")}},{key:"close",value:function(){this._registered&&this.unregister()}},{key:"onTransportClosed",value:function(){this._registering=!1,null!==this._registrationTimer&&(clearTimeout(this._registrationTimer),this._registrationTimer=null),this._registered&&(this._registered=!1,this._ua.unregistered({}))}},{key:"_registrationFailure",value:function(e,t){this._registering=!1,this._ua.registrationFailed({response:e||null,cause:t}),this._registered&&(this._registered=!1,this._ua.unregistered({response:e||null,cause:t}))}},{key:"_unregistered",value:function(e,t){this._registering=!1,this._registered=!1,this._ua.unregistered({response:e||null,cause:t||null})}},{key:"registered",get:function(){return this._registered}}])&&r(t.prototype,n),a&&r(t,a),e}()},{"./Constants":2,"./RequestSender":18,"./SIPMessage":19,"./Utils":26,debug:30}],18:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var s=e("./Constants"),i=e("./DigestAuthentication"),o=e("./Transactions"),l=e("debug")("JsSIP:RequestSender"),u={onRequestTimeout:function(){},onTransportError:function(){},onReceiveResponse:function(){},onAuthenticated:function(){}};t.exports=function(){function e(t,n,r){for(var i in function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),this._ua=t,this._eventHandlers=r,this._method=n.method,this._request=n,this._auth=null,this._challenged=!1,this._staled=!1,u)Object.prototype.hasOwnProperty.call(u,i)&&(this._eventHandlers[i]||(this._eventHandlers[i]=u[i]));t.status!==t.C.STATUS_USER_CLOSED||this._method===s.BYE&&this._method===s.ACK||this._eventHandlers.onTransportError()}var t,n,a;return t=e,(n=[{key:"send",value:function(){var e=this,t={onRequestTimeout:function(){e._eventHandlers.onRequestTimeout()},onTransportError:function(){e._eventHandlers.onTransportError()},onReceiveResponse:function(t){e._receiveResponse(t)}};switch(this._method){case"INVITE":this.clientTransaction=new o.InviteClientTransaction(this._ua,this._ua.transport,this._request,t);break;case"ACK":this.clientTransaction=new o.AckClientTransaction(this._ua,this._ua.transport,this._request,t);break;default:this.clientTransaction=new o.NonInviteClientTransaction(this._ua,this._ua.transport,this._request,t)}this._ua._configuration.authorization_jwt&&this._request.setHeader("Authorization",this._ua._configuration.authorization_jwt),this.clientTransaction.send()}},{key:"_receiveResponse",value:function(e){var t,n,r=e.status_code;if(401!==r&&407!==r||null===this._ua.configuration.password&&null===this._ua.configuration.ha1)this._eventHandlers.onReceiveResponse(e);else{if(401===e.status_code?(t=e.parseHeader("www-authenticate"),n="authorization"):(t=e.parseHeader("proxy-authenticate"),n="proxy-authorization"),!t)return l("".concat(e.status_code," with wrong or missing challenge, cannot authenticate")),void this._eventHandlers.onReceiveResponse(e);if(!this._challenged||!this._staled&&!0===t.stale){if(this._auth||(this._auth=new i({username:this._ua.configuration.authorization_user,password:this._ua.configuration.password,realm:this._ua.configuration.realm,ha1:this._ua.configuration.ha1})),!this._auth.authenticate(this._request,t))return void this._eventHandlers.onReceiveResponse(e);this._challenged=!0,this._ua.set("realm",this._auth.get("realm")),this._ua.set("ha1",this._auth.get("ha1")),t.stale&&(this._staled=!0),this._request=this._request.clone(),this._request.cseq+=1,this._request.setHeader("cseq","".concat(this._request.cseq," ").concat(this._method)),this._request.setHeader(n,this._auth.toString()),this._eventHandlers.onAuthenticated(this._request),this.send()}else this._eventHandlers.onReceiveResponse(e)}}}])&&r(t.prototype,n),a&&r(t,a),e}()},{"./Constants":2,"./DigestAuthentication":5,"./Transactions":22,debug:30}],19:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&i(e,t)}function i(e,t){return(i=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function o(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=l(e);if(t){var i=l(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(this,n)}}function l(e){return(l=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function u(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return a(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return a(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,s=function(){};return{s:s,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:s}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var i,o=!0,l=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return o=e.done,e},e:function(e){l=!0,i=e},f:function(){try{o||null==n.return||n.return()}finally{if(l)throw i}}}}function a(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function c(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function h(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function f(e,t,n){return t&&h(e.prototype,t),n&&h(e,n),e}var d=e("sdp-transform"),_=e("./Constants"),p=e("./Utils"),m=e("./NameAddrHeader"),v=e("./Grammar"),g=e("debug")("JsSIP:SIPMessage"),y=function(){function e(t,n,r,s,i,o){if(c(this,e),!t||!n||!r)return null;s=s||{},this.ua=r,this.headers={},this.method=t,this.ruri=n,this.body=o,this.extraHeaders=p.cloneArray(i),s.route_set?this.setHeader("route",s.route_set):r.configuration.use_preloaded_route&&this.setHeader("route","<".concat(r.transport.sip_uri,";lr>")),this.setHeader("via",""),this.setHeader("max-forwards",_.MAX_FORWARDS);var l=s.to_uri||n,u=s.to_tag?{tag:s.to_tag}:null,a=void 0!==s.to_display_name?s.to_display_name:null;this.to=new m(l,a,u),this.setHeader("to",this.to.toString());var h,f=s.from_uri||r.configuration.uri,d={tag:s.from_tag||p.newTag()};h=void 0!==s.from_display_name?s.from_display_name:r.configuration.display_name?r.configuration.display_name:null,this.from=new m(f,h,d),this.setHeader("from",this.from.toString());var v=s.call_id||r.configuration.jssip_id+p.createRandomToken(15);this.call_id=v,this.setHeader("call-id",v);var g=s.cseq||Math.floor(1e4*Math.random());this.cseq=g,this.setHeader("cseq","".concat(g," ").concat(t))}return f(e,[{key:"setHeader",value:function(e,t){for(var n=new RegExp("^\\s*".concat(e,"\\s*:"),"i"),r=0;r<this.extraHeaders.length;r++)n.test(this.extraHeaders[r])&&this.extraHeaders.splice(r,1);this.headers[p.headerize(e)]=Array.isArray(t)?t:[t]}},{key:"getHeader",value:function(e){var t=this.headers[p.headerize(e)];if(t){if(t[0])return t[0]}else{var n,r=new RegExp("^\\s*".concat(e,"\\s*:"),"i"),s=u(this.extraHeaders);try{for(s.s();!(n=s.n()).done;){var i=n.value;if(r.test(i))return i.substring(i.indexOf(":")+1).trim()}}catch(e){s.e(e)}finally{s.f()}}}},{key:"getHeaders",value:function(e){var t=this.headers[p.headerize(e)],n=[];if(t){var r,s=u(t);try{for(s.s();!(r=s.n()).done;){var i=r.value;n.push(i)}}catch(e){s.e(e)}finally{s.f()}return n}var o,l=new RegExp("^\\s*".concat(e,"\\s*:"),"i"),a=u(this.extraHeaders);try{for(a.s();!(o=a.n()).done;){var c=o.value;l.test(c)&&n.push(c.substring(c.indexOf(":")+1).trim())}}catch(e){a.e(e)}finally{a.f()}return n}},{key:"hasHeader",value:function(e){if(this.headers[p.headerize(e)])return!0;var t,n=new RegExp("^\\s*".concat(e,"\\s*:"),"i"),r=u(this.extraHeaders);try{for(r.s();!(t=r.n()).done;){var s=t.value;if(n.test(s))return!0}}catch(e){r.e(e)}finally{r.f()}return!1}},{key:"parseSDP",value:function(e){return!e&&this.sdp?this.sdp:(this.sdp=d.parse(this.body||""),this.sdp)}},{key:"toString",value:function(){var e="".concat(this.method," ").concat(this.ruri," SIP/2.0\r\n");for(var t in this.headers)if(Object.prototype.hasOwnProperty.call(this.headers,t)){var n,r=u(this.headers[t]);try{for(r.s();!(n=r.n()).done;){var s=n.value;e+="".concat(t,": ").concat(s,"\r\n")}}catch(e){r.e(e)}finally{r.f()}}var i,o=u(this.extraHeaders);try{for(o.s();!(i=o.n()).done;){var l=i.value;e+="".concat(l.trim(),"\r\n")}}catch(e){o.e(e)}finally{o.f()}var a=[];switch(this.method){case _.REGISTER:a.push("path","gruu");break;case _.INVITE:this.ua.configuration.session_timers&&a.push("timer"),(this.ua.contact.pub_gruu||this.ua.contact.temp_gruu)&&a.push("gruu"),a.push("ice","replaces");break;case _.UPDATE:this.ua.configuration.session_timers&&a.push("timer"),a.push("ice")}a.push("outbound");var c=this.ua.configuration.user_agent||_.USER_AGENT;if(e+="Allow: ".concat(_.ALLOWED_METHODS,"\r\n"),e+="Supported: ".concat(a,"\r\n"),e+="User-Agent: ".concat(c,"\r\n"),this.body){var h=p.str_utf8_length(this.body);e+="Content-Length: ".concat(h,"\r\n\r\n"),e+=this.body}else e+="Content-Length: 0\r\n\r\n";return e}},{key:"clone",value:function(){var t=new e(this.method,this.ruri,this.ua);return Object.keys(this.headers).forEach(function(e){t.headers[e]=this.headers[e].slice()},this),t.body=this.body,t.extraHeaders=p.cloneArray(this.extraHeaders),t.to=this.to,t.from=this.from,t.call_id=this.call_id,t.cseq=this.cseq,t}}]),e}(),T=function(e){s(n,y);var t=o(n);function n(e,r,s,i,o){var l;return c(this,n),(l=t.call(this,_.INVITE,e,r,s,i,o)).transaction=null,l}return f(n,[{key:"cancel",value:function(e){this.transaction.cancel(e)}},{key:"clone",value:function(){var e=new n(this.ruri,this.ua);return Object.keys(this.headers).forEach(function(t){e.headers[t]=this.headers[t].slice()},this),e.body=this.body,e.extraHeaders=p.cloneArray(this.extraHeaders),e.to=this.to,e.from=this.from,e.call_id=this.call_id,e.cseq=this.cseq,e.transaction=this.transaction,e}}]),n}(),C=function(){function e(){c(this,e),this.data=null,this.headers=null,this.method=null,this.via=null,this.via_branch=null,this.call_id=null,this.cseq=null,this.from=null,this.from_tag=null,this.to=null,this.to_tag=null,this.body=null,this.sdp=null}return f(e,[{key:"addHeader",value:function(e,t){var n={raw:t};e=p.headerize(e),this.headers[e]?this.headers[e].push(n):this.headers[e]=[n]}},{key:"getHeader",value:function(e){var t=this.headers[p.headerize(e)];if(t)return t[0]?t[0].raw:void 0}},{key:"getHeaders",value:function(e){var t=this.headers[p.headerize(e)],n=[];if(!t)return[];var r,s=u(t);try{for(s.s();!(r=s.n()).done;){var i=r.value;n.push(i.raw)}}catch(e){s.e(e)}finally{s.f()}return n}},{key:"hasHeader",value:function(e){return!!this.headers[p.headerize(e)]}},{key:"parseHeader",value:function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0;if(e=p.headerize(e),this.headers[e]){if(!(t>=this.headers[e].length)){var n=this.headers[e][t],r=n.raw;if(n.parsed)return n.parsed;var s=v.parse(r,e.replace(/-/g,"_"));return-1===s?(this.headers[e].splice(t,1),void g('error parsing "'.concat(e,'" header field with value "').concat(r,'"'))):(n.parsed=s,s)}g('not so many "'.concat(e,'" headers present'))}else g('header "'.concat(e,'" not present'))}},{key:"s",value:function(e,t){return this.parseHeader(e,t)}},{key:"setHeader",value:function(e,t){var n={raw:t};this.headers[p.headerize(e)]=[n]}},{key:"parseSDP",value:function(e){return!e&&this.sdp?this.sdp:(this.sdp=d.parse(this.body||""),this.sdp)}},{key:"toString",value:function(){return this.data}}]),e}(),S=function(e){s(n,C);var t=o(n);function n(e){var r;return c(this,n),(r=t.call(this)).ua=e,r.headers={},r.ruri=null,r.transport=null,r.server_transaction=null,r}return f(n,[{key:"reply",value:function(e,t,n,r,s,i){var o=[],l=this.getHeader("To");if(t=t||null,!(e=e||null)||e<100||e>699)throw new TypeError("Invalid status_code: ".concat(e));if(t&&"string"!=typeof t&&!(t instanceof String))throw new TypeError("Invalid reason_phrase: ".concat(t));t=t||_.REASON_PHRASE[e]||"",n=p.cloneArray(n);var a="SIP/2.0 ".concat(e," ").concat(t,"\r\n");if(this.method===_.INVITE&&e>100&&e<=200){var c,h=u(this.getHeaders("record-route"));try{for(h.s();!(c=h.n()).done;){var f=c.value;a+="Record-Route: ".concat(f,"\r\n")}}catch(e){h.e(e)}finally{h.f()}}var d,m=u(this.getHeaders("via"));try{for(m.s();!(d=m.n()).done;){var v=d.value;a+="Via: ".concat(v,"\r\n")}}catch(e){m.e(e)}finally{m.f()}!this.to_tag&&e>100?l+=";tag=".concat(p.newTag()):this.to_tag&&!this.s("to").hasParam("tag")&&(l+=";tag=".concat(this.to_tag)),a+="To: ".concat(l,"\r\n"),a+="From: ".concat(this.getHeader("From"),"\r\n"),a+="Call-ID: ".concat(this.call_id,"\r\n"),a+="CSeq: ".concat(this.cseq," ").concat(this.method,"\r\n");var g,y=u(n);try{for(y.s();!(g=y.n()).done;){var T=g.value;a+="".concat(T.trim(),"\r\n")}}catch(e){y.e(e)}finally{y.f()}switch(this.method){case _.INVITE:this.ua.configuration.session_timers&&o.push("timer"),(this.ua.contact.pub_gruu||this.ua.contact.temp_gruu)&&o.push("gruu"),o.push("ice","replaces");break;case _.UPDATE:this.ua.configuration.session_timers&&o.push("timer"),r&&o.push("ice"),o.push("replaces")}if(o.push("outbound"),this.method===_.OPTIONS?(a+="Allow: ".concat(_.ALLOWED_METHODS,"\r\n"),a+="Accept: ".concat(_.ACCEPTED_BODY_TYPES,"\r\n")):405===e?a+="Allow: ".concat(_.ALLOWED_METHODS,"\r\n"):415===e&&(a+="Accept: ".concat(_.ACCEPTED_BODY_TYPES,"\r\n")),a+="Supported: ".concat(o,"\r\n"),r){var C=p.str_utf8_length(r);a+="Content-Type: application/sdp\r\n",a+="Content-Length: ".concat(C,"\r\n\r\n"),a+=r}else a+="Content-Length: ".concat(0,"\r\n\r\n");this.server_transaction.receiveResponse(e,a,s,i)}},{key:"reply_sl",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:null,t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,n=this.getHeaders("via");if(!e||e<100||e>699)throw new TypeError("Invalid status_code: ".concat(e));if(t&&"string"!=typeof t&&!(t instanceof String))throw new TypeError("Invalid reason_phrase: ".concat(t));t=t||_.REASON_PHRASE[e]||"";var r,s="SIP/2.0 ".concat(e," ").concat(t,"\r\n"),i=u(n);try{for(i.s();!(r=i.n()).done;){var o=r.value;s+="Via: ".concat(o,"\r\n")}}catch(e){i.e(e)}finally{i.f()}var l=this.getHeader("To");!this.to_tag&&e>100?l+=";tag=".concat(p.newTag()):this.to_tag&&!this.s("to").hasParam("tag")&&(l+=";tag=".concat(this.to_tag)),s+="To: ".concat(l,"\r\n"),s+="From: ".concat(this.getHeader("From"),"\r\n"),s+="Call-ID: ".concat(this.call_id,"\r\n"),s+="CSeq: ".concat(this.cseq," ").concat(this.method,"\r\n"),s+="Content-Length: ".concat(0,"\r\n\r\n"),this.transport.send(s)}}]),n}(),E=function(e){s(n,C);var t=o(n);function n(){var e;return c(this,n),(e=t.call(this)).headers={},e.status_code=null,e.reason_phrase=null,e}return n}();t.exports={OutgoingRequest:y,InitialOutgoingInviteRequest:T,IncomingRequest:S,IncomingResponse:E}},{"./Constants":2,"./Grammar":7,"./NameAddrHeader":10,"./Utils":26,debug:30,"sdp-transform":35}],20:[function(e,t,n){"use strict";var r=e("./Utils"),s=e("./Grammar"),i=e("debug")("JsSIP:ERROR:Socket");i.log=console.warn.bind(console),n.isSocket=function(e){if(Array.isArray(e))return!1;if(void 0===e)return i("undefined JsSIP.Socket instance"),!1;try{if(!r.isString(e.url))throw i("missing or invalid JsSIP.Socket url property"),new Error;if(!r.isString(e.via_transport))throw i("missing or invalid JsSIP.Socket via_transport property"),new Error;if(-1===s.parse(e.sip_uri,"SIP_URI"))throw i("missing or invalid JsSIP.Socket sip_uri property"),new Error}catch(e){return!1}try{["connect","disconnect","send"].forEach(function(t){if(!r.isFunction(e[t]))throw i("missing or invalid JsSIP.Socket method: ".concat(t)),new Error})}catch(e){return!1}return!0}},{"./Grammar":7,"./Utils":26,debug:30}],21:[function(e,t,n){"use strict";var r=500;t.exports={T1:r,T2:4e3,T4:5e3,TIMER_B:32e3,TIMER_D:0,TIMER_F:32e3,TIMER_H:32e3,TIMER_I:0,TIMER_J:0,TIMER_K:0,TIMER_L:32e3,TIMER_M:32e3,PROVISIONAL_RESPONSE_INTERVAL:6e4}},{}],22:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function o(e,t,n){return t&&i(e.prototype,t),n&&i(e,n),e}function l(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&u(e,t)}function u(e,t){return(u=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function a(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=h(e);if(t){var i=h(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return c(e)}(this,n)}}function c(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function h(e){return(h=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var f=e("events").EventEmitter,d=e("./Constants"),_=e("./SIPMessage"),p=e("./Timers"),m=e("debug")("JsSIP:NonInviteClientTransaction"),v=e("debug")("JsSIP:InviteClientTransaction"),g=e("debug")("JsSIP:AckClientTransaction"),y=e("debug")("JsSIP:NonInviteServerTransaction"),T=e("debug")("JsSIP:InviteServerTransaction"),C={STATUS_TRYING:1,STATUS_PROCEEDING:2,STATUS_CALLING:3,STATUS_ACCEPTED:4,STATUS_COMPLETED:5,STATUS_TERMINATED:6,STATUS_CONFIRMED:7,NON_INVITE_CLIENT:"nict",NON_INVITE_SERVER:"nist",INVITE_CLIENT:"ict",INVITE_SERVER:"ist"},S=function(e){l(n,f);var t=a(n);function n(e,r,i,o){var l;s(this,n),(l=t.call(this)).type=C.NON_INVITE_CLIENT,l.id="z9hG4bK".concat(Math.floor(1e7*Math.random())),l.ua=e,l.transport=r,l.request=i,l.eventHandlers=o;var u="SIP/2.0/".concat(r.via_transport);return u+=" ".concat(e.configuration.via_host,";branch=").concat(l.id),l.request.setHeader("via",u),l.ua.newTransaction(c(l)),l}return o(n,[{key:"stateChanged",value:function(e){this.state=e,this.emit("stateChanged")}},{key:"send",value:function(){var e=this;this.stateChanged(C.STATUS_TRYING),this.F=setTimeout(function(){e.timer_F()},p.TIMER_F),this.transport.send(this.request)||this.onTransportError()}},{key:"onTransportError",value:function(){m("transport error occurred, deleting transaction ".concat(this.id)),clearTimeout(this.F),clearTimeout(this.K),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this),this.eventHandlers.onTransportError()}},{key:"timer_F",value:function(){m("Timer F expired for transaction ".concat(this.id)),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this),this.eventHandlers.onRequestTimeout()}},{key:"timer_K",value:function(){this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this)}},{key:"receiveResponse",value:function(e){var t=this,n=e.status_code;if(n<200)switch(this.state){case C.STATUS_TRYING:case C.STATUS_PROCEEDING:this.stateChanged(C.STATUS_PROCEEDING),this.eventHandlers.onReceiveResponse(e)}else switch(this.state){case C.STATUS_TRYING:case C.STATUS_PROCEEDING:this.stateChanged(C.STATUS_COMPLETED),clearTimeout(this.F),408===n?this.eventHandlers.onRequestTimeout():this.eventHandlers.onReceiveResponse(e),this.K=setTimeout(function(){t.timer_K()},p.TIMER_K);break;case C.STATUS_COMPLETED:}}},{key:"C",get:function(){return C}}]),n}(),E=function(e){l(n,f);var t=a(n);function n(e,r,i,o){var l;s(this,n),(l=t.call(this)).type=C.INVITE_CLIENT,l.id="z9hG4bK".concat(Math.floor(1e7*Math.random())),l.ua=e,l.transport=r,l.request=i,l.eventHandlers=o,i.transaction=c(l);var u="SIP/2.0/".concat(r.via_transport);return u+=" ".concat(e.configuration.via_host,";branch=").concat(l.id),l.request.setHeader("via",u),l.ua.newTransaction(c(l)),l}return o(n,[{key:"stateChanged",value:function(e){this.state=e,this.emit("stateChanged")}},{key:"send",value:function(){var e=this;this.stateChanged(C.STATUS_CALLING),this.B=setTimeout(function(){e.timer_B()},p.TIMER_B),this.transport.send(this.request)||this.onTransportError()}},{key:"onTransportError",value:function(){clearTimeout(this.B),clearTimeout(this.D),clearTimeout(this.M),this.state!==C.STATUS_ACCEPTED&&(v("transport error occurred, deleting transaction ".concat(this.id)),this.eventHandlers.onTransportError()),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this)}},{key:"timer_M",value:function(){v("Timer M expired for transaction ".concat(this.id)),this.state===C.STATUS_ACCEPTED&&(clearTimeout(this.B),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this))}},{key:"timer_B",value:function(){v("Timer B expired for transaction ".concat(this.id)),this.state===C.STATUS_CALLING&&(this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this),this.eventHandlers.onRequestTimeout())}},{key:"timer_D",value:function(){v("Timer D expired for transaction ".concat(this.id)),clearTimeout(this.B),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this)}},{key:"sendACK",value:function(e){var t=this,n=new _.OutgoingRequest(d.ACK,this.request.ruri,this.ua,{route_set:this.request.getHeaders("route"),call_id:this.request.getHeader("call-id"),cseq:this.request.cseq});n.setHeader("from",this.request.getHeader("from")),n.setHeader("via",this.request.getHeader("via")),n.setHeader("to",e.getHeader("to")),this.D=setTimeout(function(){t.timer_D()},p.TIMER_D),this.transport.send(n)}},{key:"cancel",value:function(e){if(this.state===C.STATUS_PROCEEDING){var t=new _.OutgoingRequest(d.CANCEL,this.request.ruri,this.ua,{route_set:this.request.getHeaders("route"),call_id:this.request.getHeader("call-id"),cseq:this.request.cseq});t.setHeader("from",this.request.getHeader("from")),t.setHeader("via",this.request.getHeader("via")),t.setHeader("to",this.request.getHeader("to")),e&&t.setHeader("reason",e),this.transport.send(t)}}},{key:"receiveResponse",value:function(e){var t=this,n=e.status_code;if(n>=100&&n<=199)switch(this.state){case C.STATUS_CALLING:this.stateChanged(C.STATUS_PROCEEDING),this.eventHandlers.onReceiveResponse(e);break;case C.STATUS_PROCEEDING:this.eventHandlers.onReceiveResponse(e)}else if(n>=200&&n<=299)switch(this.state){case C.STATUS_CALLING:case C.STATUS_PROCEEDING:this.stateChanged(C.STATUS_ACCEPTED),this.M=setTimeout(function(){t.timer_M()},p.TIMER_M),this.eventHandlers.onReceiveResponse(e);break;case C.STATUS_ACCEPTED:this.eventHandlers.onReceiveResponse(e)}else if(n>=300&&n<=699)switch(this.state){case C.STATUS_CALLING:case C.STATUS_PROCEEDING:this.stateChanged(C.STATUS_COMPLETED),this.sendACK(e),this.eventHandlers.onReceiveResponse(e);break;case C.STATUS_COMPLETED:this.sendACK(e)}}},{key:"C",get:function(){return C}}]),n}(),A=function(e){l(n,f);var t=a(n);function n(e,r,i,o){var l;s(this,n),(l=t.call(this)).id="z9hG4bK".concat(Math.floor(1e7*Math.random())),l.transport=r,l.request=i,l.eventHandlers=o;var u="SIP/2.0/".concat(r.via_transport);return u+=" ".concat(e.configuration.via_host,";branch=").concat(l.id),l.request.setHeader("via",u),l}return o(n,[{key:"send",value:function(){this.transport.send(this.request)||this.onTransportError()}},{key:"onTransportError",value:function(){g("transport error occurred for transaction ".concat(this.id)),this.eventHandlers.onTransportError()}},{key:"C",get:function(){return C}}]),n}(),b=function(e){l(n,f);var t=a(n);function n(e,r,i){var o;return s(this,n),(o=t.call(this)).type=C.NON_INVITE_SERVER,o.id=i.via_branch,o.ua=e,o.transport=r,o.request=i,o.last_response="",i.server_transaction=c(o),o.state=C.STATUS_TRYING,e.newTransaction(c(o)),o}return o(n,[{key:"stateChanged",value:function(e){this.state=e,this.emit("stateChanged")}},{key:"timer_J",value:function(){y("Timer J expired for transaction ".concat(this.id)),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this)}},{key:"onTransportError",value:function(){this.transportError||(this.transportError=!0,y("transport error occurred, deleting transaction ".concat(this.id)),clearTimeout(this.J),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this))}},{key:"receiveResponse",value:function(e,t,n,r){var s=this;if(100===e)switch(this.state){case C.STATUS_TRYING:this.stateChanged(C.STATUS_PROCEEDING),this.transport.send(t)||this.onTransportError();break;case C.STATUS_PROCEEDING:this.last_response=t,this.transport.send(t)?n&&n():(this.onTransportError(),r&&r())}else if(e>=200&&e<=699)switch(this.state){case C.STATUS_TRYING:case C.STATUS_PROCEEDING:this.stateChanged(C.STATUS_COMPLETED),this.last_response=t,this.J=setTimeout(function(){s.timer_J()},p.TIMER_J),this.transport.send(t)?n&&n():(this.onTransportError(),r&&r());break;case C.STATUS_COMPLETED:}}},{key:"C",get:function(){return C}}]),n}(),R=function(e){l(n,f);var t=a(n);function n(e,r,i){var o;return s(this,n),(o=t.call(this)).type=C.INVITE_SERVER,o.id=i.via_branch,o.ua=e,o.transport=r,o.request=i,o.last_response="",i.server_transaction=c(o),o.state=C.STATUS_PROCEEDING,e.newTransaction(c(o)),o.resendProvisionalTimer=null,i.reply(100),o}return o(n,[{key:"stateChanged",value:function(e){this.state=e,this.emit("stateChanged")}},{key:"timer_H",value:function(){T("Timer H expired for transaction ".concat(this.id)),this.state===C.STATUS_COMPLETED&&T("ACK not received, dialog will be terminated"),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this)}},{key:"timer_I",value:function(){this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this)}},{key:"timer_L",value:function(){T("Timer L expired for transaction ".concat(this.id)),this.state===C.STATUS_ACCEPTED&&(this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this))}},{key:"onTransportError",value:function(){this.transportError||(this.transportError=!0,T("transport error occurred, deleting transaction ".concat(this.id)),null!==this.resendProvisionalTimer&&(clearInterval(this.resendProvisionalTimer),this.resendProvisionalTimer=null),clearTimeout(this.L),clearTimeout(this.H),clearTimeout(this.I),this.stateChanged(C.STATUS_TERMINATED),this.ua.destroyTransaction(this))}},{key:"resend_provisional",value:function(){this.transport.send(this.last_response)||this.onTransportError()}},{key:"receiveResponse",value:function(e,t,n,r){var s=this;if(e>=100&&e<=199)switch(this.state){case C.STATUS_PROCEEDING:this.transport.send(t)||this.onTransportError(),this.last_response=t}if(e>100&&e<=199&&this.state===C.STATUS_PROCEEDING)null===this.resendProvisionalTimer&&(this.resendProvisionalTimer=setInterval(function(){s.resend_provisional()},p.PROVISIONAL_RESPONSE_INTERVAL));else if(e>=200&&e<=299)switch(this.state){case C.STATUS_PROCEEDING:this.stateChanged(C.STATUS_ACCEPTED),this.last_response=t,this.L=setTimeout(function(){s.timer_L()},p.TIMER_L),null!==this.resendProvisionalTimer&&(clearInterval(this.resendProvisionalTimer),this.resendProvisionalTimer=null);case C.STATUS_ACCEPTED:this.transport.send(t)?n&&n():(this.onTransportError(),r&&r())}else if(e>=300&&e<=699)switch(this.state){case C.STATUS_PROCEEDING:null!==this.resendProvisionalTimer&&(clearInterval(this.resendProvisionalTimer),this.resendProvisionalTimer=null),this.transport.send(t)?(this.stateChanged(C.STATUS_COMPLETED),this.H=setTimeout(function(){s.timer_H()},p.TIMER_H),n&&n()):(this.onTransportError(),r&&r())}}},{key:"C",get:function(){return C}}]),n}();t.exports={C:C,NonInviteClientTransaction:S,InviteClientTransaction:E,AckClientTransaction:A,NonInviteServerTransaction:b,InviteServerTransaction:R,checkTransaction:function(e,t){var n,r=e._transactions;switch(t.method){case d.INVITE:if(n=r.ist[t.via_branch]){switch(n.state){case C.STATUS_PROCEEDING:n.transport.send(n.last_response);break;case C.STATUS_ACCEPTED:}return!0}break;case d.ACK:if(!(n=r.ist[t.via_branch]))return!1;if(n.state===C.STATUS_ACCEPTED)return!1;if(n.state===C.STATUS_COMPLETED)return n.state=C.STATUS_CONFIRMED,n.I=setTimeout(function(){n.timer_I()},p.TIMER_I),!0;break;case d.CANCEL:return(n=r.ist[t.via_branch])?(t.reply_sl(200),n.state!==C.STATUS_PROCEEDING):(t.reply_sl(481),!0);default:if(n=r.nist[t.via_branch]){switch(n.state){case C.STATUS_TRYING:break;case C.STATUS_PROCEEDING:case C.STATUS_COMPLETED:n.transport.send(n.last_response)}return!0}}}}},{"./Constants":2,"./SIPMessage":19,"./Timers":21,debug:30,events:29}],23:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var s=e("./Socket"),i=e("debug")("JsSIP:Transport"),o=e("debug")("JsSIP:ERROR:Transport"),l=e("./Constants");o.log=console.warn.bind(console);var u={STATUS_CONNECTED:0,STATUS_CONNECTING:1,STATUS_DISCONNECTED:2,SOCKET_STATUS_READY:0,SOCKET_STATUS_ERROR:1,recovery_options:{min_interval:l.CONNECTION_RECOVERY_MIN_INTERVAL,max_interval:l.CONNECTION_RECOVERY_MAX_INTERVAL}};t.exports=function(){function e(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:u.recovery_options;if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),i("new()"),this.status=u.STATUS_DISCONNECTED,this.socket=null,this.sockets=[],this.recovery_options=n,this.recover_attempts=0,this.recovery_timer=null,this.close_requested=!1,void 0===t)throw new TypeError("Invalid argument. undefined 'sockets' argument");t instanceof Array||(t=[t]),t.forEach(function(e){if(!s.isSocket(e.socket))throw new TypeError("Invalid argument. invalid 'JsSIP.Socket' instance");if(e.weight&&!Number(e.weight))throw new TypeError("Invalid argument. 'weight' attribute is not a number");this.sockets.push({socket:e.socket,weight:e.weight||0,status:u.SOCKET_STATUS_READY})},this),this._getSocket()}var t,n,l;return t=e,(n=[{key:"connect",value:function(){i("connect()"),this.isConnected()?i("Transport is already connected"):this.isConnecting()?i("Transport is connecting"):(this.close_requested=!1,this.status=u.STATUS_CONNECTING,this.onconnecting({socket:this.socket,attempts:this.recover_attempts}),this.close_requested||(this.socket.onconnect=this._onConnect.bind(this),this.socket.ondisconnect=this._onDisconnect.bind(this),this.socket.ondata=this._onData.bind(this),this.socket.connect()))}},{key:"disconnect",value:function(){i("close()"),this.close_requested=!0,this.recover_attempts=0,this.status=u.STATUS_DISCONNECTED,null!==this.recovery_timer&&(clearTimeout(this.recovery_timer),this.recovery_timer=null),this.socket.onconnect=function(){},this.socket.ondisconnect=function(){},this.socket.ondata=function(){},this.socket.disconnect(),this.ondisconnect({socket:this.socket,error:!1})}},{key:"send",value:function(e){if(i("send()"),!this.isConnected())return o("unable to send message, transport is not connected"),!1;var t=e.toString();return i("sending message:\n\n".concat(t,"\n")),this.socket.send(t)}},{key:"isConnected",value:function(){return this.status===u.STATUS_CONNECTED}},{key:"isConnecting",value:function(){return this.status===u.STATUS_CONNECTING}},{key:"_reconnect",value:function(){var e=this;this.recover_attempts+=1;var t=Math.floor(Math.random()*Math.pow(2,this.recover_attempts)+1);t<this.recovery_options.min_interval?t=this.recovery_options.min_interval:t>this.recovery_options.max_interval&&(t=this.recovery_options.max_interval),i("reconnection attempt: ".concat(this.recover_attempts,". next connection attempt in ").concat(t," seconds")),this.recovery_timer=setTimeout(function(){e.close_requested||e.isConnected()||e.isConnecting()||(e._getSocket(),e.connect())},1e3*t)}},{key:"_getSocket",value:function(){var e=[];if(this.sockets.forEach(function(t){t.status!==u.SOCKET_STATUS_ERROR&&(0===e.length?e.push(t):t.weight>e[0].weight?e=[t]:t.weight===e[0].weight&&e.push(t))}),0===e.length)return this.sockets.forEach(function(e){e.status=u.SOCKET_STATUS_READY}),void this._getSocket();var t=Math.floor(Math.random()*e.length);this.socket=e[t].socket}},{key:"_onConnect",value:function(){this.recover_attempts=0,this.status=u.STATUS_CONNECTED,null!==this.recovery_timer&&(clearTimeout(this.recovery_timer),this.recovery_timer=null),this.onconnect({socket:this})}},{key:"_onDisconnect",value:function(e,t,n){this.status=u.STATUS_DISCONNECTED,this.ondisconnect({socket:this.socket,error:e,code:t,reason:n}),this.close_requested||(this.sockets.forEach(function(e){this.socket===e.socket&&(e.status=u.SOCKET_STATUS_ERROR)},this),this._reconnect(e))}},{key:"_onData",value:function(e){if("\r\n"!==e){if("string"!=typeof e){try{e=String.fromCharCode.apply(null,new Uint8Array(e))}catch(e){return void i("received binary message failed to be converted into string, message discarded")}i("received binary message:\n\n".concat(e,"\n"))}else i("received text message:\n\n".concat(e,"\n"));this.ondata({transport:this,message:e})}else i("received message with CRLF Keep Alive response")}},{key:"via_transport",get:function(){return this.socket.via_transport}},{key:"url",get:function(){return this.socket.url}},{key:"sip_uri",get:function(){return this.socket.sip_uri}}])&&r(t.prototype,n),l&&r(t,l),e}()},{"./Constants":2,"./Socket":20,debug:30}],24:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function i(e,t,n){return t&&s(e.prototype,t),n&&s(e,n),e}function o(e,t){return(o=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function l(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],function(){})),!0}catch(e){return!1}}();return function(){var n,s=a(e);if(t){var i=a(this).constructor;n=Reflect.construct(s,arguments,i)}else n=s.apply(this,arguments);return function(e,t){if(t&&("object"===r(t)||"function"==typeof t))return t;return u(e)}(this,n)}}function u(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}function a(e){return(a=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}var c=e("events").EventEmitter,h=e("./Constants"),f=e("./Registrator"),d=e("./RTCSession"),_=e("./Message"),p=e("./Transactions"),m=e("./Transport"),v=e("./Utils"),g=e("./Exceptions"),y=e("./URI"),T=e("./Parser"),C=e("./SIPMessage"),S=e("./sanityCheck"),E=e("./Config"),A=e("debug")("JsSIP:UA"),b=e("debug")("JsSIP:ERROR:UA");b.log=console.warn.bind(console);var R={STATUS_INIT:0,STATUS_READY:1,STATUS_USER_CLOSED:2,STATUS_NOT_READY:3,CONFIGURATION_ERROR:1,NETWORK_ERROR:2};t.exports=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&o(e,t)}(n,c);var t=l(n);function n(e){var r;if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,n),A("new() [configuration:%o]",e),(r=t.call(this))._cache={credentials:{}},r._configuration=Object.assign({},E.settings),r._dynConfiguration={},r._dialogs={},r._applicants={},r._sessions={},r._transport=null,r._contact=null,r._status=R.STATUS_INIT,r._error=null,r._transactions={nist:{},nict:{},ist:{},ict:{}},r._data={},r._closeTimer=null,void 0===e)throw new TypeError("Not enough arguments");try{r._loadConfig(e)}catch(e){throw r._status=R.STATUS_NOT_READY,r._error=R.CONFIGURATION_ERROR,e}return r._registrator=new f(u(r)),r}return i(n,null,[{key:"C",get:function(){return R}}]),i(n,[{key:"start",value:function(){A("start()"),this._status===R.STATUS_INIT?this._transport.connect():this._status===R.STATUS_USER_CLOSED?(A("restarting UA"),null!==this._closeTimer&&(clearTimeout(this._closeTimer),this._closeTimer=null,this._transport.disconnect()),this._status=R.STATUS_INIT,this._transport.connect()):this._status===R.STATUS_READY?A("UA is in READY status, not restarted"):A("ERROR: connection is down, Auto-Recovery system is trying to reconnect"),this._dynConfiguration.register=this._configuration.register}},{key:"register",value:function(){A("register()"),this._dynConfiguration.register=!0,this._registrator.register()}},{key:"unregister",value:function(e){A("unregister()"),this._dynConfiguration.register=!1,this._registrator.unregister(e)}},{key:"registrator",value:function(){return this._registrator}},{key:"isRegistered",value:function(){return this._registrator.registered}},{key:"isConnected",value:function(){return this._transport.isConnected()}},{key:"call",value:function(e,t){A("call()");var n=new d(this);return n.connect(e,t),n}},{key:"sendMessage",value:function(e,t,n){A("sendMessage()");var r=new _(this);return r.send(e,t,n),r}},{key:"terminateSessions",value:function(e){for(var t in A("terminateSessions()"),this._sessions)this._sessions[t].isEnded()||this._sessions[t].terminate(e)}},{key:"stop",value:function(){var e=this;if(A("stop()"),this._dynConfiguration={},this._status!==R.STATUS_USER_CLOSED){this._registrator.close();var t=Object.keys(this._sessions).length;for(var n in this._sessions)if(Object.prototype.hasOwnProperty.call(this._sessions,n)){A("closing session ".concat(n));try{this._sessions[n].terminate()}catch(e){}}for(var r in this._applicants)if(Object.prototype.hasOwnProperty.call(this._applicants,r))try{this._applicants[r].close()}catch(e){}this._status=R.STATUS_USER_CLOSED,0===Object.keys(this._transactions.nict).length+Object.keys(this._transactions.nist).length+Object.keys(this._transactions.ict).length+Object.keys(this._transactions.ist).length&&0===t?this._transport.disconnect():this._closeTimer=setTimeout(function(){e._closeTimer=null,e._transport.disconnect()},2e3)}else A("UA already closed")}},{key:"normalizeTarget",value:function(e){return v.normalizeTarget(e,this._configuration.hostport_params)}},{key:"get",value:function(e){switch(e){case"authorization_user":return this._configuration.authorization_user;case"realm":return this._configuration.realm;case"ha1":return this._configuration.ha1;case"authorization_jwt":return this._configuration.authorization_jwt;default:return void b('get() | cannot get "%s" parameter in runtime',e)}}},{key:"set",value:function(e,t){switch(e){case"authorization_user":this._configuration.authorization_user=String(t);break;case"password":this._configuration.password=String(t);break;case"realm":this._configuration.realm=String(t);break;case"ha1":this._configuration.ha1=String(t),this._configuration.password=null;break;case"authorization_jwt":this._configuration.authorization_jwt=String(t);break;case"display_name":this._configuration.display_name=t;break;default:return b('set() | cannot set "%s" parameter in runtime',e),!1}return!0}},{key:"newTransaction",value:function(e){this._transactions[e.type][e.id]=e,this.emit("newTransaction",{transaction:e})}},{key:"destroyTransaction",value:function(e){delete this._transactions[e.type][e.id],this.emit("transactionDestroyed",{transaction:e})}},{key:"newDialog",value:function(e){this._dialogs[e.id]=e}},{key:"destroyDialog",value:function(e){delete this._dialogs[e.id]}},{key:"newMessage",value:function(e,t){this._applicants[e]=e,this.emit("newMessage",t)}},{key:"destroyMessage",value:function(e){delete this._applicants[e]}},{key:"newRTCSession",value:function(e,t){this._sessions[e.id]=e,this.emit("newRTCSession",t)}},{key:"destroyRTCSession",value:function(e){delete this._sessions[e.id]}},{key:"registered",value:function(e){this.emit("registered",e)}},{key:"unregistered",value:function(e){this.emit("unregistered",e)}},{key:"registrationFailed",value:function(e){this.emit("registrationFailed",e)}},{key:"receiveRequest",value:function(e){var t=e.method;if(e.ruri.user!==this._configuration.uri.user&&e.ruri.user!==this._contact.uri.user)return A("Request-URI does not point to us"),void(e.method!==h.ACK&&e.reply_sl(404));if(e.ruri.scheme!==h.SIPS){if(!p.checkTransaction(this,e)){if(t===h.INVITE?new p.InviteServerTransaction(this,this._transport,e):t!==h.ACK&&t!==h.CANCEL&&new p.NonInviteServerTransaction(this,this._transport,e),t===h.OPTIONS)e.reply(200);else if(t===h.MESSAGE){if(0===this.listeners("newMessage").length)return void e.reply(405);new _(this).init_incoming(e)}else if(t===h.INVITE&&!e.to_tag&&0===this.listeners("newRTCSession").length)return void e.reply(405);var n,r;if(e.to_tag)(n=this._findDialog(e.call_id,e.from_tag,e.to_tag))?n.receiveRequest(e):t===h.NOTIFY?(r=this._findSession(e))?r.receiveRequest(e):(A("received NOTIFY request for a non existent subscription"),e.reply(481,"Subscription does not exist")):t!==h.ACK&&e.reply(481);else switch(t){case h.INVITE:if(window.RTCPeerConnection)if(e.hasHeader("replaces")){var s=e.replaces;(n=this._findDialog(s.call_id,s.from_tag,s.to_tag))?(r=n.owner).isEnded()?e.reply(603):r.receiveRequest(e):e.reply(481)}else(r=new d(this)).init_incoming(e);else b("INVITE received but WebRTC is not supported"),e.reply(488);break;case h.BYE:e.reply(481);break;case h.CANCEL:(r=this._findSession(e))?r.receiveRequest(e):A("received CANCEL request for a non existent session");break;case h.ACK:break;case h.NOTIFY:this.emit("sipEvent",{event:e.event,request:e}),e.reply(200);break;default:e.reply(405)}}}else e.reply_sl(416)}},{key:"_findSession",value:function(e){var t=e.call_id,n=e.from_tag,r=e.to_tag,s=t+n,i=this._sessions[s],o=t+r,l=this._sessions[o];return i||(l||null)}},{key:"_findDialog",value:function(e,t,n){var r=e+t+n,s=this._dialogs[r];return s||(r=e+n+t,(s=this._dialogs[r])||null)}},{key:"_loadConfig",value:function(e){try{E.load(this._configuration,e)}catch(e){throw e}0===this._configuration.display_name&&(this._configuration.display_name="0"),this._configuration.instance_id||(this._configuration.instance_id=v.newUUID()),this._configuration.jssip_id=v.createRandomToken(5);var t=this._configuration.uri.clone();t.user=null,this._configuration.hostport_params=t.toString().replace(/^sip:/i,"");try{this._transport=new m(this._configuration.sockets,{max_interval:this._configuration.connection_recovery_max_interval,min_interval:this._configuration.connection_recovery_min_interval}),this._transport.onconnecting=function(e){this.emit("connecting",e)}.bind(this),this._transport.onconnect=function(e){if(this._status===R.STATUS_USER_CLOSED)return;this._status=R.STATUS_READY,this._error=null,this.emit("connected",e),this._dynConfiguration.register&&this._registrator.register()}.bind(this),this._transport.ondisconnect=function(e){for(var t=0,n=["nict","ict","nist","ist"];t<n.length;t++){var r=n[t];for(var s in this._transactions[r])Object.prototype.hasOwnProperty.call(this._transactions[r],s)&&this._transactions[r][s].onTransportError()}this.emit("disconnected",e),this._registrator.onTransportClosed(),this._status!==R.STATUS_USER_CLOSED&&(this._status=R.STATUS_NOT_READY,this._error=R.NETWORK_ERROR)}.bind(this),this._transport.ondata=function(e){var t=e.transport,n=e.message;if(!(n=T.parseMessage(n,this)))return;if(this._status===R.STATUS_USER_CLOSED&&n instanceof C.IncomingRequest)return;if(!S(n,this,t))return;if(n instanceof C.IncomingRequest)n.transport=t,this.receiveRequest(n);else if(n instanceof C.IncomingResponse){var r;switch(n.method){case h.INVITE:(r=this._transactions.ict[n.via_branch])&&r.receiveResponse(n);break;case h.ACK:break;default:(r=this._transactions.nict[n.via_branch])&&r.receiveResponse(n)}}}.bind(this)}catch(e){throw b(e),new g.ConfigurationError("sockets",this._configuration.sockets)}if(delete this._configuration.sockets,this._configuration.authorization_user||(this._configuration.authorization_user=this._configuration.uri.user),!this._configuration.registrar_server){var n=this._configuration.uri.clone();n.user=null,n.clearParams(),n.clearHeaders(),this._configuration.registrar_server=n}this._configuration.no_answer_timeout*=1e3,this._configuration.contact_uri?this._configuration.via_host=this._configuration.contact_uri.host:this._configuration.contact_uri=new y("sip",v.createRandomToken(8),this._configuration.via_host,null,{transport:"ws"}),this._contact={pub_gruu:null,temp_gruu:null,uri:this._configuration.contact_uri,toString:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.anonymous||null,n=e.outbound||null,r="<";return r+=t?this.temp_gruu||"sip:anonymous@anonymous.invalid;transport=ws":this.pub_gruu||this.uri.toString(),!n||(t?this.temp_gruu:this.pub_gruu)||(r+=";ob"),r+=">"}};var r=["authorization_user","password","realm","ha1","authorization_jwt","display_name","register"];for(var s in this._configuration)Object.prototype.hasOwnProperty.call(this._configuration,s)&&(-1!==r.indexOf(s)?Object.defineProperty(this._configuration,s,{writable:!0,configurable:!1}):Object.defineProperty(this._configuration,s,{writable:!1,configurable:!1}));for(var i in A("configuration parameters after validation:"),this._configuration)if(Object.prototype.hasOwnProperty.call(E.settings,i))switch(i){case"uri":case"registrar_server":A("- ".concat(i,": ").concat(this._configuration[i]));break;case"password":case"ha1":case"authorization_jwt":A("- ".concat(i,": NOT SHOWN"));break;default:A("- ".concat(i,": ").concat(JSON.stringify(this._configuration[i])))}}},{key:"C",get:function(){return R}},{key:"status",get:function(){return this._status}},{key:"contact",get:function(){return this._contact}},{key:"configuration",get:function(){return this._configuration}},{key:"transport",get:function(){return this._transport}}]),n}()},{"./Config":1,"./Constants":2,"./Exceptions":6,"./Message":9,"./Parser":11,"./RTCSession":12,"./Registrator":17,"./SIPMessage":19,"./Transactions":22,"./Transport":23,"./URI":25,"./Utils":26,"./sanityCheck":28,debug:30,events:29}],25:[function(e,t,n){"use strict";function r(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return s(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return s(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,i=function(){};return{s:i,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,l=!0,u=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return l=e.done,e},e:function(e){u=!0,o=e},f:function(){try{l||null==n.return||n.return()}finally{if(u)throw o}}}}function s(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}function i(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function o(e,t,n){return t&&i(e.prototype,t),n&&i(e,n),e}var l=e("./Constants"),u=e("./Utils"),a=e("./Grammar");t.exports=function(){function e(t,n,r,s){var i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:{},o=arguments.length>5&&void 0!==arguments[5]?arguments[5]:{};if(function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),!r)throw new TypeError('missing or invalid "host" parameter');for(var u in this._parameters={},this._headers={},this._scheme=t||l.SIP,this._user=n,this._host=r,this._port=s,i)Object.prototype.hasOwnProperty.call(i,u)&&this.setParam(u,i[u]);for(var a in o)Object.prototype.hasOwnProperty.call(o,a)&&this.setHeader(a,o[a])}return o(e,null,[{key:"parse",value:function(e){return-1!==(e=a.parse(e,"SIP_URI"))?e:void 0}}]),o(e,[{key:"setParam",value:function(e,t){e&&(this._parameters[e.toLowerCase()]=null==t?null:t.toString())}},{key:"getParam",value:function(e){if(e)return this._parameters[e.toLowerCase()]}},{key:"hasParam",value:function(e){if(e)return!!this._parameters.hasOwnProperty(e.toLowerCase())}},{key:"deleteParam",value:function(e){if(e=e.toLowerCase(),this._parameters.hasOwnProperty(e)){var t=this._parameters[e];return delete this._parameters[e],t}}},{key:"clearParams",value:function(){this._parameters={}}},{key:"setHeader",value:function(e,t){this._headers[u.headerize(e)]=Array.isArray(t)?t:[t]}},{key:"getHeader",value:function(e){if(e)return this._headers[u.headerize(e)]}},{key:"hasHeader",value:function(e){if(e)return!!this._headers.hasOwnProperty(u.headerize(e))}},{key:"deleteHeader",value:function(e){if(e=u.headerize(e),this._headers.hasOwnProperty(e)){var t=this._headers[e];return delete this._headers[e],t}}},{key:"clearHeaders",value:function(){this._headers={}}},{key:"clone",value:function(){return new e(this._scheme,this._user,this._host,this._port,JSON.parse(JSON.stringify(this._parameters)),JSON.parse(JSON.stringify(this._headers)))}},{key:"toString",value:function(){var e=[],t="".concat(this._scheme,":");for(var n in this._user&&(t+="".concat(u.escapeUser(this._user),"@")),t+=this._host,(this._port||0===this._port)&&(t+=":".concat(this._port)),this._parameters)Object.prototype.hasOwnProperty.call(this._parameters,n)&&(t+=";".concat(n),null!==this._parameters[n]&&(t+="=".concat(this._parameters[n])));for(var s in this._headers)if(Object.prototype.hasOwnProperty.call(this._headers,s)){var i,o=r(this._headers[s]);try{for(o.s();!(i=o.n()).done;){var l=i.value;e.push("".concat(s,"=").concat(l))}}catch(e){o.e(e)}finally{o.f()}}return e.length>0&&(t+="?".concat(e.join("&"))),t}},{key:"toAor",value:function(e){var t="".concat(this._scheme,":");return this._user&&(t+="".concat(u.escapeUser(this._user),"@")),t+=this._host,e&&(this._port||0===this._port)&&(t+=":".concat(this._port)),t}},{key:"scheme",get:function(){return this._scheme},set:function(e){this._scheme=e.toLowerCase()}},{key:"user",get:function(){return this._user},set:function(e){this._user=e}},{key:"host",get:function(){return this._host},set:function(e){this._host=e.toLowerCase()}},{key:"port",get:function(){return this._port},set:function(e){this._port=0===e?e:parseInt(e,10)||null}}]),e}()},{"./Constants":2,"./Grammar":7,"./Utils":26}],26:[function(e,t,n){"use strict";function r(e){return(r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function s(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return i(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return i(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,s=function(){};return{s:s,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:s}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,l=!0,u=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return l=e.done,e},e:function(e){u=!0,o=e},f:function(){try{l||null==n.return||n.return()}finally{if(u)throw o}}}}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var o=e("./Constants"),l=e("./URI"),u=e("./Grammar");n.str_utf8_length=function(e){return unescape(encodeURIComponent(e)).length};var a=n.isFunction=function(e){return void 0!==e&&"[object Function]"===Object.prototype.toString.call(e)};n.isString=function(e){return void 0!==e&&"[object String]"===Object.prototype.toString.call(e)},n.isDecimal=function(e){return!isNaN(e)&&parseFloat(e)===parseInt(e,10)},n.isEmpty=function(e){return null===e||""===e||void 0===e||Array.isArray(e)&&0===e.length||"number"==typeof e&&isNaN(e)},n.hasMethods=function(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r<t;r++)n[r-1]=arguments[r];for(var s=0,i=n;s<i.length;s++){var o=i[s];if(a(e[o]))return!1}return!0};var c=n.createRandomToken=function(e){var t,n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:32,r="";for(t=0;t<e;t++)r+=(Math.random()*n|0).toString(n);return r};n.newTag=function(){return c(10)},n.newUUID=function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(e){var t=16*Math.random()|0;return("x"===e?t:3&t|8).toString(16)})},n.hostType=function(e){if(e)return-1!==(e=u.parse(e,"host"))?e.host_type:void 0};var h=n.escapeUser=function(e){return encodeURIComponent(decodeURIComponent(e)).replace(/%3A/gi,":").replace(/%2B/gi,"+").replace(/%3F/gi,"?").replace(/%2F/gi,"/")};n.normalizeTarget=function(e,t){if(e){if(e instanceof l)return e;if("string"==typeof e){var n,r,s,i=e.split("@");switch(i.length){case 1:if(!t)return;n=e,r=t;break;case 2:n=i[0],r=i[1];break;default:n=i.slice(0,i.length-1).join("@"),r=i[i.length-1]}return n=n.replace(/^(sips?|tel):/i,""),/^[-.()]*\+?[0-9\-.()]+$/.test(n)&&(n=n.replace(/[-.()]/g,"")),e="".concat(o.SIP,":").concat(h(n),"@").concat(r),(s=l.parse(e))?s:void 0}}else;},n.headerize=function(e){var t,n={"Call-Id":"Call-ID",Cseq:"CSeq","Www-Authenticate":"WWW-Authenticate"},r=e.toLowerCase().replace(/_/g,"-").split("-"),s="",i=r.length;for(t=0;t<i;t++)0!==t&&(s+="-"),s+=r[t].charAt(0).toUpperCase()+r[t].substring(1);return n[s]&&(s=n[s]),s},n.sipErrorCause=function(e){for(var t in o.SIP_ERROR_CAUSES)if(-1!==o.SIP_ERROR_CAUSES[t].indexOf(e))return o.causes[t];return o.causes.SIP_FAILURE_CODE},n.getRandomTestNetIP=function(){return"192.0.2.".concat((e=1,t=254,Math.floor(Math.random()*(t-e+1)+e)));var e,t},n.calculateMD5=function(e){function t(e,t){return e<<t|e>>>32-t}function n(e,t){var n=2147483648&e,r=2147483648&t,s=1073741824&e,i=1073741824&t,o=(1073741823&e)+(1073741823&t);return s&i?2147483648^o^n^r:s|i?1073741824&o?3221225472^o^n^r:1073741824^o^n^r:o^n^r}function r(e,r,s,i,o,l,u){return e=n(e,n(n(function(e,t,n){return e&t|~e&n}(r,s,i),o),u)),n(t(e,l),r)}function s(e,r,s,i,o,l,u){return e=n(e,n(n(function(e,t,n){return e&n|t&~n}(r,s,i),o),u)),n(t(e,l),r)}function i(e,r,s,i,o,l,u){return e=n(e,n(n(function(e,t,n){return e^t^n}(r,s,i),o),u)),n(t(e,l),r)}function o(e,r,s,i,o,l,u){return e=n(e,n(n(function(e,t,n){return t^(e|~n)}(r,s,i),o),u)),n(t(e,l),r)}function l(e){var t,n="",r="";for(t=0;t<=3;t++)n+=(r="0".concat((e>>>8*t&255).toString(16))).substr(r.length-2,2);return n}var u,a,c,h,f,d,_,p,m,v;for(u=function(e){for(var t,n=e.length,r=n+8,s=16*((r-r%64)/64+1),i=new Array(s-1),o=0,l=0;l<n;)o=l%4*8,i[t=(l-l%4)/4]=i[t]|e.charCodeAt(l)<<o,l++;return o=l%4*8,i[t=(l-l%4)/4]=i[t]|128<<o,i[s-2]=n<<3,i[s-1]=n>>>29,i}(e=function(e){e=e.replace(/\r\n/g,"\n");for(var t="",n=0;n<e.length;n++){var r=e.charCodeAt(n);r<128?t+=String.fromCharCode(r):r>127&&r<2048?(t+=String.fromCharCode(r>>6|192),t+=String.fromCharCode(63&r|128)):(t+=String.fromCharCode(r>>12|224),t+=String.fromCharCode(r>>6&63|128),t+=String.fromCharCode(63&r|128))}return t}(e)),_=1732584193,p=4023233417,m=2562383102,v=271733878,a=0;a<u.length;a+=16)c=_,h=p,f=m,d=v,_=r(_,p,m,v,u[a+0],7,3614090360),v=r(v,_,p,m,u[a+1],12,3905402710),m=r(m,v,_,p,u[a+2],17,606105819),p=r(p,m,v,_,u[a+3],22,3250441966),_=r(_,p,m,v,u[a+4],7,4118548399),v=r(v,_,p,m,u[a+5],12,1200080426),m=r(m,v,_,p,u[a+6],17,2821735955),p=r(p,m,v,_,u[a+7],22,4249261313),_=r(_,p,m,v,u[a+8],7,1770035416),v=r(v,_,p,m,u[a+9],12,2336552879),m=r(m,v,_,p,u[a+10],17,4294925233),p=r(p,m,v,_,u[a+11],22,2304563134),_=r(_,p,m,v,u[a+12],7,1804603682),v=r(v,_,p,m,u[a+13],12,4254626195),m=r(m,v,_,p,u[a+14],17,2792965006),_=s(_,p=r(p,m,v,_,u[a+15],22,1236535329),m,v,u[a+1],5,4129170786),v=s(v,_,p,m,u[a+6],9,3225465664),m=s(m,v,_,p,u[a+11],14,643717713),p=s(p,m,v,_,u[a+0],20,3921069994),_=s(_,p,m,v,u[a+5],5,3593408605),v=s(v,_,p,m,u[a+10],9,38016083),m=s(m,v,_,p,u[a+15],14,3634488961),p=s(p,m,v,_,u[a+4],20,3889429448),_=s(_,p,m,v,u[a+9],5,568446438),v=s(v,_,p,m,u[a+14],9,3275163606),m=s(m,v,_,p,u[a+3],14,4107603335),p=s(p,m,v,_,u[a+8],20,1163531501),_=s(_,p,m,v,u[a+13],5,2850285829),v=s(v,_,p,m,u[a+2],9,4243563512),m=s(m,v,_,p,u[a+7],14,1735328473),_=i(_,p=s(p,m,v,_,u[a+12],20,2368359562),m,v,u[a+5],4,4294588738),v=i(v,_,p,m,u[a+8],11,2272392833),m=i(m,v,_,p,u[a+11],16,1839030562),p=i(p,m,v,_,u[a+14],23,4259657740),_=i(_,p,m,v,u[a+1],4,2763975236),v=i(v,_,p,m,u[a+4],11,1272893353),m=i(m,v,_,p,u[a+7],16,4139469664),p=i(p,m,v,_,u[a+10],23,3200236656),_=i(_,p,m,v,u[a+13],4,681279174),v=i(v,_,p,m,u[a+0],11,3936430074),m=i(m,v,_,p,u[a+3],16,3572445317),p=i(p,m,v,_,u[a+6],23,76029189),_=i(_,p,m,v,u[a+9],4,3654602809),v=i(v,_,p,m,u[a+12],11,3873151461),m=i(m,v,_,p,u[a+15],16,530742520),_=o(_,p=i(p,m,v,_,u[a+2],23,3299628645),m,v,u[a+0],6,4096336452),v=o(v,_,p,m,u[a+7],10,1126891415),m=o(m,v,_,p,u[a+14],15,2878612391),p=o(p,m,v,_,u[a+5],21,4237533241),_=o(_,p,m,v,u[a+12],6,1700485571),v=o(v,_,p,m,u[a+3],10,2399980690),m=o(m,v,_,p,u[a+10],15,4293915773),p=o(p,m,v,_,u[a+1],21,2240044497),_=o(_,p,m,v,u[a+8],6,1873313359),v=o(v,_,p,m,u[a+15],10,4264355552),m=o(m,v,_,p,u[a+6],15,2734768916),p=o(p,m,v,_,u[a+13],21,1309151649),_=o(_,p,m,v,u[a+4],6,4149444226),v=o(v,_,p,m,u[a+11],10,3174756917),m=o(m,v,_,p,u[a+2],15,718787259),p=o(p,m,v,_,u[a+9],21,3951481745),_=n(_,c),p=n(p,h),m=n(m,f),v=n(v,d);return(l(_)+l(p)+l(m)+l(v)).toLowerCase()},n.closeMediaStream=function(e){if(e)try{if(e.getTracks){var t,n=s(e.getTracks());try{for(n.s();!(t=n.n()).done;){t.value.stop()}}catch(e){n.e(e)}finally{n.f()}}else{var i,o=s(e.getAudioTracks());try{for(o.s();!(i=o.n()).done;){i.value.stop()}}catch(e){o.e(e)}finally{o.f()}var l,u=s(e.getVideoTracks());try{for(u.s();!(l=u.n()).done;){l.value.stop()}}catch(e){u.e(e)}finally{u.f()}}}catch(t){"function"!=typeof e.stop&&"object"!==r(e.stop)||e.stop()}},n.cloneArray=function(e){return e&&e.slice()||[]},n.cloneObject=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{};return e&&Object.assign({},e)||t}},{"./Constants":2,"./Grammar":7,"./URI":25}],27:[function(e,t,n){"use strict";function r(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}var s=e("./Grammar"),i=e("debug")("JsSIP:WebSocketInterface"),o=e("debug")("JsSIP:ERROR:WebSocketInterface");o.log=console.warn.bind(console),t.exports=function(){function e(t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),i('new() [url:"%s"]',t),this._url=t,this._sip_uri=null,this._via_transport=null,this._ws=null;var n=s.parse(t,"absoluteURI");if(-1===n)throw o("invalid WebSocket URI: ".concat(t)),new TypeError("Invalid argument: ".concat(t));if("wss"!==n.scheme&&"ws"!==n.scheme)throw o("invalid WebSocket URI scheme: ".concat(n.scheme)),new TypeError("Invalid argument: ".concat(t));this._sip_uri="sip:".concat(n.host).concat(n.port?":".concat(n.port):"",";transport=ws"),this._via_transport=n.scheme.toUpperCase()}var t,n,l;return t=e,(n=[{key:"connect",value:function(){if(i("connect()"),this.isConnected())i("WebSocket ".concat(this._url," is already connected"));else if(this.isConnecting())i("WebSocket ".concat(this._url," is connecting"));else{this._ws&&this.disconnect(),i("connecting to WebSocket ".concat(this._url));try{this._ws=new WebSocket(this._url,"sip"),this._ws.binaryType="arraybuffer",this._ws.onopen=this._onOpen.bind(this),this._ws.onclose=this._onClose.bind(this),this._ws.onmessage=this._onMessage.bind(this),this._ws.onerror=this._onError.bind(this)}catch(e){this._onError(e)}}}},{key:"disconnect",value:function(){i("disconnect()"),this._ws&&(this._ws.onopen=function(){},this._ws.onclose=function(){},this._ws.onmessage=function(){},this._ws.onerror=function(){},this._ws.close(),this._ws=null)}},{key:"send",value:function(e){return i("send()"),this.isConnected()?(this._ws.send(e),!0):(o("unable to send message, WebSocket is not open"),!1)}},{key:"isConnected",value:function(){return this._ws&&this._ws.readyState===this._ws.OPEN}},{key:"isConnecting",value:function(){return this._ws&&this._ws.readyState===this._ws.CONNECTING}},{key:"_onOpen",value:function(){i("WebSocket ".concat(this._url," connected")),this.onconnect()}},{key:"_onClose",value:function(e){var t=e.wasClean,n=e.code,r=e.reason;i("WebSocket ".concat(this._url," closed")),!1===t&&i("WebSocket abrupt disconnection");var s={socket:this,error:!t,code:n,reason:r};this.ondisconnect(s)}},{key:"_onMessage",value:function(e){var t=e.data;i("received WebSocket message"),this.ondata(t)}},{key:"_onError",value:function(e){o("WebSocket ".concat(this._url," error: ").concat(e))}},{key:"via_transport",get:function(){return this._via_transport},set:function(e){this._via_transport=e.toUpperCase()}},{key:"sip_uri",get:function(){return this._sip_uri}},{key:"url",get:function(){return this._url}}])&&r(t.prototype,n),l&&r(t,l),e}()},{"./Grammar":7,debug:30}],28:[function(e,t,n){"use strict";function r(e,t){var n;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(n=function(e,t){if(!e)return;if("string"==typeof e)return s(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return s(e,t)}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var r=0,i=function(){};return{s:i,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,l=!0,u=!1;return{s:function(){n=e[Symbol.iterator]()},n:function(){var e=n.next();return l=e.done,e},e:function(e){u=!0,o=e},f:function(){try{l||null==n.return||n.return()}finally{if(u)throw o}}}}function s(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r}var i,o,l,u=e("./Constants"),a=e("./SIPMessage"),c=e("./Utils"),h=e("debug")("JsSIP:sanityCheck"),f=[function(){for(var e=0,t=["from","to","call_id","cseq","via"];e<t.length;e++){var n=t[e];if(!i.hasHeader(n))return h("missing mandatory header field : ".concat(n,", dropping the response")),!1}}],d=[function(){if("sip"!==i.s("to").uri.scheme)return p(416),!1},function(){if(!i.to_tag&&i.call_id.substr(0,5)===o.configuration.jssip_id)return p(482),!1},function(){var e=c.str_utf8_length(i.body),t=i.getHeader("content-length");if(e<t)return p(400),!1},function(){var e,t=i.from_tag,n=i.call_id,r=i.cseq;if(i.to_tag)return;if(i.method===u.INVITE){if(o._transactions.ist[i.via_branch])return!1;for(var s in o._transactions.ist)if(Object.prototype.hasOwnProperty.call(o._transactions.ist,s)&&(e=o._transactions.ist[s]).request.from_tag===t&&e.request.call_id===n&&e.request.cseq===r)return p(482),!1}else{if(o._transactions.nist[i.via_branch])return!1;for(var l in o._transactions.nist)if(Object.prototype.hasOwnProperty.call(o._transactions.nist,l)&&(e=o._transactions.nist[l]).request.from_tag===t&&e.request.call_id===n&&e.request.cseq===r)return p(482),!1}}],_=[function(){if(i.getHeaders("via").length>1)return h("more than one Via header field present in the response, dropping the response"),!1},function(){var e=c.str_utf8_length(i.body),t=i.getHeader("content-length");if(e<t)return h("message body length is lower than the value in Content-Length header field, dropping the response"),!1}];function p(e){var t,n,s=i.getHeaders("via"),o="SIP/2.0 ".concat(e," ").concat(u.REASON_PHRASE[e],"\r\n"),a=r(s);try{for(a.s();!(n=a.n()).done;){var h=n.value;o+="Via: ".concat(h,"\r\n")}}catch(e){a.e(e)}finally{a.f()}t=i.getHeader("To"),i.to_tag||(t+=";tag=".concat(c.newTag())),o+="To: ".concat(t,"\r\n"),o+="From: ".concat(i.getHeader("From"),"\r\n"),o+="Call-ID: ".concat(i.call_id,"\r\n"),o+="CSeq: ".concat(i.cseq," ").concat(i.method,"\r\n"),o+="\r\n",l.send(o)}t.exports=function(e,t,n){i=e,o=t,l=n;var s,u=r(f);try{for(u.s();!(s=u.n()).done;){if(!1===(0,s.value)())return!1}}catch(e){u.e(e)}finally{u.f()}if(i instanceof a.IncomingRequest){var c,h=r(d);try{for(h.s();!(c=h.n()).done;){if(!1===(0,c.value)())return!1}}catch(e){h.e(e)}finally{h.f()}}else if(i instanceof a.IncomingResponse){var p,m=r(_);try{for(m.s();!(p=m.n()).done;){if(!1===(0,p.value)())return!1}}catch(e){m.e(e)}finally{m.f()}}return!0}},{"./Constants":2,"./SIPMessage":19,"./Utils":26,debug:30}],29:[function(e,t,n){var r=Object.create||function(e){var t=function(){};return t.prototype=e,new t},s=Object.keys||function(e){var t=[];for(var n in e)Object.prototype.hasOwnProperty.call(e,n)&&t.push(n);return n},i=Function.prototype.bind||function(e){var t=this;return function(){return t.apply(e,arguments)}};function o(){this._events&&Object.prototype.hasOwnProperty.call(this,"_events")||(this._events=r(null),this._eventsCount=0),this._maxListeners=this._maxListeners||void 0}t.exports=o,o.EventEmitter=o,o.prototype._events=void 0,o.prototype._maxListeners=void 0;var l,u=10;try{var a={};Object.defineProperty&&Object.defineProperty(a,"x",{value:0}),l=0===a.x}catch(e){l=!1}function c(e){return void 0===e._maxListeners?o.defaultMaxListeners:e._maxListeners}function h(e,t,n,s){var i,o,l;if("function"!=typeof n)throw new TypeError('"listener" argument must be a function');if((o=e._events)?(o.newListener&&(e.emit("newListener",t,n.listener?n.listener:n),o=e._events),l=o[t]):(o=e._events=r(null),e._eventsCount=0),l){if("function"==typeof l?l=o[t]=s?[n,l]:[l,n]:s?l.unshift(n):l.push(n),!l.warned&&(i=c(e))&&i>0&&l.length>i){l.warned=!0;var u=new Error("Possible EventEmitter memory leak detected. "+l.length+' "'+String(t)+'" listeners added. Use emitter.setMaxListeners() to increase limit.');u.name="MaxListenersExceededWarning",u.emitter=e,u.type=t,u.count=l.length,"object"==typeof console&&console.warn&&console.warn("%s: %s",u.name,u.message)}}else l=o[t]=n,++e._eventsCount;return e}function f(){if(!this.fired)switch(this.target.removeListener(this.type,this.wrapFn),this.fired=!0,arguments.length){case 0:return this.listener.call(this.target);case 1:return this.listener.call(this.target,arguments[0]);case 2:return this.listener.call(this.target,arguments[0],arguments[1]);case 3:return this.listener.call(this.target,arguments[0],arguments[1],arguments[2]);default:for(var e=new Array(arguments.length),t=0;t<e.length;++t)e[t]=arguments[t];this.listener.apply(this.target,e)}}function d(e,t,n){var r={fired:!1,wrapFn:void 0,target:e,type:t,listener:n},s=i.call(f,r);return s.listener=n,r.wrapFn=s,s}function _(e,t,n){var r=e._events;if(!r)return[];var s=r[t];return s?"function"==typeof s?n?[s.listener||s]:[s]:n?function(e){for(var t=new Array(e.length),n=0;n<t.length;++n)t[n]=e[n].listener||e[n];return t}(s):m(s,s.length):[]}function p(e){var t=this._events;if(t){var n=t[e];if("function"==typeof n)return 1;if(n)return n.length}return 0}function m(e,t){for(var n=new Array(t),r=0;r<t;++r)n[r]=e[r];return n}l?Object.defineProperty(o,"defaultMaxListeners",{enumerable:!0,get:function(){return u},set:function(e){if("number"!=typeof e||e<0||e!=e)throw new TypeError('"defaultMaxListeners" must be a positive number');u=e}}):o.defaultMaxListeners=u,o.prototype.setMaxListeners=function(e){if("number"!=typeof e||e<0||isNaN(e))throw new TypeError('"n" argument must be a positive number');return this._maxListeners=e,this},o.prototype.getMaxListeners=function(){return c(this)},o.prototype.emit=function(e){var t,n,r,s,i,o,l="error"===e;if(o=this._events)l=l&&null==o.error;else if(!l)return!1;if(l){if(arguments.length>1&&(t=arguments[1]),t instanceof Error)throw t;var u=new Error('Unhandled "error" event. ('+t+")");throw u.context=t,u}if(!(n=o[e]))return!1;var a="function"==typeof n;switch(r=arguments.length){case 1:!function(e,t,n){if(t)e.call(n);else for(var r=e.length,s=m(e,r),i=0;i<r;++i)s[i].call(n)}(n,a,this);break;case 2:!function(e,t,n,r){if(t)e.call(n,r);else for(var s=e.length,i=m(e,s),o=0;o<s;++o)i[o].call(n,r)}(n,a,this,arguments[1]);break;case 3:!function(e,t,n,r,s){if(t)e.call(n,r,s);else for(var i=e.length,o=m(e,i),l=0;l<i;++l)o[l].call(n,r,s)}(n,a,this,arguments[1],arguments[2]);break;case 4:!function(e,t,n,r,s,i){if(t)e.call(n,r,s,i);else for(var o=e.length,l=m(e,o),u=0;u<o;++u)l[u].call(n,r,s,i)}(n,a,this,arguments[1],arguments[2],arguments[3]);break;default:for(s=new Array(r-1),i=1;i<r;i++)s[i-1]=arguments[i];!function(e,t,n,r){if(t)e.apply(n,r);else for(var s=e.length,i=m(e,s),o=0;o<s;++o)i[o].apply(n,r)}(n,a,this,s)}return!0},o.prototype.addListener=function(e,t){return h(this,e,t,!1)},o.prototype.on=o.prototype.addListener,o.prototype.prependListener=function(e,t){return h(this,e,t,!0)},o.prototype.once=function(e,t){if("function"!=typeof t)throw new TypeError('"listener" argument must be a function');return this.on(e,d(this,e,t)),this},o.prototype.prependOnceListener=function(e,t){if("function"!=typeof t)throw new TypeError('"listener" argument must be a function');return this.prependListener(e,d(this,e,t)),this},o.prototype.removeListener=function(e,t){var n,s,i,o,l;if("function"!=typeof t)throw new TypeError('"listener" argument must be a function');if(!(s=this._events))return this;if(!(n=s[e]))return this;if(n===t||n.listener===t)0==--this._eventsCount?this._events=r(null):(delete s[e],s.removeListener&&this.emit("removeListener",e,n.listener||t));else if("function"!=typeof n){for(i=-1,o=n.length-1;o>=0;o--)if(n[o]===t||n[o].listener===t){l=n[o].listener,i=o;break}if(i<0)return this;0===i?n.shift():function(e,t){for(var n=t,r=n+1,s=e.length;r<s;n+=1,r+=1)e[n]=e[r];e.pop()}(n,i),1===n.length&&(s[e]=n[0]),s.removeListener&&this.emit("removeListener",e,l||t)}return this},o.prototype.removeAllListeners=function(e){var t,n,i;if(!(n=this._events))return this;if(!n.removeListener)return 0===arguments.length?(this._events=r(null),this._eventsCount=0):n[e]&&(0==--this._eventsCount?this._events=r(null):delete n[e]),this;if(0===arguments.length){var o,l=s(n);for(i=0;i<l.length;++i)"removeListener"!==(o=l[i])&&this.removeAllListeners(o);return this.removeAllListeners("removeListener"),this._events=r(null),this._eventsCount=0,this}if("function"==typeof(t=n[e]))this.removeListener(e,t);else if(t)for(i=t.length-1;i>=0;i--)this.removeListener(e,t[i]);return this},o.prototype.listeners=function(e){return _(this,e,!0)},o.prototype.rawListeners=function(e){return _(this,e,!1)},o.listenerCount=function(e,t){return"function"==typeof e.listenerCount?e.listenerCount(t):p.call(e,t)},o.prototype.listenerCount=p,o.prototype.eventNames=function(){return this._eventsCount>0?Reflect.ownKeys(this._events):[]}},{}],30:[function(e,t,n){(function(r){n.log=function(...e){return"object"==typeof console&&console.log&&console.log(...e)},n.formatArgs=function(e){if(e[0]=(this.useColors?"%c":"")+this.namespace+(this.useColors?" %c":" ")+e[0]+(this.useColors?"%c ":" ")+"+"+t.exports.humanize(this.diff),!this.useColors)return;const n="color: "+this.color;e.splice(1,0,n,"color: inherit");let r=0,s=0;e[0].replace(/%[a-zA-Z%]/g,e=>{"%%"!==e&&(r++,"%c"===e&&(s=r))}),e.splice(s,0,n)},n.save=function(e){try{e?n.storage.setItem("debug",e):n.storage.removeItem("debug")}catch(e){}},n.load=function(){let e;try{e=n.storage.getItem("debug")}catch(e){}!e&&void 0!==r&&"env"in r&&(e=r.env.DEBUG);return e},n.useColors=function(){if("undefined"!=typeof window&&window.process&&("renderer"===window.process.type||window.process.__nwjs))return!0;if("undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/))return!1;return"undefined"!=typeof document&&document.documentElement&&document.documentElement.style&&document.documentElement.style.WebkitAppearance||"undefined"!=typeof window&&window.console&&(window.console.firebug||window.console.exception&&window.console.table)||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)&&parseInt(RegExp.$1,10)>=31||"undefined"!=typeof navigator&&navigator.userAgent&&navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/)},n.storage=function(){try{return localStorage}catch(e){}}(),n.colors=["#0000CC","#0000FF","#0033CC","#0033FF","#0066CC","#0066FF","#0099CC","#0099FF","#00CC00","#00CC33","#00CC66","#00CC99","#00CCCC","#00CCFF","#3300CC","#3300FF","#3333CC","#3333FF","#3366CC","#3366FF","#3399CC","#3399FF","#33CC00","#33CC33","#33CC66","#33CC99","#33CCCC","#33CCFF","#6600CC","#6600FF","#6633CC","#6633FF","#66CC00","#66CC33","#9900CC","#9900FF","#9933CC","#9933FF","#99CC00","#99CC33","#CC0000","#CC0033","#CC0066","#CC0099","#CC00CC","#CC00FF","#CC3300","#CC3333","#CC3366","#CC3399","#CC33CC","#CC33FF","#CC6600","#CC6633","#CC9900","#CC9933","#CCCC00","#CCCC33","#FF0000","#FF0033","#FF0066","#FF0099","#FF00CC","#FF00FF","#FF3300","#FF3333","#FF3366","#FF3399","#FF33CC","#FF33FF","#FF6600","#FF6633","#FF9900","#FF9933","#FFCC00","#FFCC33"],t.exports=e("./common")(n);const{formatters:s}=t.exports;s.j=function(e){try{return JSON.stringify(e)}catch(e){return"[UnexpectedJSONParseError]: "+e.message}}}).call(this,e("_process"))},{"./common":31,_process:33}],31:[function(e,t,n){t.exports=function(t){function n(e){let t=0;for(let n=0;n<e.length;n++)t=(t<<5)-t+e.charCodeAt(n),t|=0;return r.colors[Math.abs(t)%r.colors.length]}function r(e){let t;function o(...e){if(!o.enabled)return;const n=o,s=Number(new Date),i=s-(t||s);n.diff=i,n.prev=t,n.curr=s,t=s,e[0]=r.coerce(e[0]),"string"!=typeof e[0]&&e.unshift("%O");let l=0;e[0]=e[0].replace(/%([a-zA-Z%])/g,(t,s)=>{if("%%"===t)return t;l++;const i=r.formatters[s];if("function"==typeof i){const r=e[l];t=i.call(n,r),e.splice(l,1),l--}return t}),r.formatArgs.call(n,e),(n.log||r.log).apply(n,e)}return o.namespace=e,o.enabled=r.enabled(e),o.useColors=r.useColors(),o.color=n(e),o.destroy=s,o.extend=i,"function"==typeof r.init&&r.init(o),r.instances.push(o),o}function s(){const e=r.instances.indexOf(this);return-1!==e&&(r.instances.splice(e,1),!0)}function i(e,t){const n=r(this.namespace+(void 0===t?":":t)+e);return n.log=this.log,n}function o(e){return e.toString().substring(2,e.toString().length-2).replace(/\.\*\?$/,"*")}return r.debug=r,r.default=r,r.coerce=function(e){return e instanceof Error?e.stack||e.message:e},r.disable=function(){const e=[...r.names.map(o),...r.skips.map(o).map(e=>"-"+e)].join(",");return r.enable(""),e},r.enable=function(e){let t;r.save(e),r.names=[],r.skips=[];const n=("string"==typeof e?e:"").split(/[\s,]+/),s=n.length;for(t=0;t<s;t++)n[t]&&("-"===(e=n[t].replace(/\*/g,".*?"))[0]?r.skips.push(new RegExp("^"+e.substr(1)+"$")):r.names.push(new RegExp("^"+e+"$")));for(t=0;t<r.instances.length;t++){const e=r.instances[t];e.enabled=r.enabled(e.namespace)}},r.enabled=function(e){if("*"===e[e.length-1])return!0;let t,n;for(t=0,n=r.skips.length;t<n;t++)if(r.skips[t].test(e))return!1;for(t=0,n=r.names.length;t<n;t++)if(r.names[t].test(e))return!0;return!1},r.humanize=e("ms"),Object.keys(t).forEach(e=>{r[e]=t[e]}),r.instances=[],r.names=[],r.skips=[],r.formatters={},r.selectColor=n,r.enable(r.load()),r}},{ms:32}],32:[function(e,t,n){var r=1e3,s=60*r,i=60*s,o=24*i,l=7*o,u=365.25*o;function a(e,t,n,r){var s=t>=1.5*n;return Math.round(e/n)+" "+r+(s?"s":"")}t.exports=function(e,t){t=t||{};var n=typeof e;if("string"===n&&e.length>0)return function(e){if((e=String(e)).length>100)return;var t=/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(e);if(!t)return;var n=parseFloat(t[1]);switch((t[2]||"ms").toLowerCase()){case"years":case"year":case"yrs":case"yr":case"y":return n*u;case"weeks":case"week":case"w":return n*l;case"days":case"day":case"d":return n*o;case"hours":case"hour":case"hrs":case"hr":case"h":return n*i;case"minutes":case"minute":case"mins":case"min":case"m":return n*s;case"seconds":case"second":case"secs":case"sec":case"s":return n*r;case"milliseconds":case"millisecond":case"msecs":case"msec":case"ms":return n;default:return}}(e);if("number"===n&&isFinite(e))return t.long?function(e){var t=Math.abs(e);if(t>=o)return a(e,t,o,"day");if(t>=i)return a(e,t,i,"hour");if(t>=s)return a(e,t,s,"minute");if(t>=r)return a(e,t,r,"second");return e+" ms"}(e):function(e){var t=Math.abs(e);if(t>=o)return Math.round(e/o)+"d";if(t>=i)return Math.round(e/i)+"h";if(t>=s)return Math.round(e/s)+"m";if(t>=r)return Math.round(e/r)+"s";return e+"ms"}(e);throw new Error("val is not a non-empty string or a valid number. val="+JSON.stringify(e))}},{}],33:[function(e,t,n){var r,s,i=t.exports={};function o(){throw new Error("setTimeout has not been defined")}function l(){throw new Error("clearTimeout has not been defined")}function u(e){if(r===setTimeout)return setTimeout(e,0);if((r===o||!r)&&setTimeout)return r=setTimeout,setTimeout(e,0);try{return r(e,0)}catch(t){try{return r.call(null,e,0)}catch(t){return r.call(this,e,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:o}catch(e){r=o}try{s="function"==typeof clearTimeout?clearTimeout:l}catch(e){s=l}}();var a,c=[],h=!1,f=-1;function d(){h&&a&&(h=!1,a.length?c=a.concat(c):f=-1,c.length&&_())}function _(){if(!h){var e=u(d);h=!0;for(var t=c.length;t;){for(a=c,c=[];++f<t;)a&&a[f].run();f=-1,t=c.length}a=null,h=!1,function(e){if(s===clearTimeout)return clearTimeout(e);if((s===l||!s)&&clearTimeout)return s=clearTimeout,clearTimeout(e);try{s(e)}catch(t){try{return s.call(null,e)}catch(t){return s.call(this,e)}}}(e)}}function p(e,t){this.fun=e,this.array=t}function m(){}i.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];c.push(new p(e,t)),1!==c.length||h||u(_)},p.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=m,i.addListener=m,i.once=m,i.off=m,i.removeListener=m,i.removeAllListeners=m,i.emit=m,i.prependListener=m,i.prependOnceListener=m,i.listeners=function(e){return[]},i.binding=function(e){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(e){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],34:[function(e,t,n){var r=t.exports={v:[{name:"version",reg:/^(\d*)$/}],o:[{name:"origin",reg:/^(\S*) (\d*) (\d*) (\S*) IP(\d) (\S*)/,names:["username","sessionId","sessionVersion","netType","ipVer","address"],format:"%s %s %d %s IP%d %s"}],s:[{name:"name"}],i:[{name:"description"}],u:[{name:"uri"}],e:[{name:"email"}],p:[{name:"phone"}],z:[{name:"timezones"}],r:[{name:"repeats"}],t:[{name:"timing",reg:/^(\d*) (\d*)/,names:["start","stop"],format:"%d %d"}],c:[{name:"connection",reg:/^IN IP(\d) (\S*)/,names:["version","ip"],format:"IN IP%d %s"}],b:[{push:"bandwidth",reg:/^(TIAS|AS|CT|RR|RS):(\d*)/,names:["type","limit"],format:"%s:%s"}],m:[{reg:/^(\w*) (\d*) ([\w/]*)(?: (.*))?/,names:["type","port","protocol","payloads"],format:"%s %d %s %s"}],a:[{push:"rtp",reg:/^rtpmap:(\d*) ([\w\-.]*)(?:\s*\/(\d*)(?:\s*\/(\S*))?)?/,names:["payload","codec","rate","encoding"],format:function(e){return e.encoding?"rtpmap:%d %s/%s/%s":e.rate?"rtpmap:%d %s/%s":"rtpmap:%d %s"}},{push:"fmtp",reg:/^fmtp:(\d*) ([\S| ]*)/,names:["payload","config"],format:"fmtp:%d %s"},{name:"control",reg:/^control:(.*)/,format:"control:%s"},{name:"rtcp",reg:/^rtcp:(\d*)(?: (\S*) IP(\d) (\S*))?/,names:["port","netType","ipVer","address"],format:function(e){return null!=e.address?"rtcp:%d %s IP%d %s":"rtcp:%d"}},{push:"rtcpFbTrrInt",reg:/^rtcp-fb:(\*|\d*) trr-int (\d*)/,names:["payload","value"],format:"rtcp-fb:%d trr-int %d"},{push:"rtcpFb",reg:/^rtcp-fb:(\*|\d*) ([\w-_]*)(?: ([\w-_]*))?/,names:["payload","type","subtype"],format:function(e){return null!=e.subtype?"rtcp-fb:%s %s %s":"rtcp-fb:%s %s"}},{push:"ext",reg:/^extmap:(\d+)(?:\/(\w+))?(?: (urn:ietf:params:rtp-hdrext:encrypt))? (\S*)(?: (\S*))?/,names:["value","direction","encrypt-uri","uri","config"],format:function(e){return"extmap:%d"+(e.direction?"/%s":"%v")+(e["encrypt-uri"]?" %s":"%v")+" %s"+(e.config?" %s":"")}},{name:"extmapAllowMixed",reg:/^(extmap-allow-mixed)/},{push:"crypto",reg:/^crypto:(\d*) ([\w_]*) (\S*)(?: (\S*))?/,names:["id","suite","config","sessionConfig"],format:function(e){return null!=e.sessionConfig?"crypto:%d %s %s %s":"crypto:%d %s %s"}},{name:"setup",reg:/^setup:(\w*)/,format:"setup:%s"},{name:"connectionType",reg:/^connection:(new|existing)/,format:"connection:%s"},{name:"mid",reg:/^mid:([^\s]*)/,format:"mid:%s"},{name:"msid",reg:/^msid:(.*)/,format:"msid:%s"},{name:"ptime",reg:/^ptime:(\d*(?:\.\d*)*)/,format:"ptime:%d"},{name:"maxptime",reg:/^maxptime:(\d*(?:\.\d*)*)/,format:"maxptime:%d"},{name:"direction",reg:/^(sendrecv|recvonly|sendonly|inactive)/},{name:"icelite",reg:/^(ice-lite)/},{name:"iceUfrag",reg:/^ice-ufrag:(\S*)/,format:"ice-ufrag:%s"},{name:"icePwd",reg:/^ice-pwd:(\S*)/,format:"ice-pwd:%s"},{name:"fingerprint",reg:/^fingerprint:(\S*) (\S*)/,names:["type","hash"],format:"fingerprint:%s %s"},{push:"candidates",reg:/^candidate:(\S*) (\d*) (\S*) (\d*) (\S*) (\d*) typ (\S*)(?: raddr (\S*) rport (\d*))?(?: tcptype (\S*))?(?: generation (\d*))?(?: network-id (\d*))?(?: network-cost (\d*))?/,names:["foundation","component","transport","priority","ip","port","type","raddr","rport","tcptype","generation","network-id","network-cost"],format:function(e){var t="candidate:%s %d %s %d %s %d typ %s";return t+=null!=e.raddr?" raddr %s rport %d":"%v%v",t+=null!=e.tcptype?" tcptype %s":"%v",null!=e.generation&&(t+=" generation %d"),t+=null!=e["network-id"]?" network-id %d":"%v",t+=null!=e["network-cost"]?" network-cost %d":"%v"}},{name:"endOfCandidates",reg:/^(end-of-candidates)/},{name:"remoteCandidates",reg:/^remote-candidates:(.*)/,format:"remote-candidates:%s"},{name:"iceOptions",reg:/^ice-options:(\S*)/,format:"ice-options:%s"},{push:"ssrcs",reg:/^ssrc:(\d*) ([\w_-]*)(?::(.*))?/,names:["id","attribute","value"],format:function(e){var t="ssrc:%d";return null!=e.attribute&&(t+=" %s",null!=e.value&&(t+=":%s")),t}},{push:"ssrcGroups",reg:/^ssrc-group:([\x21\x23\x24\x25\x26\x27\x2A\x2B\x2D\x2E\w]*) (.*)/,names:["semantics","ssrcs"],format:"ssrc-group:%s %s"},{name:"msidSemantic",reg:/^msid-semantic:\s?(\w*) (\S*)/,names:["semantic","token"],format:"msid-semantic: %s %s"},{push:"groups",reg:/^group:(\w*) (.*)/,names:["type","mids"],format:"group:%s %s"},{name:"rtcpMux",reg:/^(rtcp-mux)/},{name:"rtcpRsize",reg:/^(rtcp-rsize)/},{name:"sctpmap",reg:/^sctpmap:([\w_/]*) (\S*)(?: (\S*))?/,names:["sctpmapNumber","app","maxMessageSize"],format:function(e){return null!=e.maxMessageSize?"sctpmap:%s %s %s":"sctpmap:%s %s"}},{name:"xGoogleFlag",reg:/^x-google-flag:([^\s]*)/,format:"x-google-flag:%s"},{push:"rids",reg:/^rid:([\d\w]+) (\w+)(?: ([\S| ]*))?/,names:["id","direction","params"],format:function(e){return e.params?"rid:%s %s %s":"rid:%s %s"}},{push:"imageattrs",reg:new RegExp("^imageattr:(\\d+|\\*)[\\s\\t]+(send|recv)[\\s\\t]+(\\*|\\[\\S+\\](?:[\\s\\t]+\\[\\S+\\])*)(?:[\\s\\t]+(recv|send)[\\s\\t]+(\\*|\\[\\S+\\](?:[\\s\\t]+\\[\\S+\\])*))?"),names:["pt","dir1","attrs1","dir2","attrs2"],format:function(e){return"imageattr:%s %s %s"+(e.dir2?" %s %s":"")}},{name:"simulcast",reg:new RegExp("^simulcast:(send|recv) ([a-zA-Z0-9\\-_~;,]+)(?:\\s?(send|recv) ([a-zA-Z0-9\\-_~;,]+))?$"),names:["dir1","list1","dir2","list2"],format:function(e){return"simulcast:%s %s"+(e.dir2?" %s %s":"")}},{name:"simulcast_03",reg:/^simulcast:[\s\t]+([\S+\s\t]+)$/,names:["value"],format:"simulcast: %s"},{name:"framerate",reg:/^framerate:(\d+(?:$|\.\d+))/,format:"framerate:%s"},{name:"sourceFilter",reg:/^source-filter: *(excl|incl) (\S*) (IP4|IP6|\*) (\S*) (.*)/,names:["filterMode","netType","addressTypes","destAddress","srcList"],format:"source-filter: %s %s %s %s %s"},{name:"bundleOnly",reg:/^(bundle-only)/},{name:"label",reg:/^label:(.+)/,format:"label:%s"},{name:"sctpPort",reg:/^sctp-port:(\d+)$/,format:"sctp-port:%s"},{name:"maxMessageSize",reg:/^max-message-size:(\d+)$/,format:"max-message-size:%s"},{push:"tsRefClocks",reg:/^ts-refclk:([^\s=]*)(?:=(\S*))?/,names:["clksrc","clksrcExt"],format:function(e){return"ts-refclk:%s"+(null!=e.clksrcExt?"=%s":"")}},{name:"mediaClk",reg:/^mediaclk:(?:id=(\S*))? *([^\s=]*)(?:=(\S*))?(?: *rate=(\d+)\/(\d+))?/,names:["id","mediaClockName","mediaClockValue","rateNumerator","rateDenominator"],format:function(e){var t="mediaclk:";return t+=null!=e.id?"id=%s %s":"%v%s",t+=null!=e.mediaClockValue?"=%s":"",t+=null!=e.rateNumerator?" rate=%s":"",t+=null!=e.rateDenominator?"/%s":""}},{name:"keywords",reg:/^keywds:(.+)$/,format:"keywds:%s"},{name:"content",reg:/^content:(.+)/,format:"content:%s"},{name:"bfcpFloorCtrl",reg:/^floorctrl:(c-only|s-only|c-s)/,format:"floorctrl:%s"},{name:"bfcpConfId",reg:/^confid:(\d+)/,format:"confid:%s"},{name:"bfcpUserId",reg:/^userid:(\d+)/,format:"userid:%s"},{name:"bfcpFloorId",reg:/^floorid:(.+) (?:m-stream|mstrm):(.+)/,names:["id","mStream"],format:"floorid:%s mstrm:%s"},{push:"invalid",names:["value"]}]};Object.keys(r).forEach(function(e){r[e].forEach(function(e){e.reg||(e.reg=/(.*)/),e.format||(e.format="%s")})})},{}],35:[function(e,t,n){var r=e("./parser"),s=e("./writer");n.write=s,n.parse=r.parse,n.parseParams=r.parseParams,n.parseFmtpConfig=r.parseFmtpConfig,n.parsePayloads=r.parsePayloads,n.parseRemoteCandidates=r.parseRemoteCandidates,n.parseImageAttributes=r.parseImageAttributes,n.parseSimulcastStreamList=r.parseSimulcastStreamList},{"./parser":36,"./writer":37}],36:[function(e,t,n){var r=function(e){return String(Number(e))===e?Number(e):e},s=function(e,t,n){var s=e.name&&e.names;e.push&&!t[e.push]?t[e.push]=[]:s&&!t[e.name]&&(t[e.name]={});var i=e.push?{}:s?t[e.name]:t;!function(e,t,n,s){if(s&&!n)t[s]=r(e[1]);else for(var i=0;i<n.length;i+=1)null!=e[i+1]&&(t[n[i]]=r(e[i+1]))}(n.match(e.reg),i,e.names,e.name),e.push&&t[e.push].push(i)},i=e("./grammar"),o=RegExp.prototype.test.bind(/^([a-z])=(.*)/);n.parse=function(e){var t={},n=[],r=t;return e.split(/(\r\n|\r|\n)/).filter(o).forEach(function(e){var t=e[0],o=e.slice(2);"m"===t&&(n.push({rtp:[],fmtp:[]}),r=n[n.length-1]);for(var l=0;l<(i[t]||[]).length;l+=1){var u=i[t][l];if(u.reg.test(o))return s(u,r,o)}}),t.media=n,t};var l=function(e,t){var n=t.split(/=(.+)/,2);return 2===n.length?e[n[0]]=r(n[1]):1===n.length&&t.length>1&&(e[n[0]]=void 0),e};n.parseParams=function(e){return e.split(/;\s?/).reduce(l,{})},n.parseFmtpConfig=n.parseParams,n.parsePayloads=function(e){return e.toString().split(" ").map(Number)},n.parseRemoteCandidates=function(e){for(var t=[],n=e.split(" ").map(r),s=0;s<n.length;s+=3)t.push({component:n[s],ip:n[s+1],port:n[s+2]});return t},n.parseImageAttributes=function(e){return e.split(" ").map(function(e){return e.substring(1,e.length-1).split(",").reduce(l,{})})},n.parseSimulcastStreamList=function(e){return e.split(";").map(function(e){return e.split(",").map(function(e){var t,n=!1;return"~"!==e[0]?t=r(e):(t=r(e.substring(1,e.length)),n=!0),{scid:t,paused:n}})})}},{"./grammar":34}],37:[function(e,t,n){var r=e("./grammar"),s=/%[sdv%]/g,i=function(e,t,n){var r=[e+"="+(t.format instanceof Function?t.format(t.push?n:n[t.name]):t.format)];if(t.names)for(var i=0;i<t.names.length;i+=1){var o=t.names[i];t.name?r.push(n[t.name][o]):r.push(n[t.names[i]])}else r.push(n[t.name]);return function(e){var t=1,n=arguments,r=n.length;return e.replace(s,function(e){if(t>=r)return e;var s=n[t];switch(t+=1,e){case"%%":return"%";case"%s":return String(s);case"%d":return Number(s);case"%v":return""}})}.apply(null,r)},o=["v","o","s","i","u","e","p","c","b","t","r","z","a"],l=["i","c","b","a"];t.exports=function(e,t){t=t||{},null==e.version&&(e.version=0),null==e.name&&(e.name=" "),e.media.forEach(function(e){null==e.payloads&&(e.payloads="")});var n=t.outerOrder||o,s=t.innerOrder||l,u=[];return n.forEach(function(t){r[t].forEach(function(n){n.name in e&&null!=e[n.name]?u.push(i(t,n,e)):n.push in e&&null!=e[n.push]&&e[n.push].forEach(function(e){u.push(i(t,n,e))})})}),e.media.forEach(function(e){u.push(i("m",r.m[0],e)),s.forEach(function(t){r[t].forEach(function(n){n.name in e&&null!=e[n.name]?u.push(i(t,n,e)):n.push in e&&null!=e[n.push]&&e[n.push].forEach(function(e){u.push(i(t,n,e))})})})}),u.join("\r\n")+"\r\n"}},{"./grammar":34}],38:[function(e,t,n){t.exports={name:"jssip",title:"JsSIP",description:"the Javascript SIP library",version:"3.7.0",homepage:"https://jssip.net",author:"Jos茅 Luis Mill谩n <jmillan@aliax.net> (https://github.com/jmillan)",contributors:["I帽aki Baz Castillo <ibc@aliax.net> (https://github.com/ibc)"],types:"lib/JsSIP.d.ts",main:"lib-es5/JsSIP.js",keywords:["sip","websocket","webrtc","node","browser","library"],license:"MIT",repository:{type:"git",url:"https://github.com/versatica/JsSIP.git"},bugs:{url:"https://github.com/versatica/JsSIP/issues"},dependencies:{"@types/debug":"^4.1.5","@types/node":"^14.14.13",debug:"^4.3.1",events:"^3.2.0","sdp-transform":"^2.14.1"},devDependencies:{"@babel/core":"^7.12.10","@babel/preset-env":"^7.12.10","ansi-colors":"^3.2.4",browserify:"^16.5.1",eslint:"^5.16.0","fancy-log":"^1.3.3",gulp:"^4.0.2","gulp-babel":"^8.0.0","gulp-eslint":"^5.0.0","gulp-expect-file":"^1.0.2","gulp-header":"^2.0.9","gulp-nodeunit-runner":"^0.2.2","gulp-plumber":"^1.2.1","gulp-rename":"^1.4.0","gulp-uglify-es":"^1.0.4",pegjs:"^0.7.0","vinyl-buffer":"^1.0.1","vinyl-source-stream":"^2.0.0"},scripts:{lint:"gulp lint",test:"gulp test",prepublishOnly:"gulp babel"}}},{}]},{},[8])(8)});
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/res/js/mix-webrtc-1.0.0.min.js b/SGGL/FineUIPro.Web/res/js/mix-webrtc-1.0.0.min.js
new file mode 100644
index 00000000..40448ce0
--- /dev/null
+++ b/SGGL/FineUIPro.Web/res/js/mix-webrtc-1.0.0.min.js
@@ -0,0 +1,25 @@
+/*
+ * Mix WebRTC v1.0.0
+ * the Javascript SIP library
+ * Copyright: mixcom.cn
+ * Homepage: https://www.mixcom.cn
+ * License: MIT
+ */
+
+!(function (e) {
+  if ("object" == typeof exports && "undefined" != typeof module)
+    module.exports = e();
+  else if ("function" == typeof define && define.amd) define([], e);
+  else {
+    ("undefined" != typeof window
+      ? window
+      : "undefined" != typeof global
+      ? global
+      : "undefined" != typeof self
+      ? self
+      : this
+    ).WebRTC = e();
+  }
+})(function () {
+
+});
diff --git a/SGGL/FineUIPro.Web/res/js/mixrtc.min.js b/SGGL/FineUIPro.Web/res/js/mixrtc.min.js
new file mode 100644
index 00000000..780698be
--- /dev/null
+++ b/SGGL/FineUIPro.Web/res/js/mixrtc.min.js
@@ -0,0 +1,223 @@
+class WebRTC {
+  constructor(config) {
+    this.ChangeStatus = "";
+    this.options = {
+      mediaConstraints: { audio: true, video: false },
+      pcConfig: {
+        iceServers: [
+          { urls: ["stun:stun.mixcom.cn:3478"] },
+          {
+            urls: "turn:stun.mixcom.cn:3478",
+            username: "mixcom",
+            credential: "MikangyunST",
+          },
+        ],
+      },
+    };
+    this.audioConf = {
+      audio: "",
+      ringout: "",
+      ringin: "",
+      hangup: "",
+    };
+    if (config == undefined) {
+      console.log("[RTC] : RTC is missing configuration information");
+      return false;
+    }
+    if (
+      config.audioConfigs == undefined ||
+      typeof config.audioConfigs.audio != "object"
+    ) {
+      console.log("[RTC] : audio is not configured");
+    } else {
+      this.audioConf = { ...this.audioConf, ...config.audioConfigs };
+    }
+    if (config.changeStatus) {
+      this.ChangeStatus = config.changeStatus;
+    }
+    if (config.options !== undefined) {
+      this.options = config.options;
+    }
+    if (config.debug !== undefined && config.debug === true) {
+      JsSIP.debug.enable("JsSIP:*");
+    }
+  }
+
+  // 鍒濆鍖栧綍闊虫挱鏀�
+  audioInit() {
+    // 榛樿鏄惊鐜挱鏀�
+    const audio = this.audioConf.audio;
+    audio.srcObject = null;
+    audio.currentTime = 0;
+    audio.loop = false;
+    audio.src = "";
+  }
+
+  // 鎾斁褰曢煶
+  audioPlay(src) {
+    const audio = this.audioConf.audio;
+    this.audioInit();
+    if (src == "ringin" || src == "ringout") {
+      audio.loop = true;
+    }
+    audio.src = this.audioConf[src];
+    audio.load();
+    audio.play();
+  }
+
+  // 杩炴帴WebSocket
+  WebSocket(url) {
+    this.socket = new JsSIP.WebSocketInterface(url);
+  }
+
+  // 娉ㄥ唽鍒嗘満
+  register(config) {
+    console.log("娉ㄥ唽鍒嗘満");
+    this.configuration = {
+      sockets: [this.socket],
+      uri: "sip:" + config.extension + "@" + config.sipserver,
+      password: config.password,
+      contact_uri: "sip:" + config.extension + "@" + config.sipserver,
+    };
+    this.ua = new JsSIP.UA(this.configuration);
+    // Websocket杩炴帴鎴愬姛
+    this.ua.on("connected", function () {
+      console.log("websocket杩炴帴鎴愬姛");
+    });
+
+    // Websocket杩炴帴鏂紑
+    this.ua.on("disconnected", function () {
+      console.log("websocket杩炴帴鏂紑");
+      // 閲嶈繛
+      if (this.ua) {
+          this.ua.start();
+      }
+    });
+
+    var that = this;
+    // 鍛煎叆鎴栬�呭懠鍑烘椂瑙﹀彂鐨勪簨浠�
+    this.ua.on("newRTCSession", function (e) {
+      const { session, originator } = e;
+
+      that.session = session;
+
+      switch (originator) {
+        // out
+        case "local":
+          // 姝ゅ涓哄懠鍑哄墠鐨勬搷浣�
+          that.ChangeStatus("CallOut");
+          break;
+        case "remote":
+          that.audioPlay("ringin");
+          that.ChangeStatus("CallIn", session.remote_identity.display_name);
+          // 姝ゅ涓哄懠鍏ユ帴閫氬墠鐨勬搷浣�
+          break;
+        default:
+      }
+
+      // 杩炴帴涓�
+      session.on("connecting", () => {
+        that.ChangeStatus("Connecting");
+      });
+      // 杩炴帴宸叉帴鍙�
+      session.on("accepted", () => {
+        that.ChangeStatus("Connected");
+      });
+
+      // 閫氳瘽涓�
+      session.on("confirmed", () => {
+        that.ChangeStatus("Calling");
+        const stream = new MediaStream();
+        const receivers = session.connection.getReceivers();
+        if (receivers) {
+          receivers.forEach((receiver) => stream.addTrack(receiver.track));
+        }
+        audio.srcObject = stream;
+        // 鏈�鍚庨兘瑕佹挱鏀�
+        audio.play();
+      });
+
+      // 鎾斁鍥為搩闊�
+      session.on("progress", () => {
+        // 鍒ゆ柇鍛煎嚭 鎾斁鍥為搩
+        if (originator === "local") {
+          that.audioInit();
+          const stream = new MediaStream();
+          const receivers = session.connection.getReceivers();
+          if (receivers) {
+            receivers.forEach((receiver) => stream.addTrack(receiver.track));
+          }
+          audio.srcObject = stream;
+          audio.play();
+        }
+      });
+
+      // 缁撴潫
+      session.on("ended", () => {
+        console.log("鎸傛柇浜�");
+        that.ChangeStatus("Ended", "");
+        that.audioPlay("hangup");
+      });
+      // 澶辫触
+      session.on("failed", (e) => {
+        console.log("澶辫触浜�");
+        that.ChangeStatus("Failed", "");
+        that.audioPlay("hangup");
+      });
+
+      // ICE 浜や簰杩為�氬缓绔嬩簨浠� 鍔犲揩閫氳閫熷害
+      session.on('icecandidate', function (event) {
+        if (
+          event.candidate.type === 'srflx' &&
+          event.candidate.relatedAddress !== null &&
+          event.candidate.relatedPort !== null
+        ) {
+          event.ready();
+        }
+      });
+    });
+
+    this.ua.on("registered", () => {
+      console.log("[SIP Phone] : Registered (ON LINE)");
+    });
+    this.ua.on("unregistered", () => {
+      console.log("[SIP Phone] : Unregistered (OFF LINE)");
+    });
+    this.ua.on("registrationFailed", (e) => {
+      console.log("[SIP Phone] : Registration Failed (OFF LINE)");
+    });
+
+    this.ua.start();
+  }
+
+  // 娉ㄩ攢
+  unregister() {
+    this.ua.unregister(this.options);
+    this.ua.stop();
+    this.ua = null;
+    console.log("[SIP Phone] : unregistered")
+  }
+
+  // 鍛煎嚭
+  call(phone) {
+    this.ua.call(phone, this.options);
+    this.audioPlay("ringout");
+  }
+
+  // 鎸傛柇
+  hangup() {
+    this.ua.terminateSessions();
+  }
+
+  // 鎺ラ��
+  answer() {
+    console.log(this.session)
+    this.session.answer(this.options);
+  }
+
+  // 鎷掓帴
+  reject() {
+    this.ua.terminateSessions();
+    // this.seesion.terminate(this.options);
+  }
+}
diff --git a/SGGL/FineUIPro.Web/res/wav/dududu.wav b/SGGL/FineUIPro.Web/res/wav/dududu.wav
new file mode 100644
index 00000000..75a2a761
Binary files /dev/null and b/SGGL/FineUIPro.Web/res/wav/dududu.wav differ
diff --git a/SGGL/FineUIPro.Web/res/wav/ringin.wav b/SGGL/FineUIPro.Web/res/wav/ringin.wav
new file mode 100644
index 00000000..38fff79e
Binary files /dev/null and b/SGGL/FineUIPro.Web/res/wav/ringin.wav differ
diff --git a/SGGL/FineUIPro.Web/res/wav/ringout.wav b/SGGL/FineUIPro.Web/res/wav/ringout.wav
new file mode 100644
index 00000000..e3ece028
Binary files /dev/null and b/SGGL/FineUIPro.Web/res/wav/ringout.wav differ
diff --git a/SGGL/Model/.vs/Model.csproj.dtbcache.json b/SGGL/Model/.vs/Model.csproj.dtbcache.json
index edd8d877..a972895e 100644
--- a/SGGL/Model/.vs/Model.csproj.dtbcache.json
+++ b/SGGL/Model/.vs/Model.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\Model","ProjectFileName":"Model.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIItem\\AnBang\\PersonInput.cs"},{"SourceFile":"APIItem\\AnBang\\TrainInput.cs"},{"SourceFile":"APIItem\\ArchitectureReport.cs"},{"SourceFile":"APIItem\\ArchitectureReportItem.cs"},{"SourceFile":"APIItem\\BaseInfoItem.cs"},{"SourceFile":"APIItem\\ChemicalReport.cs"},{"SourceFile":"APIItem\\ChemicalReportItem.cs"},{"SourceFile":"APIItem\\CNCEC\\CheckRectifyItem.cs"},{"SourceFile":"APIItem\\CNCEC\\SubUnitReportItemItem.cs"},{"SourceFile":"APIItem\\CNCEC\\UpCheckReportItem.cs"},{"SourceFile":"APIItem\\CNCEC\\UpCheckReportItemItem.cs"},{"SourceFile":"APIItem\\CNCEC\\UpCheckReportItemItem2.cs"},{"SourceFile":"APIItem\\EnergyReport.cs"},{"SourceFile":"APIItem\\EnergyReportItem.cs"},{"SourceFile":"APIItem\\EPSummaryReport.cs"},{"SourceFile":"APIItem\\HJGL\\JointCompreInfoItem.cs"},{"SourceFile":"APIItem\\HJGL\\ReportQueryItem.cs"},{"SourceFile":"APIItem\\HJGL\\TestPackageItem.cs"},{"SourceFile":"APIItem\\HJGL\\WelderPerformanceItem.cs"},{"SourceFile":"APIItem\\HSSE\\ChartAnalysisItem.cs"},{"SourceFile":"APIItem\\HSSE\\CheckSpecialDetailItem.cs"},{"SourceFile":"APIItem\\HSSE\\CheckSpecialItem.cs"},{"SourceFile":"APIItem\\HSSE\\ConstructSolutionItem.cs"},{"SourceFile":"APIItem\\CQMS\\BeanUtil.cs"},{"SourceFile":"APIItem\\CQMS\\ResponseData.cs"},{"SourceFile":"APIItem\\CQMS\\SpotCheckItem.cs"},{"SourceFile":"APIItem\\CQMS\\ToDoModel.cs"},{"SourceFile":"APIItem\\CQMS\\TreeNode.cs"},{"SourceFile":"APIItem\\HSSE\\EmergencyProcessItem.cs"},{"SourceFile":"APIItem\\HSSE\\EmergencyTeamItem.cs"},{"SourceFile":"APIItem\\HSSE\\EquipmentQualityItem.cs"},{"SourceFile":"APIItem\\HSSE\\FileInfoItem.cs"},{"SourceFile":"APIItem\\HSSE\\FlowOperateItem.cs"},{"SourceFile":"APIItem\\HSSE\\FlowReceiveItem.cs"},{"SourceFile":"APIItem\\HSSE\\HazardListItem.cs"},{"SourceFile":"APIItem\\HSSE\\HazardListSelectedItem.cs"},{"SourceFile":"APIItem\\HSSE\\HazardRegisterItem.cs"},{"SourceFile":"APIItem\\HJGL\\HJGL_PreWeldingDailyItem.cs"},{"SourceFile":"APIItem\\HJGL\\HotProcessHardItem.cs"},{"SourceFile":"APIItem\\HJGL\\NDETrustItem.cs"},{"SourceFile":"APIItem\\HJGL\\WeldJointItem.cs"},{"SourceFile":"APIItem\\HSSE\\HSEDiaryItem.cs"},{"SourceFile":"APIItem\\HSSE\\HSSELogItem.cs"},{"SourceFile":"APIItem\\HSSE\\IncentiveNoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\LicenseDataItem.cs"},{"SourceFile":"APIItem\\HSSE\\LicenseItem.cs"},{"SourceFile":"APIItem\\HSSE\\MeetingItem.cs"},{"SourceFile":"APIItem\\HSSE\\NextFlowOperateItem.cs"},{"SourceFile":"APIItem\\HSSE\\NoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\PauseNoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\PersonInOutItem.cs"},{"SourceFile":"APIItem\\HSSE\\PersonItem.cs"},{"SourceFile":"APIItem\\HSSE\\PersonQualityItem.cs"},{"SourceFile":"APIItem\\HSSE\\PictureItem.cs"},{"SourceFile":"APIItem\\HSSE\\RecityNoticesItem.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport4OtherItem.cs"},{"SourceFile":"APIItem\\OperationReportDto.cs"},{"SourceFile":"APIItem\\ProjectGpsPointItem.cs"},{"SourceFile":"APIItem\\ProjectItem.cs"},{"SourceFile":"APIItem\\HSSE\\PunishNoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\PunishNoticeItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\ReceiveFileManagerItem.cs"},{"SourceFile":"APIItem\\HSSE\\RectifyNoticesFlowOperateItem.cs"},{"SourceFile":"APIItem\\HSSE\\RectifyNoticesItem.cs"},{"SourceFile":"APIItem\\HSSE\\RectifyNoticesItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\ResourcesItem.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport10Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport11Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport12Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport1Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport2Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport3Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport4Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport5Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport6Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport7Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport8Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport8ItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9ItemRectification.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9ItemSpecial.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9ItemStoppage.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReportItem.cs"},{"SourceFile":"APIItem\\HSSE\\SubscribeMessageItem.cs"},{"SourceFile":"APIItem\\HSSE\\SubUnitQualityItem.cs"},{"SourceFile":"APIItem\\HSSE\\SysTestRuleItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestPlanItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestPlanTrainingItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestRecordItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestRecordItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestTrainingResourcesItem.cs"},{"SourceFile":"APIItem\\QualityWorkSummaryReport.cs"},{"SourceFile":"APIItem\\QuarterlyProjectQuality.cs"},{"SourceFile":"APIItem\\ReturnData.cs"},{"SourceFile":"APIItem\\SafetyBriefing.cs"},{"SourceFile":"APIItem\\SaveOnlineFileItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEData.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataHiddenDangerCheckItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataRealTimeDeviceItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataRiskControlItem.cs"},{"SourceFile":"APIItem\\ToDoItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingPlanItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingPlanItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingTaskItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingTaskItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainRecordItem.cs"},{"SourceFile":"APIItem\\UnitItem.cs"},{"SourceFile":"APIItem\\UserItem.cs"},{"SourceFile":"APIItem\\UserReadItem.cs"},{"SourceFile":"APIItem\\WorkSummaryReport.cs"},{"SourceFile":"BusinessColumn.cs"},{"SourceFile":"Chart\\DataSourceChart.cs"},{"SourceFile":"Chart\\DataSourcePoint.cs"},{"SourceFile":"Chart\\DataSourceTeam.cs"},{"SourceFile":"CostControlDetailItem.cs"},{"SourceFile":"CQMS\\CheckItem.cs"},{"SourceFile":"CQMS\\CheckStatisc.cs"},{"SourceFile":"CQMS\\CQMSConstructSolutionStatisc.cs"},{"SourceFile":"CQMS\\FileCabinetItem.cs"},{"SourceFile":"CQMS\\InspectionManagementStatistics.cs"},{"SourceFile":"CQMS\\NCRReportStatisc.cs"},{"SourceFile":"CQMS\\NCRStatisc.cs"},{"SourceFile":"CQMS\\NDTCheckItem.cs"},{"SourceFile":"CQMS\\PassWelderStatisc.cs"},{"SourceFile":"CQMS\\QualityAcceptanceItem.cs"},{"SourceFile":"CQMS\\SteelItem.cs"},{"SourceFile":"CQMS\\WelderItem.cs"},{"SourceFile":"DoorServer\\AbsenceDutyItem.cs"},{"SourceFile":"DoorServer\\attendanceItem.cs"},{"SourceFile":"DoorServer\\attendanceItems.cs"},{"SourceFile":"DoorServer\\InOutListItem.cs"},{"SourceFile":"DoorServer\\t_d_departmentItem.cs"},{"SourceFile":"DoorServer\\t_d_employinfoItem.cs"},{"SourceFile":"DoorServer\\InOutstatisticsItem.cs"},{"SourceFile":"DoorServer\\t_d_validcardeventItem.cs"},{"SourceFile":"DoorServer\\t_d_facerecordItem.cs"},{"SourceFile":"ErrorInfo.cs"},{"SourceFile":"FaceRecordForm.cs"},{"SourceFile":"HandleStep.cs"},{"SourceFile":"HJGL\\SpWeldingDailyItem.cs"},{"SourceFile":"HSSE\\MonthReportCHSEDay.cs"},{"SourceFile":"HSSE\\PageDataPersonInOutItem.cs"},{"SourceFile":"HSSE\\SpResourceCollection.cs"},{"SourceFile":"HSSE\\WorkPostStatisticItem.cs"},{"SourceFile":"HSSE\\HSSE_HazardTemplate.cs"},{"SourceFile":"JDGL\\WBSDetailItem.cs"},{"SourceFile":"JDGL\\WBSSetInitItem.cs"},{"SourceFile":"JDGL\\WBSSetItem.cs"},{"SourceFile":"Model.cs"},{"SourceFile":"ModelProc.cs"},{"SourceFile":"Num.cs"},{"SourceFile":"Pie.cs"},{"SourceFile":"PieData.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SingleSerie.cs"},{"SourceFile":"SingleSerie2.cs"},{"SourceFile":"SpSysMenuItem.cs"},{"SourceFile":"SpSysUserItem.cs"},{"SourceFile":"APIItem\\ResponeData.cs"},{"SourceFile":"SpTDesktopItem.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubEvaluationData.cs"},{"SourceFile":"TokenItem.cs"},{"SourceFile":"ZHGL\\DataSync\\CQMSDataItem.cs"},{"SourceFile":"ZHGL\\DataSync\\HJGLDataItem.cs"},{"SourceFile":"ZHGL\\DataSync\\HSSEDataItem.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEDataItem.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Newtonsoft.Json.12.0.1\\lib\\net40\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\Model\\bin\\Debug\\Model.dll","OutputItemRelativePath":"Model.dll"},{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\Model\\bin\\Debug\\Model.pdb","OutputItemRelativePath":"Model.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\Model","ProjectFileName":"Model.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"APIItem\\AnBang\\PersonInput.cs"},{"SourceFile":"APIItem\\AnBang\\PersonTrainRecordInput.cs"},{"SourceFile":"APIItem\\AnBang\\TrainInput.cs"},{"SourceFile":"APIItem\\AnBang\\TrainPersonInput.cs"},{"SourceFile":"APIItem\\ArchitectureReport.cs"},{"SourceFile":"APIItem\\ArchitectureReportItem.cs"},{"SourceFile":"APIItem\\BaseInfoItem.cs"},{"SourceFile":"APIItem\\ChemicalReport.cs"},{"SourceFile":"APIItem\\ChemicalReportItem.cs"},{"SourceFile":"APIItem\\CNCEC\\ActionWorkLedger.cs"},{"SourceFile":"APIItem\\CNCEC\\ActionWorkLedgerItem.cs"},{"SourceFile":"APIItem\\CNCEC\\CheckRectifyItem.cs"},{"SourceFile":"APIItem\\CNCEC\\SafetyProductionEvaluation.cs"},{"SourceFile":"APIItem\\CNCEC\\SafetyProductionEvaluationItem.cs"},{"SourceFile":"APIItem\\CNCEC\\SubUnitReportItemItem.cs"},{"SourceFile":"APIItem\\CNCEC\\UpCheckReportItem.cs"},{"SourceFile":"APIItem\\CNCEC\\UpCheckReportItemItem.cs"},{"SourceFile":"APIItem\\CNCEC\\UpCheckReportItemItem2.cs"},{"SourceFile":"APIItem\\DropDownItem.cs"},{"SourceFile":"APIItem\\EnergyReport.cs"},{"SourceFile":"APIItem\\EnergyReportItem.cs"},{"SourceFile":"APIItem\\Environmental_OperationReportDto.cs"},{"SourceFile":"APIItem\\EPSummaryReport.cs"},{"SourceFile":"APIItem\\HJGL\\JointCompreInfoItem.cs"},{"SourceFile":"APIItem\\HJGL\\ReportQueryItem.cs"},{"SourceFile":"APIItem\\HJGL\\TestPackageItem.cs"},{"SourceFile":"APIItem\\HJGL\\WelderPerformanceItem.cs"},{"SourceFile":"APIItem\\HSSE\\ChartAnalysisItem.cs"},{"SourceFile":"APIItem\\HSSE\\CheckSpecialDetailItem.cs"},{"SourceFile":"APIItem\\HSSE\\CheckSpecialItem.cs"},{"SourceFile":"APIItem\\HSSE\\ConstructSolutionItem.cs"},{"SourceFile":"APIItem\\CQMS\\BeanUtil.cs"},{"SourceFile":"APIItem\\CQMS\\ResponseData.cs"},{"SourceFile":"APIItem\\CQMS\\SpotCheckItem.cs"},{"SourceFile":"APIItem\\CQMS\\ToDoModel.cs"},{"SourceFile":"APIItem\\CQMS\\TreeNode.cs"},{"SourceFile":"APIItem\\HSSE\\EmergencyProcessItem.cs"},{"SourceFile":"APIItem\\HSSE\\EmergencyTeamItem.cs"},{"SourceFile":"APIItem\\HSSE\\EquipmentQualityItem.cs"},{"SourceFile":"APIItem\\HSSE\\FileInfoItem.cs"},{"SourceFile":"APIItem\\HSSE\\FlowOperateItem.cs"},{"SourceFile":"APIItem\\HSSE\\FlowReceiveItem.cs"},{"SourceFile":"APIItem\\HSSE\\HazardListItem.cs"},{"SourceFile":"APIItem\\HSSE\\HazardListSelectedItem.cs"},{"SourceFile":"APIItem\\HSSE\\HazardRegisterItem.cs"},{"SourceFile":"APIItem\\HJGL\\HJGL_PreWeldingDailyItem.cs"},{"SourceFile":"APIItem\\HJGL\\HotProcessHardItem.cs"},{"SourceFile":"APIItem\\HJGL\\NDETrustItem.cs"},{"SourceFile":"APIItem\\HJGL\\WeldJointItem.cs"},{"SourceFile":"APIItem\\HSSE\\HSEDiaryItem.cs"},{"SourceFile":"APIItem\\HSSE\\HSSELogItem.cs"},{"SourceFile":"APIItem\\HSSE\\IncentiveNoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\LicenseDataItem.cs"},{"SourceFile":"APIItem\\HSSE\\LicenseItem.cs"},{"SourceFile":"APIItem\\HSSE\\MeetingItem.cs"},{"SourceFile":"APIItem\\HSSE\\NextFlowOperateItem.cs"},{"SourceFile":"APIItem\\HSSE\\NoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\PauseNoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\PersonInOutItem.cs"},{"SourceFile":"APIItem\\HSSE\\PersonItem.cs"},{"SourceFile":"APIItem\\HSSE\\PersonQualityItem.cs"},{"SourceFile":"APIItem\\HSSE\\PictureItem.cs"},{"SourceFile":"APIItem\\HSSE\\RecityNoticesItem.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport4OtherItem.cs"},{"SourceFile":"APIItem\\OperationReportDto.cs"},{"SourceFile":"APIItem\\ProjectGpsPointItem.cs"},{"SourceFile":"APIItem\\ProjectItem.cs"},{"SourceFile":"APIItem\\HSSE\\PunishNoticeItem.cs"},{"SourceFile":"APIItem\\HSSE\\PunishNoticeItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\ReceiveFileManagerItem.cs"},{"SourceFile":"APIItem\\HSSE\\RectifyNoticesFlowOperateItem.cs"},{"SourceFile":"APIItem\\HSSE\\RectifyNoticesItem.cs"},{"SourceFile":"APIItem\\HSSE\\RectifyNoticesItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\ResourcesItem.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport10Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport11Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport12Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport1Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport2Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport3Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport4Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport5Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport6Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport7Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport8Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport8ItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9Item.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9ItemRectification.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9ItemSpecial.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReport9ItemStoppage.cs"},{"SourceFile":"APIItem\\HSSE\\SeDinMonthReportItem.cs"},{"SourceFile":"APIItem\\HSSE\\SubscribeMessageItem.cs"},{"SourceFile":"APIItem\\HSSE\\SubUnitQualityItem.cs"},{"SourceFile":"APIItem\\HSSE\\SysTestRuleItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestPlanItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestPlanTrainingItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestRecordItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestRecordItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\TestTrainingResourcesItem.cs"},{"SourceFile":"APIItem\\QualityWorkSummaryReport.cs"},{"SourceFile":"APIItem\\QuarterlyProjectQuality.cs"},{"SourceFile":"APIItem\\ReturnData.cs"},{"SourceFile":"APIItem\\SafetyBriefing.cs"},{"SourceFile":"APIItem\\SaveOnlineFileItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEData.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataHiddenDangerCheckItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataRealTimeDeviceItem.cs"},{"SourceFile":"APIItem\\SHHSE\\NewSYHSEDataRiskControlItem.cs"},{"SourceFile":"APIItem\\ToDoItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingPlanItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingPlanItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingTaskItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainingTaskItemItem.cs"},{"SourceFile":"APIItem\\HSSE\\TrainRecordItem.cs"},{"SourceFile":"APIItem\\UnitItem.cs"},{"SourceFile":"APIItem\\UserItem.cs"},{"SourceFile":"APIItem\\UserReadItem.cs"},{"SourceFile":"APIItem\\WorkSummaryReport.cs"},{"SourceFile":"BusinessColumn.cs"},{"SourceFile":"Chart\\DataSourceChart.cs"},{"SourceFile":"Chart\\DataSourcePoint.cs"},{"SourceFile":"Chart\\DataSourceTeam.cs"},{"SourceFile":"CostControlDetailItem.cs"},{"SourceFile":"CQMS\\BreakdownProject.cs"},{"SourceFile":"CQMS\\CheckItem.cs"},{"SourceFile":"CQMS\\CheckStatisc.cs"},{"SourceFile":"CQMS\\CQMSConstructSolutionStatisc.cs"},{"SourceFile":"CQMS\\FileCabinetItem.cs"},{"SourceFile":"CQMS\\InspectionManagement.cs"},{"SourceFile":"CQMS\\InspectionManagementDetail.cs"},{"SourceFile":"CQMS\\InspectionManagementStatistics.cs"},{"SourceFile":"CQMS\\NCRReportStatisc.cs"},{"SourceFile":"CQMS\\NCRStatisc.cs"},{"SourceFile":"CQMS\\NDTCheckItem.cs"},{"SourceFile":"CQMS\\PassWelderStatisc.cs"},{"SourceFile":"CQMS\\QualityAcceptanceItem.cs"},{"SourceFile":"CQMS\\SteelItem.cs"},{"SourceFile":"CQMS\\UnitWork.cs"},{"SourceFile":"CQMS\\WelderItem.cs"},{"SourceFile":"DoorServer\\AbsenceDutyItem.cs"},{"SourceFile":"DoorServer\\attendanceItem.cs"},{"SourceFile":"DoorServer\\attendanceItems.cs"},{"SourceFile":"DoorServer\\InOutListItem.cs"},{"SourceFile":"DoorServer\\t_d_departmentItem.cs"},{"SourceFile":"DoorServer\\t_d_employinfoItem.cs"},{"SourceFile":"DoorServer\\InOutstatisticsItem.cs"},{"SourceFile":"DoorServer\\t_d_validcardeventItem.cs"},{"SourceFile":"DoorServer\\t_d_facerecordItem.cs"},{"SourceFile":"ErrorInfo.cs"},{"SourceFile":"FaceRecordForm.cs"},{"SourceFile":"HandleStep.cs"},{"SourceFile":"HJGL\\SpWeldingDailyItem.cs"},{"SourceFile":"HSSE\\MonthReportCHSEDay.cs"},{"SourceFile":"HSSE\\PageDataPersonInOutItem.cs"},{"SourceFile":"HSSE\\SpResourceCollection.cs"},{"SourceFile":"HSSE\\WorkPostStatisticItem.cs"},{"SourceFile":"HSSE\\HSSE_HazardTemplate.cs"},{"SourceFile":"JDGL\\WBSDetailItem.cs"},{"SourceFile":"JDGL\\WBSSetInitItem.cs"},{"SourceFile":"JDGL\\WBSSetItem.cs"},{"SourceFile":"Model.cs"},{"SourceFile":"ModelProc.cs"},{"SourceFile":"Num.cs"},{"SourceFile":"Pie.cs"},{"SourceFile":"PieData.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SingleSerie.cs"},{"SourceFile":"SingleSerie2.cs"},{"SourceFile":"SpSysMenuItem.cs"},{"SourceFile":"SpSysUserItem.cs"},{"SourceFile":"APIItem\\ResponeData.cs"},{"SourceFile":"SpTDesktopItem.cs"},{"SourceFile":"TestRun\\DriverSub\\DriverSubEvaluationData.cs"},{"SourceFile":"TokenItem.cs"},{"SourceFile":"ZHGL\\DataSync\\CQMSDataItem.cs"},{"SourceFile":"ZHGL\\DataSync\\HJGLDataItem.cs"},{"SourceFile":"ZHGL\\DataSync\\HSSEDataItem.cs"},{"SourceFile":"ZHGL\\DataSync\\SYHSEDataItem.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\Microsoft.CSharp\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.DataSetExtensions\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_64\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Web.DataVisualization\\v4.0_4.0.0.0__31bf3856ad364e35\\System.Web.DataVisualization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\Model\\bin\\Debug\\Model.dll","OutputItemRelativePath":"Model.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs b/SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs
new file mode 100644
index 00000000..d54abd04
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/ActionWorkLedger.cs
@@ -0,0 +1,44 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+namespace Model
+{
+    public class ActionWorkLedger
+    {
+        public string ActionWorkLedgerId
+        {
+            get;
+            set;
+        }
+
+        public string UnitId
+        {
+            get;
+            set;
+        }
+
+        public DateTime? ReportDate
+        {
+            get;
+            set;
+        }
+
+        public int? Quarter
+        {
+            get;
+            set;
+        }
+
+        public int? YearId
+        {
+            get;
+            set;
+        }
+
+        public string CompileMan
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/CNCEC/ActionWorkLedgerItem.cs b/SGGL/Model/APIItem/CNCEC/ActionWorkLedgerItem.cs
new file mode 100644
index 00000000..6f271afc
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/ActionWorkLedgerItem.cs
@@ -0,0 +1,62 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+namespace Model
+{
+    public class ActionWorkLedgerItem
+    {
+        public string ActionWorkLedgerItemId
+        {
+            get;
+            set;
+        }
+
+        public string ActionWorkLedgerId
+        {
+            get;
+            set;
+        }
+
+        public int? SortIndex
+        {
+            get;
+            set;
+        }
+
+        public string Focus
+        {
+            get;
+            set;
+        }
+
+        public string SpecialTask
+        {
+            get;
+            set;
+        }
+
+        public string WorkPoints
+        {
+            get;
+            set;
+        }
+
+        public string FillingRequirements
+        {
+            get;
+            set;
+        }
+
+        public string CompletionDeadline
+        {
+            get;
+            set;
+        }
+
+        public string ImplementationStatus
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/CNCEC/SafetyProductionEvaluation.cs b/SGGL/Model/APIItem/CNCEC/SafetyProductionEvaluation.cs
new file mode 100644
index 00000000..0aaded90
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/SafetyProductionEvaluation.cs
@@ -0,0 +1,47 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class SafetyProductionEvaluation
+    {
+        public string SafetyProductionEvaluationId
+        {
+            get;
+            set;
+        }
+
+        public string UnitId
+        {
+            get;
+            set;
+        }
+
+        public DateTime? ReportDate
+        {
+            get;
+            set;
+        }
+
+        public int? Quarter
+        {
+            get;
+            set;
+        }
+
+        public int? YearId
+        {
+            get;
+            set;
+        }
+
+        public string CompileMan
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/CNCEC/SafetyProductionEvaluationItem.cs b/SGGL/Model/APIItem/CNCEC/SafetyProductionEvaluationItem.cs
new file mode 100644
index 00000000..1d9e2f52
--- /dev/null
+++ b/SGGL/Model/APIItem/CNCEC/SafetyProductionEvaluationItem.cs
@@ -0,0 +1,65 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class SafetyProductionEvaluationItem
+    {
+        public string SafetyProductionEvaluationItemId
+        {
+            get;
+            set;
+        }
+
+        public string SafetyProductionEvaluationId
+        {
+            get;
+            set;
+        }
+
+        public int? SortIndex
+        {
+            get;
+            set;
+        }
+
+        public string Type
+        {
+            get;
+            set;
+        }
+
+        public string EvaluateWork
+        {
+            get;
+            set;
+        }
+
+        public string EvaluationContent
+        {
+            get;
+            set;
+        }
+
+        public string FillingRequirements
+        {
+            get;
+            set;
+        }
+
+        public string CompletionDeadline
+        {
+            get;
+            set;
+        }
+
+        public string ImplementationStatus
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/SGGL/Model/APIItem/EPSummaryReport.cs b/SGGL/Model/APIItem/EPSummaryReport.cs
index 9e7a3d31..b4cd7feb 100644
--- a/SGGL/Model/APIItem/EPSummaryReport.cs
+++ b/SGGL/Model/APIItem/EPSummaryReport.cs
@@ -38,15 +38,6 @@ namespace Model
             set;
         }
 
-        /// <summary>
-        /// 瀛ｅ害
-        /// </summary>
-        public int? Quarter
-        {
-            get;
-            set;
-        }
-
         /// <summary>
         /// 
         /// </summary>
@@ -125,5 +116,13 @@ namespace Model
             get;
             set;
         }
+        /// <summary>
+        /// 瀛ｅ害
+        /// </summary>
+        public int? Quarter
+        {
+            get;
+            set;
+        }
     }
 }
diff --git a/SGGL/Model/APIItem/EnergyReportItem.cs b/SGGL/Model/APIItem/EnergyReportItem.cs
index 424cb2bb..d52c7c29 100644
--- a/SGGL/Model/APIItem/EnergyReportItem.cs
+++ b/SGGL/Model/APIItem/EnergyReportItem.cs
@@ -100,6 +100,7 @@ namespace Model
         /// 鏈嶅姟钀ヤ笟鏀跺叆-鏈勾 
         ///</summary>
         public string ServiceOperatingIncome_ThisYear { get; set; }
+        public int? SortUnit { get; set; }
     }
 }
 
diff --git a/SGGL/Model/APIItem/Environmental_OperationReportDto.cs b/SGGL/Model/APIItem/Environmental_OperationReportDto.cs
new file mode 100644
index 00000000..b9531996
--- /dev/null
+++ b/SGGL/Model/APIItem/Environmental_OperationReportDto.cs
@@ -0,0 +1,74 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class Environmental_OperationReportDto
+    {
+        public string BusinessReportId { get; set; }
+
+        public string UnitId { get; set; }
+
+        public int? Year { get; set; }
+
+        public int? Quarters { get; set; }
+
+        
+
+        public string FillingMan { get; set; }
+
+        public DateTime? FillingDate { get; set; }
+
+        public string StatisticsDutyPerson { get; set; }
+
+        public string UnitDutyPerson { get; set; }
+
+        public string Remark { get; set; }
+
+        public string UpState { get; set; }
+
+        /// <summary>
+        /// 瀛愯〃鏁版嵁
+        /// </summary>
+        public List<reportItemListDto> reportItemList
+        {
+            get;
+            set;
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class reportItemListDto
+    {
+        public string BusinessReportItemId { get; set; }
+        public string BusinessReportId { get; set; }
+        public int? SortIndex { get; set; }
+        public string Code { get; set; }
+
+        public string UnitLevel { get; set; }
+
+        public DateTime? CreateDate { get; set; }
+
+        public string Place { get; set; }
+
+        public int? PersonNum { get; set; }
+
+        public decimal? TotalAssets { get; set; }
+
+        public decimal? TotalValue { get; set; }
+
+        public decimal? NewInvestment { get; set; }
+
+        public string UnitName { get; set; }
+
+        public string SortUnitName { get; set; }
+    }
+}
diff --git a/SGGL/Model/CQMS/BreakdownProject.cs b/SGGL/Model/CQMS/BreakdownProject.cs
new file mode 100644
index 00000000..2858690f
--- /dev/null
+++ b/SGGL/Model/CQMS/BreakdownProject.cs
@@ -0,0 +1,30 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.CQMS
+{
+    public class BreakdownProject
+    {
+        public string BreakdownProjectId { get; set; }
+        public string ProjectId { get; set; }
+        public string BreakdownCode { get; set; }
+        public string BreakdownName { get; set; }
+        public string DivisionProjectId { get; set; }
+        public string Basis { get; set; }
+        public string CheckPoints { get; set; }
+        public string RecordAndCode { get; set; }
+        public string Class { get; set; }
+        public string SortIndex { get; set; }
+        public string Remark { get; set; }
+        public string AttachUrl { get; set; }
+        public string IsAcceptance { get; set; }
+        public string FenBao { get; set; }
+        public string WuHuan { get; set; }
+        public string JianLi { get; set; }
+        public string YeZhu { get; set; }
+        public string IsSelected { get; set; }
+    }
+}
diff --git a/SGGL/Model/CQMS/InspectionManagement.cs b/SGGL/Model/CQMS/InspectionManagement.cs
new file mode 100644
index 00000000..5e510cdf
--- /dev/null
+++ b/SGGL/Model/CQMS/InspectionManagement.cs
@@ -0,0 +1,51 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.CQMS
+{
+    public class InspectionManagement
+    {
+		public string InspectionId { set; get; }
+		public string ProjectId { set; get; }
+		public string ProjectName { set; get; }
+		public string UnitId { set; get; }
+		public string UnitName { set; get; }
+		public string CNProfessionalId { set; get; }
+		public string CNProfessionalName { set; get; }
+		public string InspectionCode { set; get; }
+		public string UnitWorkId { set; get; }
+		public string UnitWorkName { set; get; }
+		public string Branch { set; get; }
+		public string ControlPointType { set; get; }
+		public string AcceptanceSite { set; get; }
+		public string IsOnceQualified { set; get; }
+		public string InspectionDate { set; get; }
+		public string AttachUrl { set; get; }
+		public string CheckDate { set; get; }
+		public string CheckMan { set; get; }
+		public string CheckManName { set; get; }
+		public string UnqualifiedReason { set; get; }
+		public string NoticeCode { set; get; }
+		public string AcceptanceCheckMan { set; get; }
+		public string ParentDivisionProjectId { set; get; }
+		public string CompileMan { set; get; }
+		public string CompileManName { set; get; }
+		public string CompileDate { set; get; }
+		public string FileType { set; get; }
+		public string AttachUrl2 { set; get; }
+		public string MainSendUnitId { set; get; }
+		public string MainSendUnitName { set; get; }
+		public string CCUnitIds { set; get; }
+		public string CCUnitName { set; get; }
+		public string PlanComplateDate { set; get; }
+		public string AuditMan { set; get; }
+		public string AuditManName { set; get; }
+		public string Status { set; get; }
+		public string CompileMan2 { set; get; }
+
+		public List<InspectionManagementDetail> inspectionManagementDetails { get; set; }
+	}
+}
diff --git a/SGGL/Model/CQMS/InspectionManagementDetail.cs b/SGGL/Model/CQMS/InspectionManagementDetail.cs
new file mode 100644
index 00000000..c05bf914
--- /dev/null
+++ b/SGGL/Model/CQMS/InspectionManagementDetail.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.CQMS
+{
+    public class InspectionManagementDetail
+    {
+        public string InspectionDetailId { get; set; }
+        public string InspectionId { get; set; }
+        public string UnitWorkId { get; set; }
+        public string UnitWorkName { get; set; }
+
+        public string Branch { get; set; }
+
+        public string BranchName { get; set; }
+        public string ControlPointType { get; set; }
+        public string ControlPointTypeName { get; set; }
+
+        public string ControlPointTypeLevel { get; set; }
+
+        public string CreateDate { get; set; }
+        public InspectionManagement inspectionManagement { get; set; }
+    }
+}
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 6052b67b..e6c70b15 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -914,6 +914,9 @@ namespace Model
     partial void InsertEnvironmental_OperationReport(Environmental_OperationReport instance);
     partial void UpdateEnvironmental_OperationReport(Environmental_OperationReport instance);
     partial void DeleteEnvironmental_OperationReport(Environmental_OperationReport instance);
+    partial void InsertEnvironmental_OperationReportItem(Environmental_OperationReportItem instance);
+    partial void UpdateEnvironmental_OperationReportItem(Environmental_OperationReportItem instance);
+    partial void DeleteEnvironmental_OperationReportItem(Environmental_OperationReportItem instance);
     partial void InsertEnvironmental_ProjectArchitectureReport(Environmental_ProjectArchitectureReport instance);
     partial void UpdateEnvironmental_ProjectArchitectureReport(Environmental_ProjectArchitectureReport instance);
     partial void DeleteEnvironmental_ProjectArchitectureReport(Environmental_ProjectArchitectureReport instance);
@@ -1178,6 +1181,12 @@ namespace Model
     partial void InsertInformation_AccidentCauseReportItem(Information_AccidentCauseReportItem instance);
     partial void UpdateInformation_AccidentCauseReportItem(Information_AccidentCauseReportItem instance);
     partial void DeleteInformation_AccidentCauseReportItem(Information_AccidentCauseReportItem instance);
+    partial void InsertInformation_ActionWorkLedger(Information_ActionWorkLedger instance);
+    partial void UpdateInformation_ActionWorkLedger(Information_ActionWorkLedger instance);
+    partial void DeleteInformation_ActionWorkLedger(Information_ActionWorkLedger instance);
+    partial void InsertInformation_ActionWorkLedgerItem(Information_ActionWorkLedgerItem instance);
+    partial void UpdateInformation_ActionWorkLedgerItem(Information_ActionWorkLedgerItem instance);
+    partial void DeleteInformation_ActionWorkLedgerItem(Information_ActionWorkLedgerItem instance);
     partial void InsertInformation_DrillConductedQuarterlyReport(Information_DrillConductedQuarterlyReport instance);
     partial void UpdateInformation_DrillConductedQuarterlyReport(Information_DrillConductedQuarterlyReport instance);
     partial void DeleteInformation_DrillConductedQuarterlyReport(Information_DrillConductedQuarterlyReport instance);
@@ -1214,6 +1223,12 @@ namespace Model
     partial void InsertInformation_SafetyBriefing(Information_SafetyBriefing instance);
     partial void UpdateInformation_SafetyBriefing(Information_SafetyBriefing instance);
     partial void DeleteInformation_SafetyBriefing(Information_SafetyBriefing instance);
+    partial void InsertInformation_SafetyProductionEvaluation(Information_SafetyProductionEvaluation instance);
+    partial void UpdateInformation_SafetyProductionEvaluation(Information_SafetyProductionEvaluation instance);
+    partial void DeleteInformation_SafetyProductionEvaluation(Information_SafetyProductionEvaluation instance);
+    partial void InsertInformation_SafetyProductionEvaluationItem(Information_SafetyProductionEvaluationItem instance);
+    partial void UpdateInformation_SafetyProductionEvaluationItem(Information_SafetyProductionEvaluationItem instance);
+    partial void DeleteInformation_SafetyProductionEvaluationItem(Information_SafetyProductionEvaluationItem instance);
     partial void InsertInformation_SafetyQuarterlyReport(Information_SafetyQuarterlyReport instance);
     partial void UpdateInformation_SafetyQuarterlyReport(Information_SafetyQuarterlyReport instance);
     partial void DeleteInformation_SafetyQuarterlyReport(Information_SafetyQuarterlyReport instance);
@@ -2222,6 +2237,9 @@ namespace Model
     partial void InsertSolution_CQMSConstructSolutionApprove(Solution_CQMSConstructSolutionApprove instance);
     partial void UpdateSolution_CQMSConstructSolutionApprove(Solution_CQMSConstructSolutionApprove instance);
     partial void DeleteSolution_CQMSConstructSolutionApprove(Solution_CQMSConstructSolutionApprove instance);
+    partial void InsertSolution_CQMSConstructSolutionApprove_Item(Solution_CQMSConstructSolutionApprove_Item instance);
+    partial void UpdateSolution_CQMSConstructSolutionApprove_Item(Solution_CQMSConstructSolutionApprove_Item instance);
+    partial void DeleteSolution_CQMSConstructSolutionApprove_Item(Solution_CQMSConstructSolutionApprove_Item instance);
     partial void InsertSolution_ExpertArgument(Solution_ExpertArgument instance);
     partial void UpdateSolution_ExpertArgument(Solution_ExpertArgument instance);
     partial void DeleteSolution_ExpertArgument(Solution_ExpertArgument instance);
@@ -2606,6 +2624,9 @@ namespace Model
     partial void InsertWBS_Division(WBS_Division instance);
     partial void UpdateWBS_Division(WBS_Division instance);
     partial void DeleteWBS_Division(WBS_Division instance);
+    partial void InsertWBS_DivisionDivide(WBS_DivisionDivide instance);
+    partial void UpdateWBS_DivisionDivide(WBS_DivisionDivide instance);
+    partial void DeleteWBS_DivisionDivide(WBS_DivisionDivide instance);
     partial void InsertWBS_DivisionProject(WBS_DivisionProject instance);
     partial void UpdateWBS_DivisionProject(WBS_DivisionProject instance);
     partial void DeleteWBS_DivisionProject(WBS_DivisionProject instance);
@@ -5106,6 +5127,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Environmental_OperationReportItem> Environmental_OperationReportItem
+		{
+			get
+			{
+				return this.GetTable<Environmental_OperationReportItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Environmental_ProjectArchitectureReport> Environmental_ProjectArchitectureReport
 		{
 			get
@@ -5818,6 +5847,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Information_ActionWorkLedger> Information_ActionWorkLedger
+		{
+			get
+			{
+				return this.GetTable<Information_ActionWorkLedger>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Information_ActionWorkLedgerItem> Information_ActionWorkLedgerItem
+		{
+			get
+			{
+				return this.GetTable<Information_ActionWorkLedgerItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Information_DrillConductedQuarterlyReport> Information_DrillConductedQuarterlyReport
 		{
 			get
@@ -5914,6 +5959,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Information_SafetyProductionEvaluation> Information_SafetyProductionEvaluation
+		{
+			get
+			{
+				return this.GetTable<Information_SafetyProductionEvaluation>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Information_SafetyProductionEvaluationItem> Information_SafetyProductionEvaluationItem
+		{
+			get
+			{
+				return this.GetTable<Information_SafetyProductionEvaluationItem>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Information_SafetyQuarterlyReport> Information_SafetyQuarterlyReport
 		{
 			get
@@ -8610,6 +8671,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Solution_CQMSConstructSolutionApprove_Item> Solution_CQMSConstructSolutionApprove_Item
+		{
+			get
+			{
+				return this.GetTable<Solution_CQMSConstructSolutionApprove_Item>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Solution_ExpertArgument> Solution_ExpertArgument
 		{
 			get
@@ -9970,6 +10039,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_Information_ActionWorkLedger> View_Information_ActionWorkLedger
+		{
+			get
+			{
+				return this.GetTable<View_Information_ActionWorkLedger>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_Information_DrillConductedQuarterlyReport> View_Information_DrillConductedQuarterlyReport
 		{
 			get
@@ -10010,6 +10087,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_Information_SafetyProductionEvaluation> View_Information_SafetyProductionEvaluation
+		{
+			get
+			{
+				return this.GetTable<View_Information_SafetyProductionEvaluation>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_Information_SafetyQuarterlyReport> View_Information_SafetyQuarterlyReport
 		{
 			get
@@ -10530,6 +10615,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_WBS_DivisionDivide> View_WBS_DivisionDivide
+		{
+			get
+			{
+				return this.GetTable<View_WBS_DivisionDivide>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_WBSReport> View_WBSReport
 		{
 			get
@@ -10658,6 +10751,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<WBS_DivisionDivide> WBS_DivisionDivide
+		{
+			get
+			{
+				return this.GetTable<WBS_DivisionDivide>();
+			}
+		}
+		
 		public System.Data.Linq.Table<WBS_DivisionProject> WBS_DivisionProject
 		{
 			get
@@ -18989,8 +19090,6 @@ namespace Model
 		
 		private EntitySet<JDGL_QuantityList> _JDGL_QuantityList;
 		
-		private EntitySet<ProcessControl_InspectionManagement> _ProcessControl_InspectionManagement;
-		
 		private EntitySet<WBS_Division> _WBS_Division;
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
@@ -19025,7 +19124,6 @@ namespace Model
 			this._DataBase_StartWorkReport = new EntitySet<DataBase_StartWorkReport>(new Action<DataBase_StartWorkReport>(this.attach_DataBase_StartWorkReport), new Action<DataBase_StartWorkReport>(this.detach_DataBase_StartWorkReport));
 			this._Doc_DocManage = new EntitySet<Doc_DocManage>(new Action<Doc_DocManage>(this.attach_Doc_DocManage), new Action<Doc_DocManage>(this.detach_Doc_DocManage));
 			this._JDGL_QuantityList = new EntitySet<JDGL_QuantityList>(new Action<JDGL_QuantityList>(this.attach_JDGL_QuantityList), new Action<JDGL_QuantityList>(this.detach_JDGL_QuantityList));
-			this._ProcessControl_InspectionManagement = new EntitySet<ProcessControl_InspectionManagement>(new Action<ProcessControl_InspectionManagement>(this.attach_ProcessControl_InspectionManagement), new Action<ProcessControl_InspectionManagement>(this.detach_ProcessControl_InspectionManagement));
 			this._WBS_Division = new EntitySet<WBS_Division>(new Action<WBS_Division>(this.attach_WBS_Division), new Action<WBS_Division>(this.detach_WBS_Division));
 			OnCreated();
 		}
@@ -19318,19 +19416,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_InspectionManagement_Base_CNProfessional", Storage="_ProcessControl_InspectionManagement", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
-		public EntitySet<ProcessControl_InspectionManagement> ProcessControl_InspectionManagement
-		{
-			get
-			{
-				return this._ProcessControl_InspectionManagement;
-			}
-			set
-			{
-				this._ProcessControl_InspectionManagement.Assign(value);
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_Division_Base_CNProfessional", Storage="_WBS_Division", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
 		public EntitySet<WBS_Division> WBS_Division
 		{
@@ -19556,18 +19641,6 @@ namespace Model
 			entity.Base_CNProfessional = null;
 		}
 		
-		private void attach_ProcessControl_InspectionManagement(ProcessControl_InspectionManagement entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_CNProfessional = this;
-		}
-		
-		private void detach_ProcessControl_InspectionManagement(ProcessControl_InspectionManagement entity)
-		{
-			this.SendPropertyChanging();
-			entity.Base_CNProfessional = null;
-		}
-		
 		private void attach_WBS_Division(WBS_Division entity)
 		{
 			this.SendPropertyChanging();
@@ -26852,6 +26925,8 @@ namespace Model
 		
 		private EntitySet<WBS_CostControl> _WBS_CostControl;
 		
+		private EntitySet<WBS_DivisionDivide> _WBS_DivisionDivide;
+		
 		private EntitySet<WBS_DivisionProject> _WBS_DivisionProject;
 		
 		private EntitySet<WBS_ForeignBreakdownProject> _WBS_ForeignBreakdownProject;
@@ -27258,6 +27333,7 @@ namespace Model
 			this._Unqualified_WorkContact = new EntitySet<Unqualified_WorkContact>(new Action<Unqualified_WorkContact>(this.attach_Unqualified_WorkContact), new Action<Unqualified_WorkContact>(this.detach_Unqualified_WorkContact));
 			this._WBS_BreakdownProject = new EntitySet<WBS_BreakdownProject>(new Action<WBS_BreakdownProject>(this.attach_WBS_BreakdownProject), new Action<WBS_BreakdownProject>(this.detach_WBS_BreakdownProject));
 			this._WBS_CostControl = new EntitySet<WBS_CostControl>(new Action<WBS_CostControl>(this.attach_WBS_CostControl), new Action<WBS_CostControl>(this.detach_WBS_CostControl));
+			this._WBS_DivisionDivide = new EntitySet<WBS_DivisionDivide>(new Action<WBS_DivisionDivide>(this.attach_WBS_DivisionDivide), new Action<WBS_DivisionDivide>(this.detach_WBS_DivisionDivide));
 			this._WBS_DivisionProject = new EntitySet<WBS_DivisionProject>(new Action<WBS_DivisionProject>(this.attach_WBS_DivisionProject), new Action<WBS_DivisionProject>(this.detach_WBS_DivisionProject));
 			this._WBS_ForeignBreakdownProject = new EntitySet<WBS_ForeignBreakdownProject>(new Action<WBS_ForeignBreakdownProject>(this.attach_WBS_ForeignBreakdownProject), new Action<WBS_ForeignBreakdownProject>(this.detach_WBS_ForeignBreakdownProject));
 			this._WBS_MilePost = new EntitySet<WBS_MilePost>(new Action<WBS_MilePost>(this.attach_WBS_MilePost), new Action<WBS_MilePost>(this.detach_WBS_MilePost));
@@ -31945,6 +32021,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_DivisionDivide_Base_Project", Storage="_WBS_DivisionDivide", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<WBS_DivisionDivide> WBS_DivisionDivide
+		{
+			get
+			{
+				return this._WBS_DivisionDivide;
+			}
+			set
+			{
+				this._WBS_DivisionDivide.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_DivisionProject_Base_Project", Storage="_WBS_DivisionProject", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<WBS_DivisionProject> WBS_DivisionProject
 		{
@@ -35625,6 +35714,18 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
+		private void attach_WBS_DivisionDivide(WBS_DivisionDivide entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_WBS_DivisionDivide(WBS_DivisionDivide entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
 		private void attach_WBS_DivisionProject(WBS_DivisionProject entity)
 		{
 			this.SendPropertyChanging();
@@ -39924,6 +40025,8 @@ namespace Model
 		
 		private EntitySet<Information_AccidentCauseReport> _Information_AccidentCauseReport;
 		
+		private EntitySet<Information_ActionWorkLedger> _Information_ActionWorkLedger;
+		
 		private EntitySet<Information_DrillConductedQuarterlyReport> _Information_DrillConductedQuarterlyReport;
 		
 		private EntitySet<Information_DrillPlanHalfYearReport> _Information_DrillPlanHalfYearReport;
@@ -39938,6 +40041,8 @@ namespace Model
 		
 		private EntitySet<Information_SafetyBriefing> _Information_SafetyBriefing;
 		
+		private EntitySet<Information_SafetyProductionEvaluation> _Information_SafetyProductionEvaluation;
+		
 		private EntitySet<Information_SafetyQuarterlyReport> _Information_SafetyQuarterlyReport;
 		
 		private EntitySet<Information_UrgeReport> _Information_UrgeReport;
@@ -40252,6 +40357,7 @@ namespace Model
 			this._InApproveManager_GeneralEquipmentOut = new EntitySet<InApproveManager_GeneralEquipmentOut>(new Action<InApproveManager_GeneralEquipmentOut>(this.attach_InApproveManager_GeneralEquipmentOut), new Action<InApproveManager_GeneralEquipmentOut>(this.detach_InApproveManager_GeneralEquipmentOut));
 			this._InformationProject_SafetyBriefing = new EntitySet<InformationProject_SafetyBriefing>(new Action<InformationProject_SafetyBriefing>(this.attach_InformationProject_SafetyBriefing), new Action<InformationProject_SafetyBriefing>(this.detach_InformationProject_SafetyBriefing));
 			this._Information_AccidentCauseReport = new EntitySet<Information_AccidentCauseReport>(new Action<Information_AccidentCauseReport>(this.attach_Information_AccidentCauseReport), new Action<Information_AccidentCauseReport>(this.detach_Information_AccidentCauseReport));
+			this._Information_ActionWorkLedger = new EntitySet<Information_ActionWorkLedger>(new Action<Information_ActionWorkLedger>(this.attach_Information_ActionWorkLedger), new Action<Information_ActionWorkLedger>(this.detach_Information_ActionWorkLedger));
 			this._Information_DrillConductedQuarterlyReport = new EntitySet<Information_DrillConductedQuarterlyReport>(new Action<Information_DrillConductedQuarterlyReport>(this.attach_Information_DrillConductedQuarterlyReport), new Action<Information_DrillConductedQuarterlyReport>(this.detach_Information_DrillConductedQuarterlyReport));
 			this._Information_DrillPlanHalfYearReport = new EntitySet<Information_DrillPlanHalfYearReport>(new Action<Information_DrillPlanHalfYearReport>(this.attach_Information_DrillPlanHalfYearReport), new Action<Information_DrillPlanHalfYearReport>(this.detach_Information_DrillPlanHalfYearReport));
 			this._Information_EPSummaryReport = new EntitySet<Information_EPSummaryReport>(new Action<Information_EPSummaryReport>(this.attach_Information_EPSummaryReport), new Action<Information_EPSummaryReport>(this.detach_Information_EPSummaryReport));
@@ -40259,6 +40365,7 @@ namespace Model
 			this._Information_QualityWorkSummaryReport = new EntitySet<Information_QualityWorkSummaryReport>(new Action<Information_QualityWorkSummaryReport>(this.attach_Information_QualityWorkSummaryReport), new Action<Information_QualityWorkSummaryReport>(this.detach_Information_QualityWorkSummaryReport));
 			this._Information_QuarterlyProjectQuality = new EntitySet<Information_QuarterlyProjectQuality>(new Action<Information_QuarterlyProjectQuality>(this.attach_Information_QuarterlyProjectQuality), new Action<Information_QuarterlyProjectQuality>(this.detach_Information_QuarterlyProjectQuality));
 			this._Information_SafetyBriefing = new EntitySet<Information_SafetyBriefing>(new Action<Information_SafetyBriefing>(this.attach_Information_SafetyBriefing), new Action<Information_SafetyBriefing>(this.detach_Information_SafetyBriefing));
+			this._Information_SafetyProductionEvaluation = new EntitySet<Information_SafetyProductionEvaluation>(new Action<Information_SafetyProductionEvaluation>(this.attach_Information_SafetyProductionEvaluation), new Action<Information_SafetyProductionEvaluation>(this.detach_Information_SafetyProductionEvaluation));
 			this._Information_SafetyQuarterlyReport = new EntitySet<Information_SafetyQuarterlyReport>(new Action<Information_SafetyQuarterlyReport>(this.attach_Information_SafetyQuarterlyReport), new Action<Information_SafetyQuarterlyReport>(this.detach_Information_SafetyQuarterlyReport));
 			this._Information_UrgeReport = new EntitySet<Information_UrgeReport>(new Action<Information_UrgeReport>(this.attach_Information_UrgeReport), new Action<Information_UrgeReport>(this.detach_Information_UrgeReport));
 			this._Information_WorkSummaryReport = new EntitySet<Information_WorkSummaryReport>(new Action<Information_WorkSummaryReport>(this.attach_Information_WorkSummaryReport), new Action<Information_WorkSummaryReport>(this.detach_Information_WorkSummaryReport));
@@ -41915,6 +42022,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_ActionWorkLedger_Base_Unit", Storage="_Information_ActionWorkLedger", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
+		public EntitySet<Information_ActionWorkLedger> Information_ActionWorkLedger
+		{
+			get
+			{
+				return this._Information_ActionWorkLedger;
+			}
+			set
+			{
+				this._Information_ActionWorkLedger.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_DrillConductedQuarterlyReport_Base_Unit", Storage="_Information_DrillConductedQuarterlyReport", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
 		public EntitySet<Information_DrillConductedQuarterlyReport> Information_DrillConductedQuarterlyReport
 		{
@@ -42006,6 +42126,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_SafetyProductionEvaluation_Base_Unit", Storage="_Information_SafetyProductionEvaluation", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
+		public EntitySet<Information_SafetyProductionEvaluation> Information_SafetyProductionEvaluation
+		{
+			get
+			{
+				return this._Information_SafetyProductionEvaluation;
+			}
+			set
+			{
+				this._Information_SafetyProductionEvaluation.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_SafetyQuarterlyReport_Base_Unit", Storage="_Information_SafetyQuarterlyReport", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
 		public EntitySet<Information_SafetyQuarterlyReport> Information_SafetyQuarterlyReport
 		{
@@ -44141,6 +44274,18 @@ namespace Model
 			entity.Base_Unit = null;
 		}
 		
+		private void attach_Information_ActionWorkLedger(Information_ActionWorkLedger entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = this;
+		}
+		
+		private void detach_Information_ActionWorkLedger(Information_ActionWorkLedger entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = null;
+		}
+		
 		private void attach_Information_DrillConductedQuarterlyReport(Information_DrillConductedQuarterlyReport entity)
 		{
 			this.SendPropertyChanging();
@@ -44225,6 +44370,18 @@ namespace Model
 			entity.Base_Unit = null;
 		}
 		
+		private void attach_Information_SafetyProductionEvaluation(Information_SafetyProductionEvaluation entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = this;
+		}
+		
+		private void detach_Information_SafetyProductionEvaluation(Information_SafetyProductionEvaluation entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = null;
+		}
+		
 		private void attach_Information_SafetyQuarterlyReport(Information_SafetyQuarterlyReport entity)
 		{
 			this.SendPropertyChanging();
@@ -62104,6 +62261,8 @@ namespace Model
 		
 		private EntityRef<Base_Project> _Base_Project;
 		
+		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -62155,6 +62314,7 @@ namespace Model
 		public Check_CheckSpecial()
 		{
 			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Technique_CheckItemSet = default(EntityRef<Technique_CheckItemSet>);
 			OnCreated();
 		}
 		
@@ -62473,6 +62633,10 @@ namespace Model
 			{
 				if ((this._CheckItemSetId != value))
 				{
+					if (this._Technique_CheckItemSet.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
 					this.OnCheckItemSetIdChanging(value);
 					this.SendPropertyChanging();
 					this._CheckItemSetId = value;
@@ -62616,6 +62780,40 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Technique_CheckItemSet", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", IsForeignKey=true)]
+		public Technique_CheckItemSet Technique_CheckItemSet
+		{
+			get
+			{
+				return this._Technique_CheckItemSet.Entity;
+			}
+			set
+			{
+				Technique_CheckItemSet previousValue = this._Technique_CheckItemSet.Entity;
+				if (((previousValue != value) 
+							|| (this._Technique_CheckItemSet.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Technique_CheckItemSet.Entity = null;
+						previousValue.Check_CheckSpecial.Remove(this);
+					}
+					this._Technique_CheckItemSet.Entity = value;
+					if ((value != null))
+					{
+						value.Check_CheckSpecial.Add(this);
+						this._CheckItemSetId = value.CheckItemSetId;
+					}
+					else
+					{
+						this._CheckItemSetId = default(string);
+					}
+					this.SendPropertyChanged("Technique_CheckItemSet");
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -122777,6 +122975,8 @@ namespace Model
 		
 		private System.Nullable<int> _Sort;
 		
+		private EntitySet<WBS_DivisionDivide> _WBS_DivisionDivide;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -122815,6 +123015,7 @@ namespace Model
 		
 		public Division_SubProjects()
 		{
+			this._WBS_DivisionDivide = new EntitySet<WBS_DivisionDivide>(new Action<WBS_DivisionDivide>(this.attach_WBS_DivisionDivide), new Action<WBS_DivisionDivide>(this.detach_WBS_DivisionDivide));
 			OnCreated();
 		}
 		
@@ -123118,6 +123319,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_DivisionDivide_Division_SubProjects", Storage="_WBS_DivisionDivide", ThisKey="DivisionId", OtherKey="DivisionId", DeleteRule="NO ACTION")]
+		public EntitySet<WBS_DivisionDivide> WBS_DivisionDivide
+		{
+			get
+			{
+				return this._WBS_DivisionDivide;
+			}
+			set
+			{
+				this._WBS_DivisionDivide.Assign(value);
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -123137,6 +123351,18 @@ namespace Model
 				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
 			}
 		}
+		
+		private void attach_WBS_DivisionDivide(WBS_DivisionDivide entity)
+		{
+			this.SendPropertyChanging();
+			entity.Division_SubProjects = this;
+		}
+		
+		private void detach_WBS_DivisionDivide(WBS_DivisionDivide entity)
+		{
+			this.SendPropertyChanging();
+			entity.Division_SubProjects = null;
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Doc_DocManage")]
@@ -136836,6 +137062,8 @@ namespace Model
 		
 		private System.Nullable<int> _State;
 		
+		private string _DriverSubNames;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -136872,6 +137100,8 @@ namespace Model
     partial void OnSubcontractingTypesChanged();
     partial void OnStateChanging(System.Nullable<int> value);
     partial void OnStateChanged();
+    partial void OnDriverSubNamesChanging(string value);
+    partial void OnDriverSubNamesChanged();
     #endregion
 		
 		public DriverSub_DriverSubPlan()
@@ -137169,6 +137399,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubNames", DbType="VarChar(100)")]
+		public string DriverSubNames
+		{
+			get
+			{
+				return this._DriverSubNames;
+			}
+			set
+			{
+				if ((this._DriverSubNames != value))
+				{
+					this.OnDriverSubNamesChanging(value);
+					this.SendPropertyChanging();
+					this._DriverSubNames = value;
+					this.SendPropertyChanged("DriverSubNames");
+					this.OnDriverSubNamesChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSubPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -145652,6 +145902,8 @@ namespace Model
 		
 		private string _ServiceOperatingIncome_ThisYear;
 		
+		private System.Nullable<int> _SortUnit;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -145700,6 +145952,8 @@ namespace Model
     partial void OnServiceOperatingIncome_LastYearChanged();
     partial void OnServiceOperatingIncome_ThisYearChanging(string value);
     partial void OnServiceOperatingIncome_ThisYearChanged();
+    partial void OnSortUnitChanging(System.Nullable<int> value);
+    partial void OnSortUnitChanged();
     #endregion
 		
 		public Environmental_EnergyReportItem()
@@ -146147,6 +146401,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortUnit", DbType="Int")]
+		public System.Nullable<int> SortUnit
+		{
+			get
+			{
+				return this._SortUnit;
+			}
+			set
+			{
+				if ((this._SortUnit != value))
+				{
+					this.OnSortUnitChanging(value);
+					this.SendPropertyChanging();
+					this._SortUnit = value;
+					this.SendPropertyChanged("SortUnit");
+					this.OnSortUnitChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -146772,22 +147046,6 @@ namespace Model
 		
 		private System.Nullable<int> _Quarters;
 		
-		private string _Code;
-		
-		private string _UnitLevel;
-		
-		private System.Nullable<System.DateTime> _CreateDate;
-		
-		private string _Place;
-		
-		private System.Nullable<int> _PersonNum;
-		
-		private System.Nullable<decimal> _TotalAssets;
-		
-		private System.Nullable<decimal> _TotalValue;
-		
-		private System.Nullable<decimal> _NewInvestment;
-		
 		private string _FillingMan;
 		
 		private System.Nullable<System.DateTime> _FillingDate;
@@ -146802,6 +147060,8 @@ namespace Model
 		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
+		private EntitySet<Environmental_OperationReportItem> _Environmental_OperationReportItem;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -146814,22 +147074,6 @@ namespace Model
     partial void OnYearChanged();
     partial void OnQuartersChanging(System.Nullable<int> value);
     partial void OnQuartersChanged();
-    partial void OnCodeChanging(string value);
-    partial void OnCodeChanged();
-    partial void OnUnitLevelChanging(string value);
-    partial void OnUnitLevelChanged();
-    partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
-    partial void OnCreateDateChanged();
-    partial void OnPlaceChanging(string value);
-    partial void OnPlaceChanged();
-    partial void OnPersonNumChanging(System.Nullable<int> value);
-    partial void OnPersonNumChanged();
-    partial void OnTotalAssetsChanging(System.Nullable<decimal> value);
-    partial void OnTotalAssetsChanged();
-    partial void OnTotalValueChanging(System.Nullable<decimal> value);
-    partial void OnTotalValueChanged();
-    partial void OnNewInvestmentChanging(System.Nullable<decimal> value);
-    partial void OnNewInvestmentChanged();
     partial void OnFillingManChanging(string value);
     partial void OnFillingManChanged();
     partial void OnFillingDateChanging(System.Nullable<System.DateTime> value);
@@ -146847,6 +147091,7 @@ namespace Model
 		public Environmental_OperationReport()
 		{
 			this._Base_Unit = default(EntityRef<Base_Unit>);
+			this._Environmental_OperationReportItem = new EntitySet<Environmental_OperationReportItem>(new Action<Environmental_OperationReportItem>(this.attach_Environmental_OperationReportItem), new Action<Environmental_OperationReportItem>(this.detach_Environmental_OperationReportItem));
 			OnCreated();
 		}
 		
@@ -146934,6 +147179,342 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingMan", DbType="NVarChar(50)")]
+		public string FillingMan
+		{
+			get
+			{
+				return this._FillingMan;
+			}
+			set
+			{
+				if ((this._FillingMan != value))
+				{
+					this.OnFillingManChanging(value);
+					this.SendPropertyChanging();
+					this._FillingMan = value;
+					this.SendPropertyChanged("FillingMan");
+					this.OnFillingManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> FillingDate
+		{
+			get
+			{
+				return this._FillingDate;
+			}
+			set
+			{
+				if ((this._FillingDate != value))
+				{
+					this.OnFillingDateChanging(value);
+					this.SendPropertyChanging();
+					this._FillingDate = value;
+					this.SendPropertyChanged("FillingDate");
+					this.OnFillingDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StatisticsDutyPerson", DbType="NVarChar(50)")]
+		public string StatisticsDutyPerson
+		{
+			get
+			{
+				return this._StatisticsDutyPerson;
+			}
+			set
+			{
+				if ((this._StatisticsDutyPerson != value))
+				{
+					this.OnStatisticsDutyPersonChanging(value);
+					this.SendPropertyChanging();
+					this._StatisticsDutyPerson = value;
+					this.SendPropertyChanged("StatisticsDutyPerson");
+					this.OnStatisticsDutyPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitDutyPerson", DbType="NVarChar(50)")]
+		public string UnitDutyPerson
+		{
+			get
+			{
+				return this._UnitDutyPerson;
+			}
+			set
+			{
+				if ((this._UnitDutyPerson != value))
+				{
+					this.OnUnitDutyPersonChanging(value);
+					this.SendPropertyChanging();
+					this._UnitDutyPerson = value;
+					this.SendPropertyChanged("UnitDutyPerson");
+					this.OnUnitDutyPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this.OnUpStateChanging(value);
+					this.SendPropertyChanging();
+					this._UpState = value;
+					this.SendPropertyChanged("UpState");
+					this.OnUpStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_OperationReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
+		public Base_Unit Base_Unit
+		{
+			get
+			{
+				return this._Base_Unit.Entity;
+			}
+			set
+			{
+				Base_Unit previousValue = this._Base_Unit.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Unit.Entity = null;
+						previousValue.Environmental_OperationReport.Remove(this);
+					}
+					this._Base_Unit.Entity = value;
+					if ((value != null))
+					{
+						value.Environmental_OperationReport.Add(this);
+						this._UnitId = value.UnitId;
+					}
+					else
+					{
+						this._UnitId = default(string);
+					}
+					this.SendPropertyChanged("Base_Unit");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_OperationReportItem_Environmental_OperationReport", Storage="_Environmental_OperationReportItem", ThisKey="BusinessReportId", OtherKey="BusinessReportId", DeleteRule="NO ACTION")]
+		public EntitySet<Environmental_OperationReportItem> Environmental_OperationReportItem
+		{
+			get
+			{
+				return this._Environmental_OperationReportItem;
+			}
+			set
+			{
+				this._Environmental_OperationReportItem.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_Environmental_OperationReportItem(Environmental_OperationReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Environmental_OperationReport = this;
+		}
+		
+		private void detach_Environmental_OperationReportItem(Environmental_OperationReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Environmental_OperationReport = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Environmental_OperationReportItem")]
+	public partial class Environmental_OperationReportItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _BusinessReportItemId;
+		
+		private string _BusinessReportId;
+		
+		private System.Nullable<int> _SortIndex;
+		
+		private string _Code;
+		
+		private string _UnitLevel;
+		
+		private System.Nullable<System.DateTime> _CreateDate;
+		
+		private string _Place;
+		
+		private System.Nullable<int> _PersonNum;
+		
+		private System.Nullable<decimal> _TotalAssets;
+		
+		private System.Nullable<decimal> _TotalValue;
+		
+		private System.Nullable<decimal> _NewInvestment;
+		
+		private string _UnitName;
+		
+		private string _SortUnitName;
+		
+		private EntityRef<Environmental_OperationReport> _Environmental_OperationReport;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnBusinessReportItemIdChanging(string value);
+    partial void OnBusinessReportItemIdChanged();
+    partial void OnBusinessReportIdChanging(string value);
+    partial void OnBusinessReportIdChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    partial void OnCodeChanging(string value);
+    partial void OnCodeChanged();
+    partial void OnUnitLevelChanging(string value);
+    partial void OnUnitLevelChanged();
+    partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreateDateChanged();
+    partial void OnPlaceChanging(string value);
+    partial void OnPlaceChanged();
+    partial void OnPersonNumChanging(System.Nullable<int> value);
+    partial void OnPersonNumChanged();
+    partial void OnTotalAssetsChanging(System.Nullable<decimal> value);
+    partial void OnTotalAssetsChanged();
+    partial void OnTotalValueChanging(System.Nullable<decimal> value);
+    partial void OnTotalValueChanged();
+    partial void OnNewInvestmentChanging(System.Nullable<decimal> value);
+    partial void OnNewInvestmentChanged();
+    partial void OnUnitNameChanging(string value);
+    partial void OnUnitNameChanged();
+    partial void OnSortUnitNameChanging(string value);
+    partial void OnSortUnitNameChanged();
+    #endregion
+		
+		public Environmental_OperationReportItem()
+		{
+			this._Environmental_OperationReport = default(EntityRef<Environmental_OperationReport>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BusinessReportItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string BusinessReportItemId
+		{
+			get
+			{
+				return this._BusinessReportItemId;
+			}
+			set
+			{
+				if ((this._BusinessReportItemId != value))
+				{
+					this.OnBusinessReportItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._BusinessReportItemId = value;
+					this.SendPropertyChanged("BusinessReportItemId");
+					this.OnBusinessReportItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BusinessReportId", DbType="NVarChar(50)")]
+		public string BusinessReportId
+		{
+			get
+			{
+				return this._BusinessReportId;
+			}
+			set
+			{
+				if ((this._BusinessReportId != value))
+				{
+					if (this._Environmental_OperationReport.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnBusinessReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._BusinessReportId = value;
+					this.SendPropertyChanged("BusinessReportId");
+					this.OnBusinessReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+		public System.Nullable<int> SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
 		public string Code
 		{
@@ -147094,156 +147675,76 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingMan", DbType="NVarChar(50)")]
-		public string FillingMan
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")]
+		public string UnitName
 		{
 			get
 			{
-				return this._FillingMan;
+				return this._UnitName;
 			}
 			set
 			{
-				if ((this._FillingMan != value))
+				if ((this._UnitName != value))
 				{
-					this.OnFillingManChanging(value);
+					this.OnUnitNameChanging(value);
 					this.SendPropertyChanging();
-					this._FillingMan = value;
-					this.SendPropertyChanged("FillingMan");
-					this.OnFillingManChanged();
+					this._UnitName = value;
+					this.SendPropertyChanged("UnitName");
+					this.OnUnitNameChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingDate", DbType="DateTime")]
-		public System.Nullable<System.DateTime> FillingDate
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortUnitName", DbType="NVarChar(200)")]
+		public string SortUnitName
 		{
 			get
 			{
-				return this._FillingDate;
+				return this._SortUnitName;
 			}
 			set
 			{
-				if ((this._FillingDate != value))
+				if ((this._SortUnitName != value))
 				{
-					this.OnFillingDateChanging(value);
+					this.OnSortUnitNameChanging(value);
 					this.SendPropertyChanging();
-					this._FillingDate = value;
-					this.SendPropertyChanged("FillingDate");
-					this.OnFillingDateChanged();
+					this._SortUnitName = value;
+					this.SendPropertyChanged("SortUnitName");
+					this.OnSortUnitNameChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StatisticsDutyPerson", DbType="NVarChar(50)")]
-		public string StatisticsDutyPerson
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_OperationReportItem_Environmental_OperationReport", Storage="_Environmental_OperationReport", ThisKey="BusinessReportId", OtherKey="BusinessReportId", IsForeignKey=true)]
+		public Environmental_OperationReport Environmental_OperationReport
 		{
 			get
 			{
-				return this._StatisticsDutyPerson;
+				return this._Environmental_OperationReport.Entity;
 			}
 			set
 			{
-				if ((this._StatisticsDutyPerson != value))
-				{
-					this.OnStatisticsDutyPersonChanging(value);
-					this.SendPropertyChanging();
-					this._StatisticsDutyPerson = value;
-					this.SendPropertyChanged("StatisticsDutyPerson");
-					this.OnStatisticsDutyPersonChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitDutyPerson", DbType="NVarChar(50)")]
-		public string UnitDutyPerson
-		{
-			get
-			{
-				return this._UnitDutyPerson;
-			}
-			set
-			{
-				if ((this._UnitDutyPerson != value))
-				{
-					this.OnUnitDutyPersonChanging(value);
-					this.SendPropertyChanging();
-					this._UnitDutyPerson = value;
-					this.SendPropertyChanged("UnitDutyPerson");
-					this.OnUnitDutyPersonChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")]
-		public string Remark
-		{
-			get
-			{
-				return this._Remark;
-			}
-			set
-			{
-				if ((this._Remark != value))
-				{
-					this.OnRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._Remark = value;
-					this.SendPropertyChanged("Remark");
-					this.OnRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
-		public string UpState
-		{
-			get
-			{
-				return this._UpState;
-			}
-			set
-			{
-				if ((this._UpState != value))
-				{
-					this.OnUpStateChanging(value);
-					this.SendPropertyChanging();
-					this._UpState = value;
-					this.SendPropertyChanged("UpState");
-					this.OnUpStateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Environmental_OperationReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
-		public Base_Unit Base_Unit
-		{
-			get
-			{
-				return this._Base_Unit.Entity;
-			}
-			set
-			{
-				Base_Unit previousValue = this._Base_Unit.Entity;
+				Environmental_OperationReport previousValue = this._Environmental_OperationReport.Entity;
 				if (((previousValue != value) 
-							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+							|| (this._Environmental_OperationReport.HasLoadedOrAssignedValue == false)))
 				{
 					this.SendPropertyChanging();
 					if ((previousValue != null))
 					{
-						this._Base_Unit.Entity = null;
-						previousValue.Environmental_OperationReport.Remove(this);
+						this._Environmental_OperationReport.Entity = null;
+						previousValue.Environmental_OperationReportItem.Remove(this);
 					}
-					this._Base_Unit.Entity = value;
+					this._Environmental_OperationReport.Entity = value;
 					if ((value != null))
 					{
-						value.Environmental_OperationReport.Add(this);
-						this._UnitId = value.UnitId;
+						value.Environmental_OperationReportItem.Add(this);
+						this._BusinessReportId = value.BusinessReportId;
 					}
 					else
 					{
-						this._UnitId = default(string);
+						this._BusinessReportId = default(string);
 					}
-					this.SendPropertyChanged("Base_Unit");
+					this.SendPropertyChanged("Environmental_OperationReport");
 				}
 			}
 		}
@@ -153767,6 +154268,8 @@ namespace Model
 		
 		private string _User_Acceptance;
 		
+		private string _CsUsers;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -153801,6 +154304,8 @@ namespace Model
     partial void OnAttachUrlChanged();
     partial void OnUser_AcceptanceChanging(string value);
     partial void OnUser_AcceptanceChanged();
+    partial void OnCsUsersChanging(string value);
+    partial void OnCsUsersChanged();
     #endregion
 		
 		public GJSX()
@@ -154108,6 +154613,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CsUsers", DbType="NVarChar(2000)")]
+		public string CsUsers
+		{
+			get
+			{
+				return this._CsUsers;
+			}
+			set
+			{
+				if ((this._CsUsers != value))
+				{
+					this.OnCsUsersChanging(value);
+					this.SendPropertyChanging();
+					this._CsUsers = value;
+					this.SendPropertyChanged("CsUsers");
+					this.OnCsUsersChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -186981,6 +187506,624 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Information_ActionWorkLedger")]
+	public partial class Information_ActionWorkLedger : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ActionWorkLedgerId;
+		
+		private string _UnitId;
+		
+		private System.Nullable<System.DateTime> _ReportDate;
+		
+		private System.Nullable<int> _Quarter;
+		
+		private System.Nullable<int> _YearId;
+		
+		private string _CompileMan;
+		
+		private string _UpState;
+		
+		private string _HandleState;
+		
+		private string _HandleMan;
+		
+		private EntityRef<Base_Unit> _Base_Unit;
+		
+		private EntitySet<Information_ActionWorkLedgerItem> _Information_ActionWorkLedgerItem;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnActionWorkLedgerIdChanging(string value);
+    partial void OnActionWorkLedgerIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnReportDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnReportDateChanged();
+    partial void OnQuarterChanging(System.Nullable<int> value);
+    partial void OnQuarterChanged();
+    partial void OnYearIdChanging(System.Nullable<int> value);
+    partial void OnYearIdChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    partial void OnHandleStateChanging(string value);
+    partial void OnHandleStateChanged();
+    partial void OnHandleManChanging(string value);
+    partial void OnHandleManChanged();
+    #endregion
+		
+		public Information_ActionWorkLedger()
+		{
+			this._Base_Unit = default(EntityRef<Base_Unit>);
+			this._Information_ActionWorkLedgerItem = new EntitySet<Information_ActionWorkLedgerItem>(new Action<Information_ActionWorkLedgerItem>(this.attach_Information_ActionWorkLedgerItem), new Action<Information_ActionWorkLedgerItem>(this.detach_Information_ActionWorkLedgerItem));
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActionWorkLedgerId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ActionWorkLedgerId
+		{
+			get
+			{
+				return this._ActionWorkLedgerId;
+			}
+			set
+			{
+				if ((this._ActionWorkLedgerId != value))
+				{
+					this.OnActionWorkLedgerIdChanging(value);
+					this.SendPropertyChanging();
+					this._ActionWorkLedgerId = value;
+					this.SendPropertyChanged("ActionWorkLedgerId");
+					this.OnActionWorkLedgerIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					if (this._Base_Unit.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ReportDate
+		{
+			get
+			{
+				return this._ReportDate;
+			}
+			set
+			{
+				if ((this._ReportDate != value))
+				{
+					this.OnReportDateChanging(value);
+					this.SendPropertyChanging();
+					this._ReportDate = value;
+					this.SendPropertyChanged("ReportDate");
+					this.OnReportDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarter", DbType="Int")]
+		public System.Nullable<int> Quarter
+		{
+			get
+			{
+				return this._Quarter;
+			}
+			set
+			{
+				if ((this._Quarter != value))
+				{
+					this.OnQuarterChanging(value);
+					this.SendPropertyChanging();
+					this._Quarter = value;
+					this.SendPropertyChanged("Quarter");
+					this.OnQuarterChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YearId", DbType="Int")]
+		public System.Nullable<int> YearId
+		{
+			get
+			{
+				return this._YearId;
+			}
+			set
+			{
+				if ((this._YearId != value))
+				{
+					this.OnYearIdChanging(value);
+					this.SendPropertyChanging();
+					this._YearId = value;
+					this.SendPropertyChanged("YearId");
+					this.OnYearIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this.OnUpStateChanging(value);
+					this.SendPropertyChanging();
+					this._UpState = value;
+					this.SendPropertyChanged("UpState");
+					this.OnUpStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleState", DbType="Char(1)")]
+		public string HandleState
+		{
+			get
+			{
+				return this._HandleState;
+			}
+			set
+			{
+				if ((this._HandleState != value))
+				{
+					this.OnHandleStateChanging(value);
+					this.SendPropertyChanging();
+					this._HandleState = value;
+					this.SendPropertyChanged("HandleState");
+					this.OnHandleStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleMan", DbType="NVarChar(50)")]
+		public string HandleMan
+		{
+			get
+			{
+				return this._HandleMan;
+			}
+			set
+			{
+				if ((this._HandleMan != value))
+				{
+					this.OnHandleManChanging(value);
+					this.SendPropertyChanging();
+					this._HandleMan = value;
+					this.SendPropertyChanged("HandleMan");
+					this.OnHandleManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_ActionWorkLedger_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
+		public Base_Unit Base_Unit
+		{
+			get
+			{
+				return this._Base_Unit.Entity;
+			}
+			set
+			{
+				Base_Unit previousValue = this._Base_Unit.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Unit.Entity = null;
+						previousValue.Information_ActionWorkLedger.Remove(this);
+					}
+					this._Base_Unit.Entity = value;
+					if ((value != null))
+					{
+						value.Information_ActionWorkLedger.Add(this);
+						this._UnitId = value.UnitId;
+					}
+					else
+					{
+						this._UnitId = default(string);
+					}
+					this.SendPropertyChanged("Base_Unit");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_ActionWorkLedgerItem_Information_ActionWorkLedger", Storage="_Information_ActionWorkLedgerItem", ThisKey="ActionWorkLedgerId", OtherKey="ActionWorkLedgerId", DeleteRule="NO ACTION")]
+		public EntitySet<Information_ActionWorkLedgerItem> Information_ActionWorkLedgerItem
+		{
+			get
+			{
+				return this._Information_ActionWorkLedgerItem;
+			}
+			set
+			{
+				this._Information_ActionWorkLedgerItem.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_Information_ActionWorkLedgerItem(Information_ActionWorkLedgerItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Information_ActionWorkLedger = this;
+		}
+		
+		private void detach_Information_ActionWorkLedgerItem(Information_ActionWorkLedgerItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Information_ActionWorkLedger = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Information_ActionWorkLedgerItem")]
+	public partial class Information_ActionWorkLedgerItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _ActionWorkLedgerItemId;
+		
+		private string _ActionWorkLedgerId;
+		
+		private System.Nullable<int> _SortIndex;
+		
+		private string _Focus;
+		
+		private string _SpecialTask;
+		
+		private string _WorkPoints;
+		
+		private string _FillingRequirements;
+		
+		private string _CompletionDeadline;
+		
+		private string _ImplementationStatus;
+		
+		private EntityRef<Information_ActionWorkLedger> _Information_ActionWorkLedger;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnActionWorkLedgerItemIdChanging(string value);
+    partial void OnActionWorkLedgerItemIdChanged();
+    partial void OnActionWorkLedgerIdChanging(string value);
+    partial void OnActionWorkLedgerIdChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    partial void OnFocusChanging(string value);
+    partial void OnFocusChanged();
+    partial void OnSpecialTaskChanging(string value);
+    partial void OnSpecialTaskChanged();
+    partial void OnWorkPointsChanging(string value);
+    partial void OnWorkPointsChanged();
+    partial void OnFillingRequirementsChanging(string value);
+    partial void OnFillingRequirementsChanged();
+    partial void OnCompletionDeadlineChanging(string value);
+    partial void OnCompletionDeadlineChanged();
+    partial void OnImplementationStatusChanging(string value);
+    partial void OnImplementationStatusChanged();
+    #endregion
+		
+		public Information_ActionWorkLedgerItem()
+		{
+			this._Information_ActionWorkLedger = default(EntityRef<Information_ActionWorkLedger>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActionWorkLedgerItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string ActionWorkLedgerItemId
+		{
+			get
+			{
+				return this._ActionWorkLedgerItemId;
+			}
+			set
+			{
+				if ((this._ActionWorkLedgerItemId != value))
+				{
+					this.OnActionWorkLedgerItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._ActionWorkLedgerItemId = value;
+					this.SendPropertyChanged("ActionWorkLedgerItemId");
+					this.OnActionWorkLedgerItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActionWorkLedgerId", DbType="NVarChar(50)")]
+		public string ActionWorkLedgerId
+		{
+			get
+			{
+				return this._ActionWorkLedgerId;
+			}
+			set
+			{
+				if ((this._ActionWorkLedgerId != value))
+				{
+					if (this._Information_ActionWorkLedger.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnActionWorkLedgerIdChanging(value);
+					this.SendPropertyChanging();
+					this._ActionWorkLedgerId = value;
+					this.SendPropertyChanged("ActionWorkLedgerId");
+					this.OnActionWorkLedgerIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+		public System.Nullable<int> SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Focus", DbType="NVarChar(20)")]
+		public string Focus
+		{
+			get
+			{
+				return this._Focus;
+			}
+			set
+			{
+				if ((this._Focus != value))
+				{
+					this.OnFocusChanging(value);
+					this.SendPropertyChanging();
+					this._Focus = value;
+					this.SendPropertyChanged("Focus");
+					this.OnFocusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecialTask", DbType="NVarChar(100)")]
+		public string SpecialTask
+		{
+			get
+			{
+				return this._SpecialTask;
+			}
+			set
+			{
+				if ((this._SpecialTask != value))
+				{
+					this.OnSpecialTaskChanging(value);
+					this.SendPropertyChanging();
+					this._SpecialTask = value;
+					this.SendPropertyChanged("SpecialTask");
+					this.OnSpecialTaskChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPoints", DbType="NVarChar(500)")]
+		public string WorkPoints
+		{
+			get
+			{
+				return this._WorkPoints;
+			}
+			set
+			{
+				if ((this._WorkPoints != value))
+				{
+					this.OnWorkPointsChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPoints = value;
+					this.SendPropertyChanged("WorkPoints");
+					this.OnWorkPointsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingRequirements", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string FillingRequirements
+		{
+			get
+			{
+				return this._FillingRequirements;
+			}
+			set
+			{
+				if ((this._FillingRequirements != value))
+				{
+					this.OnFillingRequirementsChanging(value);
+					this.SendPropertyChanging();
+					this._FillingRequirements = value;
+					this.SendPropertyChanged("FillingRequirements");
+					this.OnFillingRequirementsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletionDeadline", DbType="NVarChar(50)")]
+		public string CompletionDeadline
+		{
+			get
+			{
+				return this._CompletionDeadline;
+			}
+			set
+			{
+				if ((this._CompletionDeadline != value))
+				{
+					this.OnCompletionDeadlineChanging(value);
+					this.SendPropertyChanging();
+					this._CompletionDeadline = value;
+					this.SendPropertyChanged("CompletionDeadline");
+					this.OnCompletionDeadlineChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string ImplementationStatus
+		{
+			get
+			{
+				return this._ImplementationStatus;
+			}
+			set
+			{
+				if ((this._ImplementationStatus != value))
+				{
+					this.OnImplementationStatusChanging(value);
+					this.SendPropertyChanging();
+					this._ImplementationStatus = value;
+					this.SendPropertyChanged("ImplementationStatus");
+					this.OnImplementationStatusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_ActionWorkLedgerItem_Information_ActionWorkLedger", Storage="_Information_ActionWorkLedger", ThisKey="ActionWorkLedgerId", OtherKey="ActionWorkLedgerId", IsForeignKey=true)]
+		public Information_ActionWorkLedger Information_ActionWorkLedger
+		{
+			get
+			{
+				return this._Information_ActionWorkLedger.Entity;
+			}
+			set
+			{
+				Information_ActionWorkLedger previousValue = this._Information_ActionWorkLedger.Entity;
+				if (((previousValue != value) 
+							|| (this._Information_ActionWorkLedger.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Information_ActionWorkLedger.Entity = null;
+						previousValue.Information_ActionWorkLedgerItem.Remove(this);
+					}
+					this._Information_ActionWorkLedger.Entity = value;
+					if ((value != null))
+					{
+						value.Information_ActionWorkLedgerItem.Add(this);
+						this._ActionWorkLedgerId = value.ActionWorkLedgerId;
+					}
+					else
+					{
+						this._ActionWorkLedgerId = default(string);
+					}
+					this.SendPropertyChanged("Information_ActionWorkLedger");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Information_DrillConductedQuarterlyReport")]
 	public partial class Information_DrillConductedQuarterlyReport : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -193634,6 +194777,626 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Information_SafetyProductionEvaluation")]
+	public partial class Information_SafetyProductionEvaluation : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _SafetyProductionEvaluationId;
+		
+		private string _UnitId;
+		
+		private System.Nullable<System.DateTime> _ReportDate;
+		
+		private System.Nullable<int> _Quarter;
+		
+		private System.Nullable<int> _YearId;
+		
+		private string _CompileMan;
+		
+		private string _UpState;
+		
+		private string _HandleState;
+		
+		private string _HandleMan;
+		
+		private EntityRef<Base_Unit> _Base_Unit;
+		
+		private EntitySet<Information_SafetyProductionEvaluationItem> _Information_SafetyProductionEvaluationItem;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnSafetyProductionEvaluationIdChanging(string value);
+    partial void OnSafetyProductionEvaluationIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnReportDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnReportDateChanged();
+    partial void OnQuarterChanging(System.Nullable<int> value);
+    partial void OnQuarterChanged();
+    partial void OnYearIdChanging(System.Nullable<int> value);
+    partial void OnYearIdChanged();
+    partial void OnCompileManChanging(string value);
+    partial void OnCompileManChanged();
+    partial void OnUpStateChanging(string value);
+    partial void OnUpStateChanged();
+    partial void OnHandleStateChanging(string value);
+    partial void OnHandleStateChanged();
+    partial void OnHandleManChanging(string value);
+    partial void OnHandleManChanged();
+    #endregion
+		
+		public Information_SafetyProductionEvaluation()
+		{
+			this._Base_Unit = default(EntityRef<Base_Unit>);
+			this._Information_SafetyProductionEvaluationItem = new EntitySet<Information_SafetyProductionEvaluationItem>(new Action<Information_SafetyProductionEvaluationItem>(this.attach_Information_SafetyProductionEvaluationItem), new Action<Information_SafetyProductionEvaluationItem>(this.detach_Information_SafetyProductionEvaluationItem));
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionEvaluationId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string SafetyProductionEvaluationId
+		{
+			get
+			{
+				return this._SafetyProductionEvaluationId;
+			}
+			set
+			{
+				if ((this._SafetyProductionEvaluationId != value))
+				{
+					this.OnSafetyProductionEvaluationIdChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyProductionEvaluationId = value;
+					this.SendPropertyChanged("SafetyProductionEvaluationId");
+					this.OnSafetyProductionEvaluationIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					if (this._Base_Unit.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ReportDate
+		{
+			get
+			{
+				return this._ReportDate;
+			}
+			set
+			{
+				if ((this._ReportDate != value))
+				{
+					this.OnReportDateChanging(value);
+					this.SendPropertyChanging();
+					this._ReportDate = value;
+					this.SendPropertyChanged("ReportDate");
+					this.OnReportDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarter", DbType="Int")]
+		public System.Nullable<int> Quarter
+		{
+			get
+			{
+				return this._Quarter;
+			}
+			set
+			{
+				if ((this._Quarter != value))
+				{
+					this.OnQuarterChanging(value);
+					this.SendPropertyChanging();
+					this._Quarter = value;
+					this.SendPropertyChanged("Quarter");
+					this.OnQuarterChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YearId", DbType="Int")]
+		public System.Nullable<int> YearId
+		{
+			get
+			{
+				return this._YearId;
+			}
+			set
+			{
+				if ((this._YearId != value))
+				{
+					this.OnYearIdChanging(value);
+					this.SendPropertyChanging();
+					this._YearId = value;
+					this.SendPropertyChanged("YearId");
+					this.OnYearIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
+		public string CompileMan
+		{
+			get
+			{
+				return this._CompileMan;
+			}
+			set
+			{
+				if ((this._CompileMan != value))
+				{
+					this.OnCompileManChanging(value);
+					this.SendPropertyChanging();
+					this._CompileMan = value;
+					this.SendPropertyChanged("CompileMan");
+					this.OnCompileManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this.OnUpStateChanging(value);
+					this.SendPropertyChanging();
+					this._UpState = value;
+					this.SendPropertyChanged("UpState");
+					this.OnUpStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleState", DbType="Char(1)")]
+		public string HandleState
+		{
+			get
+			{
+				return this._HandleState;
+			}
+			set
+			{
+				if ((this._HandleState != value))
+				{
+					this.OnHandleStateChanging(value);
+					this.SendPropertyChanging();
+					this._HandleState = value;
+					this.SendPropertyChanged("HandleState");
+					this.OnHandleStateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleMan", DbType="NVarChar(50)")]
+		public string HandleMan
+		{
+			get
+			{
+				return this._HandleMan;
+			}
+			set
+			{
+				if ((this._HandleMan != value))
+				{
+					this.OnHandleManChanging(value);
+					this.SendPropertyChanging();
+					this._HandleMan = value;
+					this.SendPropertyChanged("HandleMan");
+					this.OnHandleManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_SafetyProductionEvaluation_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
+		public Base_Unit Base_Unit
+		{
+			get
+			{
+				return this._Base_Unit.Entity;
+			}
+			set
+			{
+				Base_Unit previousValue = this._Base_Unit.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Unit.Entity = null;
+						previousValue.Information_SafetyProductionEvaluation.Remove(this);
+					}
+					this._Base_Unit.Entity = value;
+					if ((value != null))
+					{
+						value.Information_SafetyProductionEvaluation.Add(this);
+						this._UnitId = value.UnitId;
+					}
+					else
+					{
+						this._UnitId = default(string);
+					}
+					this.SendPropertyChanged("Base_Unit");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_SafetyProductionEvaluationItem_Information_SafetyProductionEvaluat" +
+			"ion", Storage="_Information_SafetyProductionEvaluationItem", ThisKey="SafetyProductionEvaluationId", OtherKey="SafetyProductionEvaluationId", DeleteRule="NO ACTION")]
+		public EntitySet<Information_SafetyProductionEvaluationItem> Information_SafetyProductionEvaluationItem
+		{
+			get
+			{
+				return this._Information_SafetyProductionEvaluationItem;
+			}
+			set
+			{
+				this._Information_SafetyProductionEvaluationItem.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_Information_SafetyProductionEvaluationItem(Information_SafetyProductionEvaluationItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Information_SafetyProductionEvaluation = this;
+		}
+		
+		private void detach_Information_SafetyProductionEvaluationItem(Information_SafetyProductionEvaluationItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.Information_SafetyProductionEvaluation = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Information_SafetyProductionEvaluationItem")]
+	public partial class Information_SafetyProductionEvaluationItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _SafetyProductionEvaluationItemId;
+		
+		private string _SafetyProductionEvaluationId;
+		
+		private System.Nullable<int> _SortIndex;
+		
+		private string _Type;
+		
+		private string _EvaluateWork;
+		
+		private string _EvaluationContent;
+		
+		private string _FillingRequirements;
+		
+		private string _CompletionDeadline;
+		
+		private string _ImplementationStatus;
+		
+		private EntityRef<Information_SafetyProductionEvaluation> _Information_SafetyProductionEvaluation;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnSafetyProductionEvaluationItemIdChanging(string value);
+    partial void OnSafetyProductionEvaluationItemIdChanged();
+    partial void OnSafetyProductionEvaluationIdChanging(string value);
+    partial void OnSafetyProductionEvaluationIdChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    partial void OnTypeChanging(string value);
+    partial void OnTypeChanged();
+    partial void OnEvaluateWorkChanging(string value);
+    partial void OnEvaluateWorkChanged();
+    partial void OnEvaluationContentChanging(string value);
+    partial void OnEvaluationContentChanged();
+    partial void OnFillingRequirementsChanging(string value);
+    partial void OnFillingRequirementsChanged();
+    partial void OnCompletionDeadlineChanging(string value);
+    partial void OnCompletionDeadlineChanged();
+    partial void OnImplementationStatusChanging(string value);
+    partial void OnImplementationStatusChanged();
+    #endregion
+		
+		public Information_SafetyProductionEvaluationItem()
+		{
+			this._Information_SafetyProductionEvaluation = default(EntityRef<Information_SafetyProductionEvaluation>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionEvaluationItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string SafetyProductionEvaluationItemId
+		{
+			get
+			{
+				return this._SafetyProductionEvaluationItemId;
+			}
+			set
+			{
+				if ((this._SafetyProductionEvaluationItemId != value))
+				{
+					this.OnSafetyProductionEvaluationItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyProductionEvaluationItemId = value;
+					this.SendPropertyChanged("SafetyProductionEvaluationItemId");
+					this.OnSafetyProductionEvaluationItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionEvaluationId", DbType="NVarChar(50)")]
+		public string SafetyProductionEvaluationId
+		{
+			get
+			{
+				return this._SafetyProductionEvaluationId;
+			}
+			set
+			{
+				if ((this._SafetyProductionEvaluationId != value))
+				{
+					if (this._Information_SafetyProductionEvaluation.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnSafetyProductionEvaluationIdChanging(value);
+					this.SendPropertyChanging();
+					this._SafetyProductionEvaluationId = value;
+					this.SendPropertyChanged("SafetyProductionEvaluationId");
+					this.OnSafetyProductionEvaluationIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+		public System.Nullable<int> SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="NVarChar(50)")]
+		public string Type
+		{
+			get
+			{
+				return this._Type;
+			}
+			set
+			{
+				if ((this._Type != value))
+				{
+					this.OnTypeChanging(value);
+					this.SendPropertyChanging();
+					this._Type = value;
+					this.SendPropertyChanged("Type");
+					this.OnTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluateWork", DbType="NVarChar(1000)")]
+		public string EvaluateWork
+		{
+			get
+			{
+				return this._EvaluateWork;
+			}
+			set
+			{
+				if ((this._EvaluateWork != value))
+				{
+					this.OnEvaluateWorkChanging(value);
+					this.SendPropertyChanging();
+					this._EvaluateWork = value;
+					this.SendPropertyChanged("EvaluateWork");
+					this.OnEvaluateWorkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationContent", DbType="NVarChar(1000)")]
+		public string EvaluationContent
+		{
+			get
+			{
+				return this._EvaluationContent;
+			}
+			set
+			{
+				if ((this._EvaluationContent != value))
+				{
+					this.OnEvaluationContentChanging(value);
+					this.SendPropertyChanging();
+					this._EvaluationContent = value;
+					this.SendPropertyChanged("EvaluationContent");
+					this.OnEvaluationContentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FillingRequirements", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string FillingRequirements
+		{
+			get
+			{
+				return this._FillingRequirements;
+			}
+			set
+			{
+				if ((this._FillingRequirements != value))
+				{
+					this.OnFillingRequirementsChanging(value);
+					this.SendPropertyChanging();
+					this._FillingRequirements = value;
+					this.SendPropertyChanged("FillingRequirements");
+					this.OnFillingRequirementsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletionDeadline", DbType="NVarChar(50)")]
+		public string CompletionDeadline
+		{
+			get
+			{
+				return this._CompletionDeadline;
+			}
+			set
+			{
+				if ((this._CompletionDeadline != value))
+				{
+					this.OnCompletionDeadlineChanging(value);
+					this.SendPropertyChanging();
+					this._CompletionDeadline = value;
+					this.SendPropertyChanged("CompletionDeadline");
+					this.OnCompletionDeadlineChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string ImplementationStatus
+		{
+			get
+			{
+				return this._ImplementationStatus;
+			}
+			set
+			{
+				if ((this._ImplementationStatus != value))
+				{
+					this.OnImplementationStatusChanging(value);
+					this.SendPropertyChanging();
+					this._ImplementationStatus = value;
+					this.SendPropertyChanged("ImplementationStatus");
+					this.OnImplementationStatusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_SafetyProductionEvaluationItem_Information_SafetyProductionEvaluat" +
+			"ion", Storage="_Information_SafetyProductionEvaluation", ThisKey="SafetyProductionEvaluationId", OtherKey="SafetyProductionEvaluationId", IsForeignKey=true)]
+		public Information_SafetyProductionEvaluation Information_SafetyProductionEvaluation
+		{
+			get
+			{
+				return this._Information_SafetyProductionEvaluation.Entity;
+			}
+			set
+			{
+				Information_SafetyProductionEvaluation previousValue = this._Information_SafetyProductionEvaluation.Entity;
+				if (((previousValue != value) 
+							|| (this._Information_SafetyProductionEvaluation.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Information_SafetyProductionEvaluation.Entity = null;
+						previousValue.Information_SafetyProductionEvaluationItem.Remove(this);
+					}
+					this._Information_SafetyProductionEvaluation.Entity = value;
+					if ((value != null))
+					{
+						value.Information_SafetyProductionEvaluationItem.Add(this);
+						this._SafetyProductionEvaluationId = value.SafetyProductionEvaluationId;
+					}
+					else
+					{
+						this._SafetyProductionEvaluationId = default(string);
+					}
+					this.SendPropertyChanged("Information_SafetyProductionEvaluation");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Information_SafetyQuarterlyReport")]
 	public partial class Information_SafetyQuarterlyReport : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -278041,7 +279804,7 @@ namespace Model
 		
 		private System.Nullable<int> _ProblemType;
 		
-		private string _SubInspectId;
+		private string _QuestionTechnologyId;
 		
 		private string _TermItemId;
 		
@@ -278055,18 +279818,20 @@ namespace Model
 		
 		private string _InspectUser;
 		
-		private string _HandleUser;
-		
 		private string _ApproveUser;
 		
-		private System.Nullable<System.DateTime> _AdjustCompleteTime;
-		
 		private System.Nullable<int> _ApproveState;
 		
 		private string _AddUser;
 		
 		private System.Nullable<System.DateTime> _AddTime;
 		
+		private string _HandleUser;
+		
+		private System.Nullable<System.DateTime> _AdjustCompleteTime;
+		
+		private string _SubInspectId;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -278083,8 +279848,8 @@ namespace Model
     partial void OnConstructionUnitChanged();
     partial void OnProblemTypeChanging(System.Nullable<int> value);
     partial void OnProblemTypeChanged();
-    partial void OnSubInspectIdChanging(string value);
-    partial void OnSubInspectIdChanged();
+    partial void OnQuestionTechnologyIdChanging(string value);
+    partial void OnQuestionTechnologyIdChanged();
     partial void OnTermItemIdChanging(string value);
     partial void OnTermItemIdChanged();
     partial void OnWorkPackIdChanging(string value);
@@ -278097,18 +279862,20 @@ namespace Model
     partial void OnRectifyTimeChanged();
     partial void OnInspectUserChanging(string value);
     partial void OnInspectUserChanged();
-    partial void OnHandleUserChanging(string value);
-    partial void OnHandleUserChanged();
     partial void OnApproveUserChanging(string value);
     partial void OnApproveUserChanged();
-    partial void OnAdjustCompleteTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAdjustCompleteTimeChanged();
     partial void OnApproveStateChanging(System.Nullable<int> value);
     partial void OnApproveStateChanged();
     partial void OnAddUserChanging(string value);
     partial void OnAddUserChanged();
     partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnAddTimeChanged();
+    partial void OnHandleUserChanging(string value);
+    partial void OnHandleUserChanged();
+    partial void OnAdjustCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAdjustCompleteTimeChanged();
+    partial void OnSubInspectIdChanging(string value);
+    partial void OnSubInspectIdChanged();
     #endregion
 		
 		public PreRun_InspectTailTerm()
@@ -278236,22 +280003,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")]
-		public string SubInspectId
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")]
+		public string QuestionTechnologyId
 		{
 			get
 			{
-				return this._SubInspectId;
+				return this._QuestionTechnologyId;
 			}
 			set
 			{
-				if ((this._SubInspectId != value))
+				if ((this._QuestionTechnologyId != value))
 				{
-					this.OnSubInspectIdChanging(value);
+					this.OnQuestionTechnologyIdChanging(value);
 					this.SendPropertyChanging();
-					this._SubInspectId = value;
-					this.SendPropertyChanged("SubInspectId");
-					this.OnSubInspectIdChanged();
+					this._QuestionTechnologyId = value;
+					this.SendPropertyChanged("QuestionTechnologyId");
+					this.OnQuestionTechnologyIdChanged();
 				}
 			}
 		}
@@ -278376,26 +280143,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
-		public string HandleUser
-		{
-			get
-			{
-				return this._HandleUser;
-			}
-			set
-			{
-				if ((this._HandleUser != value))
-				{
-					this.OnHandleUserChanging(value);
-					this.SendPropertyChanging();
-					this._HandleUser = value;
-					this.SendPropertyChanged("HandleUser");
-					this.OnHandleUserChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")]
 		public string ApproveUser
 		{
@@ -278416,26 +280163,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> AdjustCompleteTime
-		{
-			get
-			{
-				return this._AdjustCompleteTime;
-			}
-			set
-			{
-				if ((this._AdjustCompleteTime != value))
-				{
-					this.OnAdjustCompleteTimeChanging(value);
-					this.SendPropertyChanging();
-					this._AdjustCompleteTime = value;
-					this.SendPropertyChanged("AdjustCompleteTime");
-					this.OnAdjustCompleteTimeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
 		public System.Nullable<int> ApproveState
 		{
@@ -278496,6 +280223,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
+		public string HandleUser
+		{
+			get
+			{
+				return this._HandleUser;
+			}
+			set
+			{
+				if ((this._HandleUser != value))
+				{
+					this.OnHandleUserChanging(value);
+					this.SendPropertyChanging();
+					this._HandleUser = value;
+					this.SendPropertyChanged("HandleUser");
+					this.OnHandleUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AdjustCompleteTime
+		{
+			get
+			{
+				return this._AdjustCompleteTime;
+			}
+			set
+			{
+				if ((this._AdjustCompleteTime != value))
+				{
+					this.OnAdjustCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AdjustCompleteTime = value;
+					this.SendPropertyChanged("AdjustCompleteTime");
+					this.OnAdjustCompleteTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")]
+		public string SubInspectId
+		{
+			get
+			{
+				return this._SubInspectId;
+			}
+			set
+			{
+				if ((this._SubInspectId != value))
+				{
+					this.OnSubInspectIdChanging(value);
+					this.SendPropertyChanging();
+					this._SubInspectId = value;
+					this.SendPropertyChanged("SubInspectId");
+					this.OnSubInspectIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -278537,14 +280324,14 @@ namespace Model
 		
 		private string _ApproveUser;
 		
-		private System.Nullable<int> _ApproveType;
-		
 		private System.Nullable<int> _ApproveState;
 		
 		private string _AddUser;
 		
 		private System.Nullable<System.DateTime> _AddTime;
 		
+		private System.Nullable<int> _ApproveType;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -278563,14 +280350,14 @@ namespace Model
     partial void OnApproveTimeChanged();
     partial void OnApproveUserChanging(string value);
     partial void OnApproveUserChanged();
-    partial void OnApproveTypeChanging(System.Nullable<int> value);
-    partial void OnApproveTypeChanged();
     partial void OnApproveStateChanging(System.Nullable<int> value);
     partial void OnApproveStateChanged();
     partial void OnAddUserChanging(string value);
     partial void OnAddUserChanged();
     partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnAddTimeChanged();
+    partial void OnApproveTypeChanging(System.Nullable<int> value);
+    partial void OnApproveTypeChanged();
     #endregion
 		
 		public PreRun_InspectTermApproveRecords()
@@ -278718,26 +280505,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
-		public System.Nullable<int> ApproveType
-		{
-			get
-			{
-				return this._ApproveType;
-			}
-			set
-			{
-				if ((this._ApproveType != value))
-				{
-					this.OnApproveTypeChanging(value);
-					this.SendPropertyChanging();
-					this._ApproveType = value;
-					this.SendPropertyChanged("ApproveType");
-					this.OnApproveTypeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
 		public System.Nullable<int> ApproveState
 		{
@@ -278798,6 +280565,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
+		public System.Nullable<int> ApproveType
+		{
+			get
+			{
+				return this._ApproveType;
+			}
+			set
+			{
+				if ((this._ApproveType != value))
+				{
+					this.OnApproveTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveType = value;
+					this.SendPropertyChanged("ApproveType");
+					this.OnApproveTypeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -279730,7 +281517,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get
@@ -279853,6 +281640,12 @@ namespace Model
 		
 		private string _InspectResult;
 		
+		private System.Nullable<System.DateTime> _InspectTime;
+		
+		private string _AddUser;
+		
+		private System.Nullable<System.DateTime> _AddTime;
+		
 		private string _Subcontractor;
 		
 		private string _Contractor;
@@ -279861,20 +281654,6 @@ namespace Model
 		
 		private string _Owner;
 		
-		private System.Nullable<int> _InspectionIsAllPass;
-		
-		private System.Nullable<int> _SubcontractorIsAllPass;
-		
-		private System.Nullable<int> _ContractorIsAllPass;
-		
-		private System.Nullable<int> _SupervisionIsAllPass;
-		
-		private System.Nullable<int> _OwnerIsAllPass;
-		
-		private System.Nullable<int> _WorkPackType;
-		
-		private string _PropertyTechnologyId;
-		
 		private System.Nullable<System.DateTime> _SubcontractorAllPassData;
 		
 		private System.Nullable<System.DateTime> _ContractorAllPassData;
@@ -279907,11 +281686,19 @@ namespace Model
 		
 		private string _UnifyWanderAboutOpinion;
 		
-		private System.Nullable<System.DateTime> _InspectTime;
+		private System.Nullable<int> _InspectionIsAllPass;
 		
-		private string _AddUser;
+		private System.Nullable<int> _WorkPackType;
 		
-		private System.Nullable<System.DateTime> _AddTime;
+		private string _PropertyTechnologyId;
+		
+		private System.Nullable<int> _SubcontractorIsAllPass;
+		
+		private System.Nullable<int> _ContractorIsAllPass;
+		
+		private System.Nullable<int> _SupervisionIsAllPass;
+		
+		private System.Nullable<int> _OwnerIsAllPass;
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
@@ -279933,6 +281720,12 @@ namespace Model
     partial void OnWorkPackIdChanged();
     partial void OnInspectResultChanging(string value);
     partial void OnInspectResultChanged();
+    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnInspectTimeChanged();
+    partial void OnAddUserChanging(string value);
+    partial void OnAddUserChanged();
+    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAddTimeChanged();
     partial void OnSubcontractorChanging(string value);
     partial void OnSubcontractorChanged();
     partial void OnContractorChanging(string value);
@@ -279941,20 +281734,6 @@ namespace Model
     partial void OnSupervisionChanged();
     partial void OnOwnerChanging(string value);
     partial void OnOwnerChanged();
-    partial void OnInspectionIsAllPassChanging(System.Nullable<int> value);
-    partial void OnInspectionIsAllPassChanged();
-    partial void OnSubcontractorIsAllPassChanging(System.Nullable<int> value);
-    partial void OnSubcontractorIsAllPassChanged();
-    partial void OnContractorIsAllPassChanging(System.Nullable<int> value);
-    partial void OnContractorIsAllPassChanged();
-    partial void OnSupervisionIsAllPassChanging(System.Nullable<int> value);
-    partial void OnSupervisionIsAllPassChanged();
-    partial void OnOwnerIsAllPassChanging(System.Nullable<int> value);
-    partial void OnOwnerIsAllPassChanged();
-    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
-    partial void OnWorkPackTypeChanged();
-    partial void OnPropertyTechnologyIdChanging(string value);
-    partial void OnPropertyTechnologyIdChanged();
     partial void OnSubcontractorAllPassDataChanging(System.Nullable<System.DateTime> value);
     partial void OnSubcontractorAllPassDataChanged();
     partial void OnContractorAllPassDataChanging(System.Nullable<System.DateTime> value);
@@ -279987,12 +281766,20 @@ namespace Model
     partial void OnUnifyWanderAboutDataChanged();
     partial void OnUnifyWanderAboutOpinionChanging(string value);
     partial void OnUnifyWanderAboutOpinionChanged();
-    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnInspectTimeChanged();
-    partial void OnAddUserChanging(string value);
-    partial void OnAddUserChanged();
-    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAddTimeChanged();
+    partial void OnInspectionIsAllPassChanging(System.Nullable<int> value);
+    partial void OnInspectionIsAllPassChanged();
+    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
+    partial void OnWorkPackTypeChanged();
+    partial void OnPropertyTechnologyIdChanging(string value);
+    partial void OnPropertyTechnologyIdChanged();
+    partial void OnSubcontractorIsAllPassChanging(System.Nullable<int> value);
+    partial void OnSubcontractorIsAllPassChanged();
+    partial void OnContractorIsAllPassChanging(System.Nullable<int> value);
+    partial void OnContractorIsAllPassChanged();
+    partial void OnSupervisionIsAllPassChanging(System.Nullable<int> value);
+    partial void OnSupervisionIsAllPassChanged();
+    partial void OnOwnerIsAllPassChanging(System.Nullable<int> value);
+    partial void OnOwnerIsAllPassChanged();
     #endregion
 		
 		public PreRun_SubInspectTerm()
@@ -280160,6 +281947,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> InspectTime
+		{
+			get
+			{
+				return this._InspectTime;
+			}
+			set
+			{
+				if ((this._InspectTime != value))
+				{
+					this.OnInspectTimeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectTime = value;
+					this.SendPropertyChanged("InspectTime");
+					this.OnInspectTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
+		public string AddUser
+		{
+			get
+			{
+				return this._AddUser;
+			}
+			set
+			{
+				if ((this._AddUser != value))
+				{
+					this.OnAddUserChanging(value);
+					this.SendPropertyChanging();
+					this._AddUser = value;
+					this.SendPropertyChanged("AddUser");
+					this.OnAddUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AddTime
+		{
+			get
+			{
+				return this._AddTime;
+			}
+			set
+			{
+				if ((this._AddTime != value))
+				{
+					this.OnAddTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AddTime = value;
+					this.SendPropertyChanged("AddTime");
+					this.OnAddTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")]
 		public string Subcontractor
 		{
@@ -280240,146 +282087,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")]
-		public System.Nullable<int> InspectionIsAllPass
-		{
-			get
-			{
-				return this._InspectionIsAllPass;
-			}
-			set
-			{
-				if ((this._InspectionIsAllPass != value))
-				{
-					this.OnInspectionIsAllPassChanging(value);
-					this.SendPropertyChanging();
-					this._InspectionIsAllPass = value;
-					this.SendPropertyChanged("InspectionIsAllPass");
-					this.OnInspectionIsAllPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsAllPass", DbType="Int")]
-		public System.Nullable<int> SubcontractorIsAllPass
-		{
-			get
-			{
-				return this._SubcontractorIsAllPass;
-			}
-			set
-			{
-				if ((this._SubcontractorIsAllPass != value))
-				{
-					this.OnSubcontractorIsAllPassChanging(value);
-					this.SendPropertyChanging();
-					this._SubcontractorIsAllPass = value;
-					this.SendPropertyChanged("SubcontractorIsAllPass");
-					this.OnSubcontractorIsAllPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsAllPass", DbType="Int")]
-		public System.Nullable<int> ContractorIsAllPass
-		{
-			get
-			{
-				return this._ContractorIsAllPass;
-			}
-			set
-			{
-				if ((this._ContractorIsAllPass != value))
-				{
-					this.OnContractorIsAllPassChanging(value);
-					this.SendPropertyChanging();
-					this._ContractorIsAllPass = value;
-					this.SendPropertyChanged("ContractorIsAllPass");
-					this.OnContractorIsAllPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsAllPass", DbType="Int")]
-		public System.Nullable<int> SupervisionIsAllPass
-		{
-			get
-			{
-				return this._SupervisionIsAllPass;
-			}
-			set
-			{
-				if ((this._SupervisionIsAllPass != value))
-				{
-					this.OnSupervisionIsAllPassChanging(value);
-					this.SendPropertyChanging();
-					this._SupervisionIsAllPass = value;
-					this.SendPropertyChanged("SupervisionIsAllPass");
-					this.OnSupervisionIsAllPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsAllPass", DbType="Int")]
-		public System.Nullable<int> OwnerIsAllPass
-		{
-			get
-			{
-				return this._OwnerIsAllPass;
-			}
-			set
-			{
-				if ((this._OwnerIsAllPass != value))
-				{
-					this.OnOwnerIsAllPassChanging(value);
-					this.SendPropertyChanging();
-					this._OwnerIsAllPass = value;
-					this.SendPropertyChanged("OwnerIsAllPass");
-					this.OnOwnerIsAllPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
-		public System.Nullable<int> WorkPackType
-		{
-			get
-			{
-				return this._WorkPackType;
-			}
-			set
-			{
-				if ((this._WorkPackType != value))
-				{
-					this.OnWorkPackTypeChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackType = value;
-					this.SendPropertyChanged("WorkPackType");
-					this.OnWorkPackTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
-		public string PropertyTechnologyId
-		{
-			get
-			{
-				return this._PropertyTechnologyId;
-			}
-			set
-			{
-				if ((this._PropertyTechnologyId != value))
-				{
-					this.OnPropertyTechnologyIdChanging(value);
-					this.SendPropertyChanging();
-					this._PropertyTechnologyId = value;
-					this.SendPropertyChanged("PropertyTechnologyId");
-					this.OnPropertyTechnologyIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorAllPassData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> SubcontractorAllPassData
 		{
@@ -280700,62 +282407,142 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> InspectTime
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")]
+		public System.Nullable<int> InspectionIsAllPass
 		{
 			get
 			{
-				return this._InspectTime;
+				return this._InspectionIsAllPass;
 			}
 			set
 			{
-				if ((this._InspectTime != value))
+				if ((this._InspectionIsAllPass != value))
 				{
-					this.OnInspectTimeChanging(value);
+					this.OnInspectionIsAllPassChanging(value);
 					this.SendPropertyChanging();
-					this._InspectTime = value;
-					this.SendPropertyChanged("InspectTime");
-					this.OnInspectTimeChanged();
+					this._InspectionIsAllPass = value;
+					this.SendPropertyChanged("InspectionIsAllPass");
+					this.OnInspectionIsAllPassChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
-		public string AddUser
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
+		public System.Nullable<int> WorkPackType
 		{
 			get
 			{
-				return this._AddUser;
+				return this._WorkPackType;
 			}
 			set
 			{
-				if ((this._AddUser != value))
+				if ((this._WorkPackType != value))
 				{
-					this.OnAddUserChanging(value);
+					this.OnWorkPackTypeChanging(value);
 					this.SendPropertyChanging();
-					this._AddUser = value;
-					this.SendPropertyChanged("AddUser");
-					this.OnAddUserChanged();
+					this._WorkPackType = value;
+					this.SendPropertyChanged("WorkPackType");
+					this.OnWorkPackTypeChanged();
 				}
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> AddTime
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="NVarChar(50)")]
+		public string PropertyTechnologyId
 		{
 			get
 			{
-				return this._AddTime;
+				return this._PropertyTechnologyId;
 			}
 			set
 			{
-				if ((this._AddTime != value))
+				if ((this._PropertyTechnologyId != value))
 				{
-					this.OnAddTimeChanging(value);
+					this.OnPropertyTechnologyIdChanging(value);
 					this.SendPropertyChanging();
-					this._AddTime = value;
-					this.SendPropertyChanged("AddTime");
-					this.OnAddTimeChanged();
+					this._PropertyTechnologyId = value;
+					this.SendPropertyChanged("PropertyTechnologyId");
+					this.OnPropertyTechnologyIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsAllPass", DbType="Int")]
+		public System.Nullable<int> SubcontractorIsAllPass
+		{
+			get
+			{
+				return this._SubcontractorIsAllPass;
+			}
+			set
+			{
+				if ((this._SubcontractorIsAllPass != value))
+				{
+					this.OnSubcontractorIsAllPassChanging(value);
+					this.SendPropertyChanging();
+					this._SubcontractorIsAllPass = value;
+					this.SendPropertyChanged("SubcontractorIsAllPass");
+					this.OnSubcontractorIsAllPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsAllPass", DbType="Int")]
+		public System.Nullable<int> ContractorIsAllPass
+		{
+			get
+			{
+				return this._ContractorIsAllPass;
+			}
+			set
+			{
+				if ((this._ContractorIsAllPass != value))
+				{
+					this.OnContractorIsAllPassChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorIsAllPass = value;
+					this.SendPropertyChanged("ContractorIsAllPass");
+					this.OnContractorIsAllPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsAllPass", DbType="Int")]
+		public System.Nullable<int> SupervisionIsAllPass
+		{
+			get
+			{
+				return this._SupervisionIsAllPass;
+			}
+			set
+			{
+				if ((this._SupervisionIsAllPass != value))
+				{
+					this.OnSupervisionIsAllPassChanging(value);
+					this.SendPropertyChanging();
+					this._SupervisionIsAllPass = value;
+					this.SendPropertyChanged("SupervisionIsAllPass");
+					this.OnSupervisionIsAllPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsAllPass", DbType="Int")]
+		public System.Nullable<int> OwnerIsAllPass
+		{
+			get
+			{
+				return this._OwnerIsAllPass;
+			}
+			set
+			{
+				if ((this._OwnerIsAllPass != value))
+				{
+					this.OnOwnerIsAllPassChanging(value);
+					this.SendPropertyChanging();
+					this._OwnerIsAllPass = value;
+					this.SendPropertyChanged("OwnerIsAllPass");
+					this.OnOwnerIsAllPassChanged();
 				}
 			}
 		}
@@ -280823,22 +282610,6 @@ namespace Model
 		
 		private string _Owner;
 		
-		private System.Nullable<int> _SubcontractorIsPass;
-		
-		private System.Nullable<int> _ContractorIsPass;
-		
-		private System.Nullable<int> _SupervisionIsPass;
-		
-		private System.Nullable<int> _OwnerIsPass;
-		
-		private string _SubcontractorRemark;
-		
-		private string _ContractorRemark;
-		
-		private string _SupervisionRemark;
-		
-		private string _OwnerRemark;
-		
 		private System.Nullable<int> _WorkPackType;
 		
 		private string _PropertyTechnologyId;
@@ -280851,6 +282622,22 @@ namespace Model
 		
 		private System.Nullable<int> _Sort;
 		
+		private string _SubcontractorRemark;
+		
+		private string _ContractorRemark;
+		
+		private string _SupervisionRemark;
+		
+		private string _OwnerRemark;
+		
+		private System.Nullable<int> _SubcontractorIsPass;
+		
+		private System.Nullable<int> _ContractorIsPass;
+		
+		private System.Nullable<int> _SupervisionIsPass;
+		
+		private System.Nullable<int> _OwnerIsPass;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -280891,22 +282678,6 @@ namespace Model
     partial void OnSupervisionChanged();
     partial void OnOwnerChanging(string value);
     partial void OnOwnerChanged();
-    partial void OnSubcontractorIsPassChanging(System.Nullable<int> value);
-    partial void OnSubcontractorIsPassChanged();
-    partial void OnContractorIsPassChanging(System.Nullable<int> value);
-    partial void OnContractorIsPassChanged();
-    partial void OnSupervisionIsPassChanging(System.Nullable<int> value);
-    partial void OnSupervisionIsPassChanged();
-    partial void OnOwnerIsPassChanging(System.Nullable<int> value);
-    partial void OnOwnerIsPassChanged();
-    partial void OnSubcontractorRemarkChanging(string value);
-    partial void OnSubcontractorRemarkChanged();
-    partial void OnContractorRemarkChanging(string value);
-    partial void OnContractorRemarkChanged();
-    partial void OnSupervisionRemarkChanging(string value);
-    partial void OnSupervisionRemarkChanged();
-    partial void OnOwnerRemarkChanging(string value);
-    partial void OnOwnerRemarkChanged();
     partial void OnWorkPackTypeChanging(System.Nullable<int> value);
     partial void OnWorkPackTypeChanged();
     partial void OnPropertyTechnologyIdChanging(string value);
@@ -280919,6 +282690,22 @@ namespace Model
     partial void OnAddTimeChanged();
     partial void OnSortChanging(System.Nullable<int> value);
     partial void OnSortChanged();
+    partial void OnSubcontractorRemarkChanging(string value);
+    partial void OnSubcontractorRemarkChanged();
+    partial void OnContractorRemarkChanging(string value);
+    partial void OnContractorRemarkChanged();
+    partial void OnSupervisionRemarkChanging(string value);
+    partial void OnSupervisionRemarkChanged();
+    partial void OnOwnerRemarkChanging(string value);
+    partial void OnOwnerRemarkChanged();
+    partial void OnSubcontractorIsPassChanging(System.Nullable<int> value);
+    partial void OnSubcontractorIsPassChanged();
+    partial void OnContractorIsPassChanging(System.Nullable<int> value);
+    partial void OnContractorIsPassChanged();
+    partial void OnSupervisionIsPassChanging(System.Nullable<int> value);
+    partial void OnSupervisionIsPassChanged();
+    partial void OnOwnerIsPassChanging(System.Nullable<int> value);
+    partial void OnOwnerIsPassChanged();
     #endregion
 		
 		public PreRun_SubInspectTermItem()
@@ -281286,166 +283073,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")]
-		public System.Nullable<int> SubcontractorIsPass
-		{
-			get
-			{
-				return this._SubcontractorIsPass;
-			}
-			set
-			{
-				if ((this._SubcontractorIsPass != value))
-				{
-					this.OnSubcontractorIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._SubcontractorIsPass = value;
-					this.SendPropertyChanged("SubcontractorIsPass");
-					this.OnSubcontractorIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")]
-		public System.Nullable<int> ContractorIsPass
-		{
-			get
-			{
-				return this._ContractorIsPass;
-			}
-			set
-			{
-				if ((this._ContractorIsPass != value))
-				{
-					this.OnContractorIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._ContractorIsPass = value;
-					this.SendPropertyChanged("ContractorIsPass");
-					this.OnContractorIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")]
-		public System.Nullable<int> SupervisionIsPass
-		{
-			get
-			{
-				return this._SupervisionIsPass;
-			}
-			set
-			{
-				if ((this._SupervisionIsPass != value))
-				{
-					this.OnSupervisionIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._SupervisionIsPass = value;
-					this.SendPropertyChanged("SupervisionIsPass");
-					this.OnSupervisionIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")]
-		public System.Nullable<int> OwnerIsPass
-		{
-			get
-			{
-				return this._OwnerIsPass;
-			}
-			set
-			{
-				if ((this._OwnerIsPass != value))
-				{
-					this.OnOwnerIsPassChanging(value);
-					this.SendPropertyChanging();
-					this._OwnerIsPass = value;
-					this.SendPropertyChanged("OwnerIsPass");
-					this.OnOwnerIsPassChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")]
-		public string SubcontractorRemark
-		{
-			get
-			{
-				return this._SubcontractorRemark;
-			}
-			set
-			{
-				if ((this._SubcontractorRemark != value))
-				{
-					this.OnSubcontractorRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._SubcontractorRemark = value;
-					this.SendPropertyChanged("SubcontractorRemark");
-					this.OnSubcontractorRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")]
-		public string ContractorRemark
-		{
-			get
-			{
-				return this._ContractorRemark;
-			}
-			set
-			{
-				if ((this._ContractorRemark != value))
-				{
-					this.OnContractorRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._ContractorRemark = value;
-					this.SendPropertyChanged("ContractorRemark");
-					this.OnContractorRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")]
-		public string SupervisionRemark
-		{
-			get
-			{
-				return this._SupervisionRemark;
-			}
-			set
-			{
-				if ((this._SupervisionRemark != value))
-				{
-					this.OnSupervisionRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._SupervisionRemark = value;
-					this.SendPropertyChanged("SupervisionRemark");
-					this.OnSupervisionRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")]
-		public string OwnerRemark
-		{
-			get
-			{
-				return this._OwnerRemark;
-			}
-			set
-			{
-				if ((this._OwnerRemark != value))
-				{
-					this.OnOwnerRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._OwnerRemark = value;
-					this.SendPropertyChanged("OwnerRemark");
-					this.OnOwnerRemarkChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
 		public System.Nullable<int> WorkPackType
 		{
@@ -281466,7 +283093,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(50)")]
 		public string PropertyTechnologyId
 		{
 			get
@@ -281566,6 +283193,166 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorRemark", DbType="VarChar(1000)")]
+		public string SubcontractorRemark
+		{
+			get
+			{
+				return this._SubcontractorRemark;
+			}
+			set
+			{
+				if ((this._SubcontractorRemark != value))
+				{
+					this.OnSubcontractorRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._SubcontractorRemark = value;
+					this.SendPropertyChanged("SubcontractorRemark");
+					this.OnSubcontractorRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorRemark", DbType="VarChar(1000)")]
+		public string ContractorRemark
+		{
+			get
+			{
+				return this._ContractorRemark;
+			}
+			set
+			{
+				if ((this._ContractorRemark != value))
+				{
+					this.OnContractorRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorRemark = value;
+					this.SendPropertyChanged("ContractorRemark");
+					this.OnContractorRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionRemark", DbType="VarChar(1000)")]
+		public string SupervisionRemark
+		{
+			get
+			{
+				return this._SupervisionRemark;
+			}
+			set
+			{
+				if ((this._SupervisionRemark != value))
+				{
+					this.OnSupervisionRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._SupervisionRemark = value;
+					this.SendPropertyChanged("SupervisionRemark");
+					this.OnSupervisionRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerRemark", DbType="VarChar(1000)")]
+		public string OwnerRemark
+		{
+			get
+			{
+				return this._OwnerRemark;
+			}
+			set
+			{
+				if ((this._OwnerRemark != value))
+				{
+					this.OnOwnerRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._OwnerRemark = value;
+					this.SendPropertyChanged("OwnerRemark");
+					this.OnOwnerRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")]
+		public System.Nullable<int> SubcontractorIsPass
+		{
+			get
+			{
+				return this._SubcontractorIsPass;
+			}
+			set
+			{
+				if ((this._SubcontractorIsPass != value))
+				{
+					this.OnSubcontractorIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._SubcontractorIsPass = value;
+					this.SendPropertyChanged("SubcontractorIsPass");
+					this.OnSubcontractorIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractorIsPass", DbType="Int")]
+		public System.Nullable<int> ContractorIsPass
+		{
+			get
+			{
+				return this._ContractorIsPass;
+			}
+			set
+			{
+				if ((this._ContractorIsPass != value))
+				{
+					this.OnContractorIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._ContractorIsPass = value;
+					this.SendPropertyChanged("ContractorIsPass");
+					this.OnContractorIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupervisionIsPass", DbType="Int")]
+		public System.Nullable<int> SupervisionIsPass
+		{
+			get
+			{
+				return this._SupervisionIsPass;
+			}
+			set
+			{
+				if ((this._SupervisionIsPass != value))
+				{
+					this.OnSupervisionIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._SupervisionIsPass = value;
+					this.SendPropertyChanged("SupervisionIsPass");
+					this.OnSupervisionIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OwnerIsPass", DbType="Int")]
+		public System.Nullable<int> OwnerIsPass
+		{
+			get
+			{
+				return this._OwnerIsPass;
+			}
+			set
+			{
+				if ((this._OwnerIsPass != value))
+				{
+					this.OnOwnerIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._OwnerIsPass = value;
+					this.SendPropertyChanged("OwnerIsPass");
+					this.OnOwnerIsPassChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -282567,8 +284354,6 @@ namespace Model
 		
 		private string _RestrictCondition;
 		
-		private System.Nullable<int> _ResponsibilityProposeSatate;
-		
 		private System.Nullable<int> _ResponsibilityConfirm;
 		
 		private System.Nullable<int> _ProposeConfirm;
@@ -282579,11 +284364,9 @@ namespace Model
 		
 		private System.Nullable<int> _OwnerConfirm;
 		
-		private System.Nullable<System.DateTime> _ProposeConfirmData;
-		
 		private System.Nullable<System.DateTime> _ResponsibilityConfirmData;
 		
-		private System.Nullable<System.DateTime> _ProposeHandleData;
+		private System.Nullable<System.DateTime> _ProposeConfirmData;
 		
 		private System.Nullable<System.DateTime> _GeneraConfirmData;
 		
@@ -282599,6 +284382,10 @@ namespace Model
 		
 		private System.Nullable<int> _Sort;
 		
+		private System.Nullable<int> _ResponsibilityProposeSatate;
+		
+		private System.Nullable<System.DateTime> _ProposeHandleData;
+		
 		private string _FourDecisionCode;
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
@@ -282635,8 +284422,6 @@ namespace Model
     partial void OnRealityDestructionTimeChanged();
     partial void OnRestrictConditionChanging(string value);
     partial void OnRestrictConditionChanged();
-    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
-    partial void OnResponsibilityProposeSatateChanged();
     partial void OnResponsibilityConfirmChanging(System.Nullable<int> value);
     partial void OnResponsibilityConfirmChanged();
     partial void OnProposeConfirmChanging(System.Nullable<int> value);
@@ -282647,12 +284432,10 @@ namespace Model
     partial void OnSupervisionConfirmChanged();
     partial void OnOwnerConfirmChanging(System.Nullable<int> value);
     partial void OnOwnerConfirmChanged();
-    partial void OnProposeConfirmDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnProposeConfirmDataChanged();
     partial void OnResponsibilityConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnResponsibilityConfirmDataChanged();
-    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnProposeHandleDataChanged();
+    partial void OnProposeConfirmDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnProposeConfirmDataChanged();
     partial void OnGeneraConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnGeneraConfirmDataChanged();
     partial void OnSupervisionConfirmDataChanging(System.Nullable<System.DateTime> value);
@@ -282667,6 +284450,10 @@ namespace Model
     partial void OnAddTimeChanged();
     partial void OnSortChanging(System.Nullable<int> value);
     partial void OnSortChanged();
+    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
+    partial void OnResponsibilityProposeSatateChanged();
+    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnProposeHandleDataChanged();
     partial void OnFourDecisionCodeChanging(string value);
     partial void OnFourDecisionCodeChanged();
     #endregion
@@ -282976,26 +284763,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
-		public System.Nullable<int> ResponsibilityProposeSatate
-		{
-			get
-			{
-				return this._ResponsibilityProposeSatate;
-			}
-			set
-			{
-				if ((this._ResponsibilityProposeSatate != value))
-				{
-					this.OnResponsibilityProposeSatateChanging(value);
-					this.SendPropertyChanging();
-					this._ResponsibilityProposeSatate = value;
-					this.SendPropertyChanged("ResponsibilityProposeSatate");
-					this.OnResponsibilityProposeSatateChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")]
 		public System.Nullable<int> ResponsibilityConfirm
 		{
@@ -283096,26 +284863,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeConfirmData
-		{
-			get
-			{
-				return this._ProposeConfirmData;
-			}
-			set
-			{
-				if ((this._ProposeConfirmData != value))
-				{
-					this.OnProposeConfirmDataChanging(value);
-					this.SendPropertyChanging();
-					this._ProposeConfirmData = value;
-					this.SendPropertyChanged("ProposeConfirmData");
-					this.OnProposeConfirmDataChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ResponsibilityConfirmData
 		{
@@ -283136,22 +284883,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeHandleData
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeConfirmData
 		{
 			get
 			{
-				return this._ProposeHandleData;
+				return this._ProposeConfirmData;
 			}
 			set
 			{
-				if ((this._ProposeHandleData != value))
+				if ((this._ProposeConfirmData != value))
 				{
-					this.OnProposeHandleDataChanging(value);
+					this.OnProposeConfirmDataChanging(value);
 					this.SendPropertyChanging();
-					this._ProposeHandleData = value;
-					this.SendPropertyChanged("ProposeHandleData");
-					this.OnProposeHandleDataChanged();
+					this._ProposeConfirmData = value;
+					this.SendPropertyChanged("ProposeConfirmData");
+					this.OnProposeConfirmDataChanged();
 				}
 			}
 		}
@@ -283296,6 +285043,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
+		public System.Nullable<int> ResponsibilityProposeSatate
+		{
+			get
+			{
+				return this._ResponsibilityProposeSatate;
+			}
+			set
+			{
+				if ((this._ResponsibilityProposeSatate != value))
+				{
+					this.OnResponsibilityProposeSatateChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibilityProposeSatate = value;
+					this.SendPropertyChanged("ResponsibilityProposeSatate");
+					this.OnResponsibilityProposeSatateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeHandleData
+		{
+			get
+			{
+				return this._ProposeHandleData;
+			}
+			set
+			{
+				if ((this._ProposeHandleData != value))
+				{
+					this.OnProposeHandleDataChanging(value);
+					this.SendPropertyChanging();
+					this._ProposeHandleData = value;
+					this.SendPropertyChanged("ProposeHandleData");
+					this.OnProposeHandleDataChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")]
 		public string FourDecisionCode
 		{
@@ -284008,7 +285795,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get
@@ -284972,7 +286759,9 @@ namespace Model
 		
 		private string _AttachUrl2;
 		
-		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
+		private string _ChildUnitWorkId;
+		
+		private string _ChildBranch;
 		
 		private EntityRef<Base_Project> _Base_Project;
 		
@@ -285032,11 +286821,14 @@ namespace Model
     partial void OnFileTypeChanged();
     partial void OnAttachUrl2Changing(string value);
     partial void OnAttachUrl2Changed();
+    partial void OnChildUnitWorkIdChanging(string value);
+    partial void OnChildUnitWorkIdChanged();
+    partial void OnChildBranchChanging(string value);
+    partial void OnChildBranchChanged();
     #endregion
 		
 		public ProcessControl_InspectionManagement()
 		{
-			this._Base_CNProfessional = default(EntityRef<Base_CNProfessional>);
 			this._Base_Project = default(EntityRef<Base_Project>);
 			this._Base_Unit = default(EntityRef<Base_Unit>);
 			this._Sys_User = default(EntityRef<Sys_User>);
@@ -285124,10 +286916,6 @@ namespace Model
 			{
 				if ((this._CNProfessionalId != value))
 				{
-					if (this._Base_CNProfessional.HasLoadedOrAssignedValue)
-					{
-						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
-					}
 					this.OnCNProfessionalIdChanging(value);
 					this.SendPropertyChanging();
 					this._CNProfessionalId = value;
@@ -285505,36 +287293,42 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ProcessControl_InspectionManagement_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
-		public Base_CNProfessional Base_CNProfessional
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChildUnitWorkId", DbType="NVarChar(50)")]
+		public string ChildUnitWorkId
 		{
 			get
 			{
-				return this._Base_CNProfessional.Entity;
+				return this._ChildUnitWorkId;
 			}
 			set
 			{
-				Base_CNProfessional previousValue = this._Base_CNProfessional.Entity;
-				if (((previousValue != value) 
-							|| (this._Base_CNProfessional.HasLoadedOrAssignedValue == false)))
+				if ((this._ChildUnitWorkId != value))
 				{
+					this.OnChildUnitWorkIdChanging(value);
 					this.SendPropertyChanging();
-					if ((previousValue != null))
-					{
-						this._Base_CNProfessional.Entity = null;
-						previousValue.ProcessControl_InspectionManagement.Remove(this);
-					}
-					this._Base_CNProfessional.Entity = value;
-					if ((value != null))
-					{
-						value.ProcessControl_InspectionManagement.Add(this);
-						this._CNProfessionalId = value.CNProfessionalId;
-					}
-					else
-					{
-						this._CNProfessionalId = default(string);
-					}
-					this.SendPropertyChanged("Base_CNProfessional");
+					this._ChildUnitWorkId = value;
+					this.SendPropertyChanged("ChildUnitWorkId");
+					this.OnChildUnitWorkIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChildBranch", DbType="NVarChar(50)")]
+		public string ChildBranch
+		{
+			get
+			{
+				return this._ChildBranch;
+			}
+			set
+			{
+				if ((this._ChildBranch != value))
+				{
+					this.OnChildBranchChanging(value);
+					this.SendPropertyChanging();
+					this._ChildBranch = value;
+					this.SendPropertyChanged("ChildBranch");
+					this.OnChildBranchChanged();
 				}
 			}
 		}
@@ -341276,6 +343070,8 @@ namespace Model
 		
 		private string _Content;
 		
+		private string _CsUsers;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Base_SolutionTempleteType> _Base_SolutionTempleteType;
@@ -341320,6 +343116,8 @@ namespace Model
     partial void OnSpecialSchemeTypeIdChanged();
     partial void OnContentChanging(string value);
     partial void OnContentChanged();
+    partial void OnCsUsersChanging(string value);
+    partial void OnCsUsersChanged();
     #endregion
 		
 		public Solution_CQMSConstructSolution()
@@ -341648,6 +343446,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CsUsers", DbType="NVarChar(2000)")]
+		public string CsUsers
+		{
+			get
+			{
+				return this._CsUsers;
+			}
+			set
+			{
+				if ((this._CsUsers != value))
+				{
+					this.OnCsUsersChanging(value);
+					this.SendPropertyChanging();
+					this._CsUsers = value;
+					this.SendPropertyChanged("CsUsers");
+					this.OnCsUsersChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_CQMSConstructSolution_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -342214,6 +344032,308 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Solution_CQMSConstructSolutionApprove_Item")]
+	public partial class Solution_CQMSConstructSolutionApprove_Item : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private System.Nullable<int> _TypeSortId;
+		
+		private System.Nullable<int> _SortId;
+		
+		private string _ConstructSolutionId;
+		
+		private string _Chapter;
+		
+		private string _Amendment;
+		
+		private string _Proposer;
+		
+		private string _ProposerName;
+		
+		private string _Modification;
+		
+		private string _ReviewerOpinion;
+		
+		private string _IsAccept;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnTypeSortIdChanging(System.Nullable<int> value);
+    partial void OnTypeSortIdChanged();
+    partial void OnSortIdChanging(System.Nullable<int> value);
+    partial void OnSortIdChanged();
+    partial void OnConstructSolutionIdChanging(string value);
+    partial void OnConstructSolutionIdChanged();
+    partial void OnChapterChanging(string value);
+    partial void OnChapterChanged();
+    partial void OnAmendmentChanging(string value);
+    partial void OnAmendmentChanged();
+    partial void OnProposerChanging(string value);
+    partial void OnProposerChanged();
+    partial void OnProposerNameChanging(string value);
+    partial void OnProposerNameChanged();
+    partial void OnModificationChanging(string value);
+    partial void OnModificationChanged();
+    partial void OnReviewerOpinionChanging(string value);
+    partial void OnReviewerOpinionChanged();
+    partial void OnIsAcceptChanging(string value);
+    partial void OnIsAcceptChanged();
+    #endregion
+		
+		public Solution_CQMSConstructSolutionApprove_Item()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeSortId", DbType="Int")]
+		public System.Nullable<int> TypeSortId
+		{
+			get
+			{
+				return this._TypeSortId;
+			}
+			set
+			{
+				if ((this._TypeSortId != value))
+				{
+					this.OnTypeSortIdChanging(value);
+					this.SendPropertyChanging();
+					this._TypeSortId = value;
+					this.SendPropertyChanged("TypeSortId");
+					this.OnTypeSortIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortId", DbType="Int")]
+		public System.Nullable<int> SortId
+		{
+			get
+			{
+				return this._SortId;
+			}
+			set
+			{
+				if ((this._SortId != value))
+				{
+					this.OnSortIdChanging(value);
+					this.SendPropertyChanging();
+					this._SortId = value;
+					this.SendPropertyChanged("SortId");
+					this.OnSortIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructSolutionId", DbType="NVarChar(50)")]
+		public string ConstructSolutionId
+		{
+			get
+			{
+				return this._ConstructSolutionId;
+			}
+			set
+			{
+				if ((this._ConstructSolutionId != value))
+				{
+					this.OnConstructSolutionIdChanging(value);
+					this.SendPropertyChanging();
+					this._ConstructSolutionId = value;
+					this.SendPropertyChanged("ConstructSolutionId");
+					this.OnConstructSolutionIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Chapter", DbType="NVarChar(200)")]
+		public string Chapter
+		{
+			get
+			{
+				return this._Chapter;
+			}
+			set
+			{
+				if ((this._Chapter != value))
+				{
+					this.OnChapterChanging(value);
+					this.SendPropertyChanging();
+					this._Chapter = value;
+					this.SendPropertyChanged("Chapter");
+					this.OnChapterChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Amendment", DbType="NVarChar(200)")]
+		public string Amendment
+		{
+			get
+			{
+				return this._Amendment;
+			}
+			set
+			{
+				if ((this._Amendment != value))
+				{
+					this.OnAmendmentChanging(value);
+					this.SendPropertyChanging();
+					this._Amendment = value;
+					this.SendPropertyChanged("Amendment");
+					this.OnAmendmentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Proposer", DbType="NVarChar(50)")]
+		public string Proposer
+		{
+			get
+			{
+				return this._Proposer;
+			}
+			set
+			{
+				if ((this._Proposer != value))
+				{
+					this.OnProposerChanging(value);
+					this.SendPropertyChanging();
+					this._Proposer = value;
+					this.SendPropertyChanged("Proposer");
+					this.OnProposerChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposerName", DbType="NVarChar(50)")]
+		public string ProposerName
+		{
+			get
+			{
+				return this._ProposerName;
+			}
+			set
+			{
+				if ((this._ProposerName != value))
+				{
+					this.OnProposerNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProposerName = value;
+					this.SendPropertyChanged("ProposerName");
+					this.OnProposerNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Modification", DbType="NVarChar(200)")]
+		public string Modification
+		{
+			get
+			{
+				return this._Modification;
+			}
+			set
+			{
+				if ((this._Modification != value))
+				{
+					this.OnModificationChanging(value);
+					this.SendPropertyChanging();
+					this._Modification = value;
+					this.SendPropertyChanged("Modification");
+					this.OnModificationChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewerOpinion", DbType="NVarChar(200)")]
+		public string ReviewerOpinion
+		{
+			get
+			{
+				return this._ReviewerOpinion;
+			}
+			set
+			{
+				if ((this._ReviewerOpinion != value))
+				{
+					this.OnReviewerOpinionChanging(value);
+					this.SendPropertyChanging();
+					this._ReviewerOpinion = value;
+					this.SendPropertyChanged("ReviewerOpinion");
+					this.OnReviewerOpinionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsAccept", DbType="NVarChar(50)")]
+		public string IsAccept
+		{
+			get
+			{
+				return this._IsAccept;
+			}
+			set
+			{
+				if ((this._IsAccept != value))
+				{
+					this.OnIsAcceptChanging(value);
+					this.SendPropertyChanging();
+					this._IsAccept = value;
+					this.SendPropertyChanged("IsAccept");
+					this.OnIsAcceptChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Solution_ExpertArgument")]
 	public partial class Solution_ExpertArgument : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -356772,6 +358892,8 @@ namespace Model
 		
 		private string _HomePageType;
 		
+		private string _CompanyProjectId;
+		
 		private EntitySet<Comprehensive_NCRManagement> _Comprehensive_NCRManagement;
 		
 		private EntitySet<Comprehensive_PressurePipe> _Comprehensive_PressurePipe;
@@ -357584,6 +359706,8 @@ namespace Model
     partial void OnRawPasswordChanged();
     partial void OnHomePageTypeChanging(string value);
     partial void OnHomePageTypeChanged();
+    partial void OnCompanyProjectIdChanging(string value);
+    partial void OnCompanyProjectIdChanged();
     #endregion
 		
 		public Sys_User()
@@ -358980,6 +361104,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompanyProjectId", DbType="NVarChar(2000)")]
+		public string CompanyProjectId
+		{
+			get
+			{
+				return this._CompanyProjectId;
+			}
+			set
+			{
+				if ((this._CompanyProjectId != value))
+				{
+					this.OnCompanyProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._CompanyProjectId = value;
+					this.SendPropertyChanged("CompanyProjectId");
+					this.OnCompanyProjectIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Comprehensive_NCRManagement", ThisKey="UserId", OtherKey="CompileMan", DeleteRule="NO ACTION")]
 		public EntitySet<Comprehensive_NCRManagement> Comprehensive_NCRManagement
 		{
@@ -372086,6 +374230,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsBuiltIn;
 		
+		private EntitySet<Check_CheckSpecial> _Check_CheckSpecial;
+		
 		private EntitySet<Technique_CheckItemDetail> _Technique_CheckItemDetail;
 		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
@@ -372112,6 +374258,7 @@ namespace Model
 		
 		public Technique_CheckItemSet()
 		{
+			this._Check_CheckSpecial = new EntitySet<Check_CheckSpecial>(new Action<Check_CheckSpecial>(this.attach_Check_CheckSpecial), new Action<Check_CheckSpecial>(this.detach_Check_CheckSpecial));
 			this._Technique_CheckItemDetail = new EntitySet<Technique_CheckItemDetail>(new Action<Technique_CheckItemDetail>(this.attach_Technique_CheckItemDetail), new Action<Technique_CheckItemDetail>(this.detach_Technique_CheckItemDetail));
 			OnCreated();
 		}
@@ -372276,6 +374423,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Technique_CheckItemSet", Storage="_Check_CheckSpecial", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
+		public EntitySet<Check_CheckSpecial> Check_CheckSpecial
+		{
+			get
+			{
+				return this._Check_CheckSpecial;
+			}
+			set
+			{
+				this._Check_CheckSpecial.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Technique_CheckItemDetail_Technique_CheckItemSet", Storage="_Technique_CheckItemDetail", ThisKey="CheckItemSetId", OtherKey="CheckItemSetId", DeleteRule="NO ACTION")]
 		public EntitySet<Technique_CheckItemDetail> Technique_CheckItemDetail
 		{
@@ -372309,6 +374469,18 @@ namespace Model
 			}
 		}
 		
+		private void attach_Check_CheckSpecial(Check_CheckSpecial entity)
+		{
+			this.SendPropertyChanging();
+			entity.Technique_CheckItemSet = this;
+		}
+		
+		private void detach_Check_CheckSpecial(Check_CheckSpecial entity)
+		{
+			this.SendPropertyChanging();
+			entity.Technique_CheckItemSet = null;
+		}
+		
 		private void attach_Technique_CheckItemDetail(Technique_CheckItemDetail entity)
 		{
 			this.SendPropertyChanging();
@@ -394738,6 +396910,22 @@ namespace Model
 		
 		private string _Descriptions;
 		
+		private System.Nullable<decimal> _TotalFactor;
+		
+		private System.Nullable<decimal> _CompleteFactor;
+		
+		private System.Nullable<decimal> _CompleteProportion;
+		
+		private string _PressureTestCompleted;
+		
+		private string _RinseAndBlowClean;
+		
+		private string _Reduction;
+		
+		private string _ElectricHeatTracing;
+		
+		private string _Insulation;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -394788,6 +396976,22 @@ namespace Model
     partial void OnBlowingReportChanged();
     partial void OnDescriptionsChanging(string value);
     partial void OnDescriptionsChanged();
+    partial void OnTotalFactorChanging(System.Nullable<decimal> value);
+    partial void OnTotalFactorChanged();
+    partial void OnCompleteFactorChanging(System.Nullable<decimal> value);
+    partial void OnCompleteFactorChanged();
+    partial void OnCompleteProportionChanging(System.Nullable<decimal> value);
+    partial void OnCompleteProportionChanged();
+    partial void OnPressureTestCompletedChanging(string value);
+    partial void OnPressureTestCompletedChanged();
+    partial void OnRinseAndBlowCleanChanging(string value);
+    partial void OnRinseAndBlowCleanChanged();
+    partial void OnReductionChanging(string value);
+    partial void OnReductionChanged();
+    partial void OnElectricHeatTracingChanging(string value);
+    partial void OnElectricHeatTracingChanged();
+    partial void OnInsulationChanging(string value);
+    partial void OnInsulationChanged();
     #endregion
 		
 		public Transfer_Piping()
@@ -395255,6 +397459,166 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalFactor", DbType="Decimal(10,2)")]
+		public System.Nullable<decimal> TotalFactor
+		{
+			get
+			{
+				return this._TotalFactor;
+			}
+			set
+			{
+				if ((this._TotalFactor != value))
+				{
+					this.OnTotalFactorChanging(value);
+					this.SendPropertyChanging();
+					this._TotalFactor = value;
+					this.SendPropertyChanged("TotalFactor");
+					this.OnTotalFactorChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteFactor", DbType="Decimal(10,2)")]
+		public System.Nullable<decimal> CompleteFactor
+		{
+			get
+			{
+				return this._CompleteFactor;
+			}
+			set
+			{
+				if ((this._CompleteFactor != value))
+				{
+					this.OnCompleteFactorChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteFactor = value;
+					this.SendPropertyChanged("CompleteFactor");
+					this.OnCompleteFactorChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteProportion", DbType="Decimal(10,2)")]
+		public System.Nullable<decimal> CompleteProportion
+		{
+			get
+			{
+				return this._CompleteProportion;
+			}
+			set
+			{
+				if ((this._CompleteProportion != value))
+				{
+					this.OnCompleteProportionChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteProportion = value;
+					this.SendPropertyChanged("CompleteProportion");
+					this.OnCompleteProportionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PressureTestCompleted", DbType="NVarChar(50)")]
+		public string PressureTestCompleted
+		{
+			get
+			{
+				return this._PressureTestCompleted;
+			}
+			set
+			{
+				if ((this._PressureTestCompleted != value))
+				{
+					this.OnPressureTestCompletedChanging(value);
+					this.SendPropertyChanging();
+					this._PressureTestCompleted = value;
+					this.SendPropertyChanged("PressureTestCompleted");
+					this.OnPressureTestCompletedChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RinseAndBlowClean", DbType="NVarChar(50)")]
+		public string RinseAndBlowClean
+		{
+			get
+			{
+				return this._RinseAndBlowClean;
+			}
+			set
+			{
+				if ((this._RinseAndBlowClean != value))
+				{
+					this.OnRinseAndBlowCleanChanging(value);
+					this.SendPropertyChanging();
+					this._RinseAndBlowClean = value;
+					this.SendPropertyChanged("RinseAndBlowClean");
+					this.OnRinseAndBlowCleanChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Reduction", DbType="NVarChar(50)")]
+		public string Reduction
+		{
+			get
+			{
+				return this._Reduction;
+			}
+			set
+			{
+				if ((this._Reduction != value))
+				{
+					this.OnReductionChanging(value);
+					this.SendPropertyChanging();
+					this._Reduction = value;
+					this.SendPropertyChanged("Reduction");
+					this.OnReductionChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ElectricHeatTracing", DbType="NVarChar(50)")]
+		public string ElectricHeatTracing
+		{
+			get
+			{
+				return this._ElectricHeatTracing;
+			}
+			set
+			{
+				if ((this._ElectricHeatTracing != value))
+				{
+					this.OnElectricHeatTracingChanging(value);
+					this.SendPropertyChanging();
+					this._ElectricHeatTracing = value;
+					this.SendPropertyChanged("ElectricHeatTracing");
+					this.OnElectricHeatTracingChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Insulation", DbType="NVarChar(50)")]
+		public string Insulation
+		{
+			get
+			{
+				return this._Insulation;
+			}
+			set
+			{
+				if ((this._Insulation != value))
+				{
+					this.OnInsulationChanging(value);
+					this.SendPropertyChanging();
+					this._Insulation = value;
+					this.SendPropertyChanged("Insulation");
+					this.OnInsulationChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -396086,8 +398450,12 @@ namespace Model
 		
 		private string _Comments;
 		
+		private string _Num_NO;
+		
 		private string _System_No;
 		
+		private string _Sub_Sys_No;
+		
 		private string _Cat;
 		
 		private string _Raised_By;
@@ -396108,6 +398476,8 @@ namespace Model
 		
 		private string _PIC_WUH;
 		
+		private string _Correction_Action;
+		
 		private System.Nullable<System.DateTime> _Actual_Date;
 		
 		private string _Cleared_By;
@@ -396126,12 +398496,6 @@ namespace Model
 		
 		private string _Remark;
 		
-		private string _Sub_Sys_No;
-		
-		private string _Num_NO;
-		
-		private string _Correction_Action;
-		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -396168,8 +398532,12 @@ namespace Model
     partial void OnPUNCH_ITEM_STATUSChanged();
     partial void OnCommentsChanging(string value);
     partial void OnCommentsChanged();
+    partial void OnNum_NOChanging(string value);
+    partial void OnNum_NOChanged();
     partial void OnSystem_NoChanging(string value);
     partial void OnSystem_NoChanged();
+    partial void OnSub_Sys_NoChanging(string value);
+    partial void OnSub_Sys_NoChanged();
     partial void OnCatChanging(string value);
     partial void OnCatChanged();
     partial void OnRaised_ByChanging(string value);
@@ -396190,6 +398558,8 @@ namespace Model
     partial void OnPICChanged();
     partial void OnPIC_WUHChanging(string value);
     partial void OnPIC_WUHChanged();
+    partial void OnCorrection_ActionChanging(string value);
+    partial void OnCorrection_ActionChanged();
     partial void OnActual_DateChanging(System.Nullable<System.DateTime> value);
     partial void OnActual_DateChanged();
     partial void OnCleared_ByChanging(string value);
@@ -396208,12 +398578,6 @@ namespace Model
     partial void OnStatusChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
-    partial void OnSub_Sys_NoChanging(string value);
-    partial void OnSub_Sys_NoChanged();
-    partial void OnNum_NOChanging(string value);
-    partial void OnNum_NOChanged();
-    partial void OnCorrection_ActionChanging(string value);
-    partial void OnCorrection_ActionChanged();
     #endregion
 		
 		public Transfer_PunchlistFrom()
@@ -396541,6 +398905,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")]
+		public string Num_NO
+		{
+			get
+			{
+				return this._Num_NO;
+			}
+			set
+			{
+				if ((this._Num_NO != value))
+				{
+					this.OnNum_NOChanging(value);
+					this.SendPropertyChanging();
+					this._Num_NO = value;
+					this.SendPropertyChanged("Num_NO");
+					this.OnNum_NOChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_System_No", DbType="NVarChar(50)")]
 		public string System_No
 		{
@@ -396561,6 +398945,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
+		public string Sub_Sys_No
+		{
+			get
+			{
+				return this._Sub_Sys_No;
+			}
+			set
+			{
+				if ((this._Sub_Sys_No != value))
+				{
+					this.OnSub_Sys_NoChanging(value);
+					this.SendPropertyChanging();
+					this._Sub_Sys_No = value;
+					this.SendPropertyChanged("Sub_Sys_No");
+					this.OnSub_Sys_NoChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cat", DbType="NVarChar(50)")]
 		public string Cat
 		{
@@ -396761,6 +399165,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
+		public string Correction_Action
+		{
+			get
+			{
+				return this._Correction_Action;
+			}
+			set
+			{
+				if ((this._Correction_Action != value))
+				{
+					this.OnCorrection_ActionChanging(value);
+					this.SendPropertyChanging();
+					this._Correction_Action = value;
+					this.SendPropertyChanged("Correction_Action");
+					this.OnCorrection_ActionChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Actual_Date", DbType="DateTime")]
 		public System.Nullable<System.DateTime> Actual_Date
 		{
@@ -396941,66 +399365,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sub_Sys_No", DbType="NVarChar(50)")]
-		public string Sub_Sys_No
-		{
-			get
-			{
-				return this._Sub_Sys_No;
-			}
-			set
-			{
-				if ((this._Sub_Sys_No != value))
-				{
-					this.OnSub_Sys_NoChanging(value);
-					this.SendPropertyChanging();
-					this._Sub_Sys_No = value;
-					this.SendPropertyChanged("Sub_Sys_No");
-					this.OnSub_Sys_NoChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Num_NO", DbType="NVarChar(50)")]
-		public string Num_NO
-		{
-			get
-			{
-				return this._Num_NO;
-			}
-			set
-			{
-				if ((this._Num_NO != value))
-				{
-					this.OnNum_NOChanging(value);
-					this.SendPropertyChanging();
-					this._Num_NO = value;
-					this.SendPropertyChanged("Num_NO");
-					this.OnNum_NOChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Correction_Action", DbType="NVarChar(500)")]
-		public string Correction_Action
-		{
-			get
-			{
-				return this._Correction_Action;
-			}
-			set
-			{
-				if ((this._Correction_Action != value))
-				{
-					this.OnCorrection_ActionChanging(value);
-					this.SendPropertyChanging();
-					this._Correction_Action = value;
-					this.SendPropertyChanged("Correction_Action");
-					this.OnCorrection_ActionChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -397832,6 +400196,10 @@ namespace Model
 		
 		private string _Remark;
 		
+		private string _ElectricHeatTracing;
+		
+		private string _Insulation;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -397868,6 +400236,10 @@ namespace Model
     partial void OnTurnoverDescriptionChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
+    partial void OnElectricHeatTracingChanging(string value);
+    partial void OnElectricHeatTracingChanged();
+    partial void OnInsulationChanging(string value);
+    partial void OnInsulationChanged();
     #endregion
 		
 		public Transfer_SystemControl()
@@ -398195,6 +400567,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ElectricHeatTracing", DbType="NVarChar(50)")]
+		public string ElectricHeatTracing
+		{
+			get
+			{
+				return this._ElectricHeatTracing;
+			}
+			set
+			{
+				if ((this._ElectricHeatTracing != value))
+				{
+					this.OnElectricHeatTracingChanging(value);
+					this.SendPropertyChanging();
+					this._ElectricHeatTracing = value;
+					this.SendPropertyChanged("ElectricHeatTracing");
+					this.OnElectricHeatTracingChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Insulation", DbType="NVarChar(50)")]
+		public string Insulation
+		{
+			get
+			{
+				return this._Insulation;
+			}
+			set
+			{
+				if ((this._Insulation != value))
+				{
+					this.OnInsulationChanging(value);
+					this.SendPropertyChanging();
+					this._Insulation = value;
+					this.SendPropertyChanged("Insulation");
+					this.OnInsulationChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -421225,6 +423637,213 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Information_ActionWorkLedger")]
+	public partial class View_Information_ActionWorkLedger
+	{
+		
+		private string _ActionWorkLedgerId;
+		
+		private string _UnitId;
+		
+		private System.Nullable<System.DateTime> _ReportDate;
+		
+		private System.Nullable<int> _YearId;
+		
+		private System.Nullable<int> _Quarter;
+		
+		private string _UpState;
+		
+		private string _HandleState;
+		
+		private string _Quarters;
+		
+		private string _UnitName;
+		
+		private string _HandleMan;
+		
+		private string _UserName;
+		
+		public View_Information_ActionWorkLedger()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActionWorkLedgerId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string ActionWorkLedgerId
+		{
+			get
+			{
+				return this._ActionWorkLedgerId;
+			}
+			set
+			{
+				if ((this._ActionWorkLedgerId != value))
+				{
+					this._ActionWorkLedgerId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this._UnitId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ReportDate
+		{
+			get
+			{
+				return this._ReportDate;
+			}
+			set
+			{
+				if ((this._ReportDate != value))
+				{
+					this._ReportDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YearId", DbType="Int")]
+		public System.Nullable<int> YearId
+		{
+			get
+			{
+				return this._YearId;
+			}
+			set
+			{
+				if ((this._YearId != value))
+				{
+					this._YearId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarter", DbType="Int")]
+		public System.Nullable<int> Quarter
+		{
+			get
+			{
+				return this._Quarter;
+			}
+			set
+			{
+				if ((this._Quarter != value))
+				{
+					this._Quarter = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this._UpState = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleState", DbType="Char(1)")]
+		public string HandleState
+		{
+			get
+			{
+				return this._HandleState;
+			}
+			set
+			{
+				if ((this._HandleState != value))
+				{
+					this._HandleState = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarters", DbType="NVarChar(200) NOT NULL", CanBeNull=false)]
+		public string Quarters
+		{
+			get
+			{
+				return this._Quarters;
+			}
+			set
+			{
+				if ((this._Quarters != value))
+				{
+					this._Quarters = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")]
+		public string UnitName
+		{
+			get
+			{
+				return this._UnitName;
+			}
+			set
+			{
+				if ((this._UnitName != value))
+				{
+					this._UnitName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleMan", DbType="NVarChar(50)")]
+		public string HandleMan
+		{
+			get
+			{
+				return this._HandleMan;
+			}
+			set
+			{
+				if ((this._HandleMan != value))
+				{
+					this._HandleMan = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(50)")]
+		public string UserName
+		{
+			get
+			{
+				return this._UserName;
+			}
+			set
+			{
+				if ((this._UserName != value))
+				{
+					this._UserName = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Information_DrillConductedQuarterlyReport")]
 	public partial class View_Information_DrillConductedQuarterlyReport
 	{
@@ -422890,6 +425509,213 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Information_SafetyProductionEvaluation")]
+	public partial class View_Information_SafetyProductionEvaluation
+	{
+		
+		private string _SafetyProductionEvaluationId;
+		
+		private string _UnitId;
+		
+		private System.Nullable<System.DateTime> _ReportDate;
+		
+		private System.Nullable<int> _YearId;
+		
+		private System.Nullable<int> _Quarter;
+		
+		private string _UpState;
+		
+		private string _HandleState;
+		
+		private string _Quarters;
+		
+		private string _UnitName;
+		
+		private string _HandleMan;
+		
+		private string _UserName;
+		
+		public View_Information_SafetyProductionEvaluation()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionEvaluationId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string SafetyProductionEvaluationId
+		{
+			get
+			{
+				return this._SafetyProductionEvaluationId;
+			}
+			set
+			{
+				if ((this._SafetyProductionEvaluationId != value))
+				{
+					this._SafetyProductionEvaluationId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this._UnitId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ReportDate
+		{
+			get
+			{
+				return this._ReportDate;
+			}
+			set
+			{
+				if ((this._ReportDate != value))
+				{
+					this._ReportDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_YearId", DbType="Int")]
+		public System.Nullable<int> YearId
+		{
+			get
+			{
+				return this._YearId;
+			}
+			set
+			{
+				if ((this._YearId != value))
+				{
+					this._YearId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarter", DbType="Int")]
+		public System.Nullable<int> Quarter
+		{
+			get
+			{
+				return this._Quarter;
+			}
+			set
+			{
+				if ((this._Quarter != value))
+				{
+					this._Quarter = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UpState", DbType="Char(1)")]
+		public string UpState
+		{
+			get
+			{
+				return this._UpState;
+			}
+			set
+			{
+				if ((this._UpState != value))
+				{
+					this._UpState = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleState", DbType="Char(1)")]
+		public string HandleState
+		{
+			get
+			{
+				return this._HandleState;
+			}
+			set
+			{
+				if ((this._HandleState != value))
+				{
+					this._HandleState = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quarters", DbType="NVarChar(200) NOT NULL", CanBeNull=false)]
+		public string Quarters
+		{
+			get
+			{
+				return this._Quarters;
+			}
+			set
+			{
+				if ((this._Quarters != value))
+				{
+					this._Quarters = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitName", DbType="NVarChar(200)")]
+		public string UnitName
+		{
+			get
+			{
+				return this._UnitName;
+			}
+			set
+			{
+				if ((this._UnitName != value))
+				{
+					this._UnitName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleMan", DbType="NVarChar(50)")]
+		public string HandleMan
+		{
+			get
+			{
+				return this._HandleMan;
+			}
+			set
+			{
+				if ((this._HandleMan != value))
+				{
+					this._HandleMan = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(50)")]
+		public string UserName
+		{
+			get
+			{
+				return this._UserName;
+			}
+			set
+			{
+				if ((this._UserName != value))
+				{
+					this._UserName = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Information_SafetyQuarterlyReport")]
 	public partial class View_Information_SafetyQuarterlyReport
 	{
@@ -444409,6 +447235,339 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_WBS_DivisionDivide")]
+	public partial class View_WBS_DivisionDivide
+	{
+		
+		private string _DivisionDivideId;
+		
+		private string _ProjectId;
+		
+		private string _UnitWorkId;
+		
+		private string _DivisionId;
+		
+		private string _SupUnitWorkCode;
+		
+		private string _SupUnitWorkName;
+		
+		private string _ChildUnitWorkCode;
+		
+		private string _ChildUnitWorkName;
+		
+		private string _SuperUnitWork;
+		
+		private string _BranchEngineeringCode;
+		
+		private string _BranchEngineeringName;
+		
+		private string _SubBranchEngineeringName;
+		
+		private string _ProEngineeringCode;
+		
+		private string _ProEngineeringName;
+		
+		private string _ProEngineeringNum;
+		
+		private System.Nullable<int> _DivisionLevel;
+		
+		private System.Nullable<int> _Sort;
+		
+		private string _ParentId;
+		
+		public View_WBS_DivisionDivide()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DivisionDivideId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string DivisionDivideId
+		{
+			get
+			{
+				return this._DivisionDivideId;
+			}
+			set
+			{
+				if ((this._DivisionDivideId != value))
+				{
+					this._DivisionDivideId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this._ProjectId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")]
+		public string UnitWorkId
+		{
+			get
+			{
+				return this._UnitWorkId;
+			}
+			set
+			{
+				if ((this._UnitWorkId != value))
+				{
+					this._UnitWorkId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DivisionId", DbType="VarChar(50)")]
+		public string DivisionId
+		{
+			get
+			{
+				return this._DivisionId;
+			}
+			set
+			{
+				if ((this._DivisionId != value))
+				{
+					this._DivisionId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupUnitWorkCode", DbType="NVarChar(500)")]
+		public string SupUnitWorkCode
+		{
+			get
+			{
+				return this._SupUnitWorkCode;
+			}
+			set
+			{
+				if ((this._SupUnitWorkCode != value))
+				{
+					this._SupUnitWorkCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SupUnitWorkName", DbType="NVarChar(500)")]
+		public string SupUnitWorkName
+		{
+			get
+			{
+				return this._SupUnitWorkName;
+			}
+			set
+			{
+				if ((this._SupUnitWorkName != value))
+				{
+					this._SupUnitWorkName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChildUnitWorkCode", DbType="NVarChar(500)")]
+		public string ChildUnitWorkCode
+		{
+			get
+			{
+				return this._ChildUnitWorkCode;
+			}
+			set
+			{
+				if ((this._ChildUnitWorkCode != value))
+				{
+					this._ChildUnitWorkCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ChildUnitWorkName", DbType="NVarChar(500)")]
+		public string ChildUnitWorkName
+		{
+			get
+			{
+				return this._ChildUnitWorkName;
+			}
+			set
+			{
+				if ((this._ChildUnitWorkName != value))
+				{
+					this._ChildUnitWorkName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SuperUnitWork", DbType="NVarChar(50)")]
+		public string SuperUnitWork
+		{
+			get
+			{
+				return this._SuperUnitWork;
+			}
+			set
+			{
+				if ((this._SuperUnitWork != value))
+				{
+					this._SuperUnitWork = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BranchEngineeringCode", DbType="VarChar(50)")]
+		public string BranchEngineeringCode
+		{
+			get
+			{
+				return this._BranchEngineeringCode;
+			}
+			set
+			{
+				if ((this._BranchEngineeringCode != value))
+				{
+					this._BranchEngineeringCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BranchEngineeringName", DbType="VarChar(1000)")]
+		public string BranchEngineeringName
+		{
+			get
+			{
+				return this._BranchEngineeringName;
+			}
+			set
+			{
+				if ((this._BranchEngineeringName != value))
+				{
+					this._BranchEngineeringName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubBranchEngineeringName", DbType="VarChar(1000)")]
+		public string SubBranchEngineeringName
+		{
+			get
+			{
+				return this._SubBranchEngineeringName;
+			}
+			set
+			{
+				if ((this._SubBranchEngineeringName != value))
+				{
+					this._SubBranchEngineeringName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProEngineeringCode", DbType="VarChar(50)")]
+		public string ProEngineeringCode
+		{
+			get
+			{
+				return this._ProEngineeringCode;
+			}
+			set
+			{
+				if ((this._ProEngineeringCode != value))
+				{
+					this._ProEngineeringCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProEngineeringName", DbType="VarChar(1000)")]
+		public string ProEngineeringName
+		{
+			get
+			{
+				return this._ProEngineeringName;
+			}
+			set
+			{
+				if ((this._ProEngineeringName != value))
+				{
+					this._ProEngineeringName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProEngineeringNum", DbType="VarChar(50)")]
+		public string ProEngineeringNum
+		{
+			get
+			{
+				return this._ProEngineeringNum;
+			}
+			set
+			{
+				if ((this._ProEngineeringNum != value))
+				{
+					this._ProEngineeringNum = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DivisionLevel", DbType="Int")]
+		public System.Nullable<int> DivisionLevel
+		{
+			get
+			{
+				return this._DivisionLevel;
+			}
+			set
+			{
+				if ((this._DivisionLevel != value))
+				{
+					this._DivisionLevel = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")]
+		public System.Nullable<int> Sort
+		{
+			get
+			{
+				return this._Sort;
+			}
+			set
+			{
+				if ((this._Sort != value))
+				{
+					this._Sort = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ParentId", DbType="VarChar(50)")]
+		public string ParentId
+		{
+			get
+			{
+				return this._ParentId;
+			}
+			set
+			{
+				if ((this._ParentId != value))
+				{
+					this._ParentId = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_WBSReport")]
 	public partial class View_WBSReport
 	{
@@ -450282,6 +453441,263 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.WBS_DivisionDivide")]
+	public partial class WBS_DivisionDivide : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _DivisionDivideId;
+		
+		private string _ProjectId;
+		
+		private string _UnitWorkId;
+		
+		private string _DivisionId;
+		
+		private EntityRef<Base_Project> _Base_Project;
+		
+		private EntityRef<Division_SubProjects> _Division_SubProjects;
+		
+		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
+		
+    #region 鍙墿灞曟�ф柟娉曞畾涔�
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnDivisionDivideIdChanging(string value);
+    partial void OnDivisionDivideIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnUnitWorkIdChanging(string value);
+    partial void OnUnitWorkIdChanged();
+    partial void OnDivisionIdChanging(string value);
+    partial void OnDivisionIdChanged();
+    #endregion
+		
+		public WBS_DivisionDivide()
+		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Division_SubProjects = default(EntityRef<Division_SubProjects>);
+			this._WBS_UnitWork = default(EntityRef<WBS_UnitWork>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DivisionDivideId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string DivisionDivideId
+		{
+			get
+			{
+				return this._DivisionDivideId;
+			}
+			set
+			{
+				if ((this._DivisionDivideId != value))
+				{
+					this.OnDivisionDivideIdChanging(value);
+					this.SendPropertyChanging();
+					this._DivisionDivideId = value;
+					this.SendPropertyChanged("DivisionDivideId");
+					this.OnDivisionDivideIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					if (this._Base_Project.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(50)")]
+		public string UnitWorkId
+		{
+			get
+			{
+				return this._UnitWorkId;
+			}
+			set
+			{
+				if ((this._UnitWorkId != value))
+				{
+					if (this._WBS_UnitWork.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnUnitWorkIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitWorkId = value;
+					this.SendPropertyChanged("UnitWorkId");
+					this.OnUnitWorkIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DivisionId", DbType="VarChar(50)")]
+		public string DivisionId
+		{
+			get
+			{
+				return this._DivisionId;
+			}
+			set
+			{
+				if ((this._DivisionId != value))
+				{
+					if (this._Division_SubProjects.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnDivisionIdChanging(value);
+					this.SendPropertyChanging();
+					this._DivisionId = value;
+					this.SendPropertyChanged("DivisionId");
+					this.OnDivisionIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_DivisionDivide_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+		public Base_Project Base_Project
+		{
+			get
+			{
+				return this._Base_Project.Entity;
+			}
+			set
+			{
+				Base_Project previousValue = this._Base_Project.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Project.Entity = null;
+						previousValue.WBS_DivisionDivide.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.WBS_DivisionDivide.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_DivisionDivide_Division_SubProjects", Storage="_Division_SubProjects", ThisKey="DivisionId", OtherKey="DivisionId", IsForeignKey=true)]
+		public Division_SubProjects Division_SubProjects
+		{
+			get
+			{
+				return this._Division_SubProjects.Entity;
+			}
+			set
+			{
+				Division_SubProjects previousValue = this._Division_SubProjects.Entity;
+				if (((previousValue != value) 
+							|| (this._Division_SubProjects.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Division_SubProjects.Entity = null;
+						previousValue.WBS_DivisionDivide.Remove(this);
+					}
+					this._Division_SubProjects.Entity = value;
+					if ((value != null))
+					{
+						value.WBS_DivisionDivide.Add(this);
+						this._DivisionId = value.DivisionId;
+					}
+					else
+					{
+						this._DivisionId = default(string);
+					}
+					this.SendPropertyChanged("Division_SubProjects");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_DivisionDivide_WBS_UnitWork", Storage="_WBS_UnitWork", ThisKey="UnitWorkId", OtherKey="UnitWorkId", IsForeignKey=true)]
+		public WBS_UnitWork WBS_UnitWork
+		{
+			get
+			{
+				return this._WBS_UnitWork.Entity;
+			}
+			set
+			{
+				WBS_UnitWork previousValue = this._WBS_UnitWork.Entity;
+				if (((previousValue != value) 
+							|| (this._WBS_UnitWork.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._WBS_UnitWork.Entity = null;
+						previousValue.WBS_DivisionDivide.Remove(this);
+					}
+					this._WBS_UnitWork.Entity = value;
+					if ((value != null))
+					{
+						value.WBS_DivisionDivide.Add(this);
+						this._UnitWorkId = value.UnitWorkId;
+					}
+					else
+					{
+						this._UnitWorkId = default(string);
+					}
+					this.SendPropertyChanged("WBS_UnitWork");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.WBS_DivisionProject")]
 	public partial class WBS_DivisionProject : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -453617,6 +457033,8 @@ namespace Model
 		
 		private EntitySet<Solution_LargerHazardListItem> _Solution_LargerHazardListItem;
 		
+		private EntitySet<WBS_DivisionDivide> _WBS_DivisionDivide;
+		
 		private EntitySet<WBS_ForeignBreakdownProject> _WBS_ForeignBreakdownProject;
 		
 		private EntityRef<Base_Unit> _Base_Unit;
@@ -453702,6 +457120,7 @@ namespace Model
 			this._ProduceTestRun_TestRunReport = new EntitySet<ProduceTestRun_TestRunReport>(new Action<ProduceTestRun_TestRunReport>(this.attach_ProduceTestRun_TestRunReport), new Action<ProduceTestRun_TestRunReport>(this.detach_ProduceTestRun_TestRunReport));
 			this._PTP_TestPackage = new EntitySet<PTP_TestPackage>(new Action<PTP_TestPackage>(this.attach_PTP_TestPackage), new Action<PTP_TestPackage>(this.detach_PTP_TestPackage));
 			this._Solution_LargerHazardListItem = new EntitySet<Solution_LargerHazardListItem>(new Action<Solution_LargerHazardListItem>(this.attach_Solution_LargerHazardListItem), new Action<Solution_LargerHazardListItem>(this.detach_Solution_LargerHazardListItem));
+			this._WBS_DivisionDivide = new EntitySet<WBS_DivisionDivide>(new Action<WBS_DivisionDivide>(this.attach_WBS_DivisionDivide), new Action<WBS_DivisionDivide>(this.detach_WBS_DivisionDivide));
 			this._WBS_ForeignBreakdownProject = new EntitySet<WBS_ForeignBreakdownProject>(new Action<WBS_ForeignBreakdownProject>(this.attach_WBS_ForeignBreakdownProject), new Action<WBS_ForeignBreakdownProject>(this.detach_WBS_ForeignBreakdownProject));
 			this._Base_Unit = default(EntityRef<Base_Unit>);
 			this._SupervisorUnit = default(EntityRef<Base_Unit>);
@@ -454515,6 +457934,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_DivisionDivide_WBS_UnitWork", Storage="_WBS_DivisionDivide", ThisKey="UnitWorkId", OtherKey="UnitWorkId", DeleteRule="NO ACTION")]
+		public EntitySet<WBS_DivisionDivide> WBS_DivisionDivide
+		{
+			get
+			{
+				return this._WBS_DivisionDivide;
+			}
+			set
+			{
+				this._WBS_DivisionDivide.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_WBS_ForeignBreakdownProject_WBS_UnitWork", Storage="_WBS_ForeignBreakdownProject", ThisKey="UnitWorkId", OtherKey="UnitWorkId", DeleteRule="NO ACTION")]
 		public EntitySet<WBS_ForeignBreakdownProject> WBS_ForeignBreakdownProject
 		{
@@ -455155,6 +458587,18 @@ namespace Model
 			entity.WBS_UnitWork = null;
 		}
 		
+		private void attach_WBS_DivisionDivide(WBS_DivisionDivide entity)
+		{
+			this.SendPropertyChanging();
+			entity.WBS_UnitWork = this;
+		}
+		
+		private void detach_WBS_DivisionDivide(WBS_DivisionDivide entity)
+		{
+			this.SendPropertyChanging();
+			entity.WBS_UnitWork = null;
+		}
+		
 		private void attach_WBS_ForeignBreakdownProject(WBS_ForeignBreakdownProject entity)
 		{
 			this.SendPropertyChanging();
diff --git a/SGGL/Model/Model.csproj b/SGGL/Model/Model.csproj
index d1ee1e2c..0fdf0a15 100644
--- a/SGGL/Model/Model.csproj
+++ b/SGGL/Model/Model.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Model</RootNamespace>
     <AssemblyName>Model</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SccProjectName>
     </SccProjectName>
@@ -43,9 +43,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EmitMapper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EmitMapper.1.0.0\lib\EmitMapper.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -69,7 +66,11 @@
     <Compile Include="APIItem\BaseInfoItem.cs" />
     <Compile Include="APIItem\ChemicalReport.cs" />
     <Compile Include="APIItem\ChemicalReportItem.cs" />
+    <Compile Include="APIItem\CNCEC\ActionWorkLedger.cs" />
+    <Compile Include="APIItem\CNCEC\ActionWorkLedgerItem.cs" />
     <Compile Include="APIItem\CNCEC\CheckRectifyItem.cs" />
+    <Compile Include="APIItem\CNCEC\SafetyProductionEvaluation.cs" />
+    <Compile Include="APIItem\CNCEC\SafetyProductionEvaluationItem.cs" />
     <Compile Include="APIItem\CNCEC\SubUnitReportItemItem.cs" />
     <Compile Include="APIItem\CNCEC\UpCheckReportItem.cs" />
     <Compile Include="APIItem\CNCEC\UpCheckReportItemItem.cs" />
@@ -77,6 +78,7 @@
     <Compile Include="APIItem\DropDownItem.cs" />
     <Compile Include="APIItem\EnergyReport.cs" />
     <Compile Include="APIItem\EnergyReportItem.cs" />
+    <Compile Include="APIItem\Environmental_OperationReportDto.cs" />
     <Compile Include="APIItem\EPSummaryReport.cs" />
     <Compile Include="APIItem\HJGL\JointCompreInfoItem.cs" />
     <Compile Include="APIItem\HJGL\ReportQueryItem.cs" />
@@ -179,10 +181,13 @@
     <Compile Include="Chart\DataSourcePoint.cs" />
     <Compile Include="Chart\DataSourceTeam.cs" />
     <Compile Include="CostControlDetailItem.cs" />
+    <Compile Include="CQMS\BreakdownProject.cs" />
     <Compile Include="CQMS\CheckItem.cs" />
     <Compile Include="CQMS\CheckStatisc.cs" />
     <Compile Include="CQMS\CQMSConstructSolutionStatisc.cs" />
     <Compile Include="CQMS\FileCabinetItem.cs" />
+    <Compile Include="CQMS\InspectionManagement.cs" />
+    <Compile Include="CQMS\InspectionManagementDetail.cs" />
     <Compile Include="CQMS\InspectionManagementStatistics.cs" />
     <Compile Include="CQMS\NCRReportStatisc.cs" />
     <Compile Include="CQMS\NCRStatisc.cs" />
diff --git a/SGGL/SgManager.AI/.vs/SgManager.AI.csproj.dtbcache.json b/SGGL/SgManager.AI/.vs/SgManager.AI.csproj.dtbcache.json
index 2353fe23..3957fbdb 100644
--- a/SGGL/SgManager.AI/.vs/SgManager.AI.csproj.dtbcache.json
+++ b/SGGL/SgManager.AI/.vs/SgManager.AI.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\SgManager.AI","ProjectFileName":"SgManager.AI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AccessTokenModel.cs"},{"SourceFile":"APIBaseModel.cs"},{"SourceFile":"BaiduError.cs"},{"SourceFile":"ConfigAppSetting.cs"},{"SourceFile":"ErrorTypeModel.cs"},{"SourceFile":"FaceClass.cs"},{"SourceFile":"faceResult.cs"},{"SourceFile":"GpsPolygonHelper.cs"},{"SourceFile":"IDCardRecognition.cs"},{"SourceFile":"IDCardRecognitionModel.cs"},{"SourceFile":"IDCardClass.cs"},{"SourceFile":"IDCardToken.cs"},{"SourceFile":"ImageVerification.cs"},{"SourceFile":"MapClass.cs"},{"SourceFile":"OCR_CharacterRecognitionErrorType.cs"},{"SourceFile":"PostMail.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Baidu.AI.4.15.9\\lib\\net45\\AipSdk.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\SgManager.AI\\bin\\Debug\\AOP.Common.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Newtonsoft.Json.12.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.dll","OutputItemRelativePath":"SgManager.AI.dll"},{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.pdb","OutputItemRelativePath":"SgManager.AI.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\SgManager.AI","ProjectFileName":"SgManager.AI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AccessTokenModel.cs"},{"SourceFile":"APIBaseModel.cs"},{"SourceFile":"BaiduError.cs"},{"SourceFile":"ConfigAppSetting.cs"},{"SourceFile":"ErrorTypeModel.cs"},{"SourceFile":"FaceClass.cs"},{"SourceFile":"faceResult.cs"},{"SourceFile":"GpsPolygonHelper.cs"},{"SourceFile":"IDCardRecognition.cs"},{"SourceFile":"IDCardRecognitionModel.cs"},{"SourceFile":"IDCardClass.cs"},{"SourceFile":"IDCardToken.cs"},{"SourceFile":"ImageVerification.cs"},{"SourceFile":"MapClass.cs"},{"SourceFile":"OCR_CharacterRecognitionErrorType.cs"},{"SourceFile":"PostMail.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\Microsoft.CSharp\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.NET\\Framework\\v4.0.30319\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.configuration\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Core\\v4.0_4.0.0.0__b77a5c561934e089\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Data.DataSetExtensions\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_64\\System.Data\\v4.0_4.0.0.0__b77a5c561934e089\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System\\v4.0_4.0.0.0__b77a5c561934e089\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Drawing\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Net.Http\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_64\\System.Web\\v4.0_4.0.0.0__b03f5f7f11d50a3a\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\WINDOWS\\Microsoft.Net\\assembly\\GAC_MSIL\\System.Xml.Linq\\v4.0_4.0.0.0__b77a5c561934e089\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.dll","OutputItemRelativePath":"SgManager.AI.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/SGGL/SgManager.AI/SgManager.AI.csproj b/SGGL/SgManager.AI/SgManager.AI.csproj
index 83e8a86a..1e1bc32e 100644
--- a/SGGL/SgManager.AI/SgManager.AI.csproj
+++ b/SGGL/SgManager.AI/SgManager.AI.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SgManager.AI</RootNamespace>
     <AssemblyName>SgManager.AI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -35,7 +35,7 @@
       <HintPath>..\packages\Baidu.AI.4.15.9\lib\net45\AipSdk.dll</HintPath>
     </Reference>
     <Reference Include="AOP.Common">
-      <HintPath>bin\Debug\AOP.Common.dll</HintPath>
+      <HintPath>..\FineUIPro\Reference BLL\AOP.Common.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
diff --git a/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json b/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json
index 95d74a54..80ffbb07 100644
--- a/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json
+++ b/SGGL/WebAPI/.vs/WebAPI.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\WebAPI","ProjectFileName":"WebAPI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App_Start\\BundleConfig.cs"},{"SourceFile":"App_Start\\FilterConfig.cs"},{"SourceFile":"App_Start\\RouteConfig.cs"},{"SourceFile":"App_Start\\SwaggerConfig.cs"},{"SourceFile":"App_Start\\WebApiConfig.cs"},{"SourceFile":"Controllers\\AnBangToolController.cs"},{"SourceFile":"Controllers\\BaseInfoController.cs"},{"SourceFile":"Controllers\\CommonController.cs"},{"SourceFile":"Controllers\\CQMS\\InspectionManagementController.cs"},{"SourceFile":"Controllers\\CQMS\\PerformanceController.cs"},{"SourceFile":"Controllers\\CQMS\\WBSController.cs"},{"SourceFile":"Controllers\\DataSync\\CNCECServerController.cs"},{"SourceFile":"Controllers\\DoorProject\\getController.cs"},{"SourceFile":"Controllers\\DoorProject\\uploadController.cs"},{"SourceFile":"Controllers\\FaceController.cs"},{"SourceFile":"Controllers\\DoorServerController.cs"},{"SourceFile":"Controllers\\HJGL\\GetHJDataController.cs"},{"SourceFile":"Controllers\\HSSE\\GeneralEquipmentQualityController.cs"},{"SourceFile":"Controllers\\HSSE\\HSSELogController.cs"},{"SourceFile":"Controllers\\HSSE\\TestingController.cs"},{"SourceFile":"Controllers\\Person\\PersonCheckController.cs"},{"SourceFile":"Controllers\\CQMS\\CheckEquipmentController.cs"},{"SourceFile":"Controllers\\CQMS\\CheckListController.cs"},{"SourceFile":"Controllers\\CQMS\\CommenInfoController.cs"},{"SourceFile":"Controllers\\CQMS\\ContactController.cs"},{"SourceFile":"Controllers\\CQMS\\CQMSConstructSolutionController.cs"},{"SourceFile":"Controllers\\CQMS\\DesignController.cs"},{"SourceFile":"Controllers\\CQMS\\DrawController.cs"},{"SourceFile":"Controllers\\CQMS\\IndexController.cs"},{"SourceFile":"Controllers\\CQMS\\JointCheckController.cs"},{"SourceFile":"Controllers\\CQMS\\SpotCheckController.cs"},{"SourceFile":"Controllers\\CQMS\\TechnicalContactController.cs"},{"SourceFile":"Controllers\\HJGL\\HotProcessHardController.cs"},{"SourceFile":"Controllers\\HJGL\\NDETrustController.cs"},{"SourceFile":"Controllers\\HJGL\\PipeJointController.cs"},{"SourceFile":"Controllers\\HJGL\\PreWeldingDailyController.cs"},{"SourceFile":"Controllers\\HJGL\\ReportQueryController.cs"},{"SourceFile":"Controllers\\HJGL\\TestPackageController.cs"},{"SourceFile":"Controllers\\HSSE\\ChartAnalysisController.cs"},{"SourceFile":"Controllers\\HSSE\\CheckSpecialController.cs"},{"SourceFile":"Controllers\\HSSE\\ConstructSolutionController.cs"},{"SourceFile":"Controllers\\HSSE\\EmergencyController.cs"},{"SourceFile":"Controllers\\HSSE\\EquipmentQualityController.cs"},{"SourceFile":"Controllers\\HSSE\\HazardListController.cs"},{"SourceFile":"Controllers\\HSSE\\HazardRegisterController.cs"},{"SourceFile":"Controllers\\HSSE\\HSEDiaryController.cs"},{"SourceFile":"Controllers\\HSSE\\HSSEStandardsListController.cs"},{"SourceFile":"Controllers\\HSSE\\IncentiveNoticeController.cs"},{"SourceFile":"Controllers\\HSSE\\LawManageRuleController.cs"},{"SourceFile":"Controllers\\HSSE\\LawRegulationListController.cs"},{"SourceFile":"Controllers\\HSSE\\LawRulesRegulationsController.cs"},{"SourceFile":"Controllers\\HSSE\\LicenseController.cs"},{"SourceFile":"Controllers\\HSSE\\MeetingController.cs"},{"SourceFile":"Controllers\\HSSE\\PageDataController.cs"},{"SourceFile":"Controllers\\HSSE\\PauseNoticeController.cs"},{"SourceFile":"Controllers\\HSSE\\PersonQualityController.cs"},{"SourceFile":"Controllers\\HSSE\\PunishNoticeController.cs"},{"SourceFile":"Controllers\\HSSE\\ReceiveFileManagerController.cs"},{"SourceFile":"Controllers\\HSSE\\RectifyNoticesController.cs"},{"SourceFile":"Controllers\\HSSE\\ResourcesController.cs"},{"SourceFile":"Controllers\\HSSE\\SeDinMonthReportController.cs"},{"SourceFile":"Controllers\\HSSE\\ServerTestPlanController.cs"},{"SourceFile":"Controllers\\HSSE\\ServerTestRecordController.cs"},{"SourceFile":"Controllers\\HSSE\\TestPlanController.cs"},{"SourceFile":"Controllers\\HSSE\\TestRecordController.cs"},{"SourceFile":"Controllers\\HSSE\\TrainingPlanController.cs"},{"SourceFile":"Controllers\\HSSE\\TrainingTaskController.cs"},{"SourceFile":"Controllers\\HSSE\\TrainRecordController.cs"},{"SourceFile":"Controllers\\IDCardController.cs"},{"SourceFile":"Controllers\\FileUploadController.cs"},{"SourceFile":"Controllers\\HomeController.cs"},{"SourceFile":"Controllers\\PersonController.cs"},{"SourceFile":"Controllers\\ProjectController.cs"},{"SourceFile":"Controllers\\TestRun\\DriverRunController.cs"},{"SourceFile":"Controllers\\ToDoItemController.cs"},{"SourceFile":"Controllers\\UnitController.cs"},{"SourceFile":"Controllers\\UserController.cs"},{"SourceFile":"Controllers\\VideoController.cs"},{"SourceFile":"Filter\\TestPermissionAttribute.cs"},{"SourceFile":"Global.asax.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Antlr.3.5.0.2\\lib\\Antlr3.Runtime.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\FineUIPro\\Reference BLL\\Aspose.Words.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\BLL\\bin\\Debug\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\\lib\\net45\\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.Web.Infrastructure.1.0.0.0\\lib\\net40\\Microsoft.Web.Infrastructure.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\Model\\bin\\Debug\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Newtonsoft.Json.12.0.1\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\SgManager.AI\\bin\\Debug\\SgManager.AI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Swashbuckle.Core.5.6.0\\lib\\net40\\Swashbuckle.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebApi.Client.5.2.7\\lib\\net45\\System.Net.Http.Formatting.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Net.Http.WebRequest.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.ApplicationServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.Cors.5.2.7\\lib\\net45\\System.Web.Cors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.DynamicData.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.Entity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.Helpers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebApi.Cors.5.2.7\\lib\\net45\\System.Web.Http.Cors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebApi.Core.5.2.7\\lib\\net45\\System.Web.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebApi.WebHost.5.2.4\\lib\\net45\\System.Web.Http.WebHost.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.Mvc.5.2.4\\lib\\net45\\System.Web.Mvc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.Web.Optimization.1.1.3\\lib\\net40\\System.Web.Optimization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.Razor.3.2.4\\lib\\net45\\System.Web.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Web.Routing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\Microsoft.AspNet.WebPages.3.2.4\\lib\\net45\\System.Web.WebPages.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\WebActivatorEx.2.0\\lib\\net40\\WebActivatorEx.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\packages\\WebGrease.1.6.0\\lib\\WebGrease.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\WebAPI\\bin\\WebAPI.dll","OutputItemRelativePath":"WebAPI.dll"},{"OutputItemFullPath":"D:\\鏁版嵁\\璇哄繀杈綷\浜旂幆\\CNCEC_SUBQHSE_WUHUAN\\SGGL\\WebAPI\\bin\\WebAPI.pdb","OutputItemRelativePath":"WebAPI.pdb"}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\WebAPI","ProjectFileName":"WebAPI.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[],"References":[],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\璇哄繀杈綷\浜旂幆\\SGGL\\WebAPI\\bin\\WebAPI.dll","OutputItemRelativePath":"WebAPI.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/AnBangToolController.cs b/SGGL/WebAPI/Controllers/AnBangToolController.cs
index 7541ed7e..70378af1 100644
--- a/SGGL/WebAPI/Controllers/AnBangToolController.cs
+++ b/SGGL/WebAPI/Controllers/AnBangToolController.cs
@@ -35,6 +35,17 @@ namespace WebAPI.Controllers
                     responeData.message = "ProjectId 涓嶈兘涓虹┖";
                     return responeData;
                 }
+                else
+                {
+                    var project  =APIProjectService.getProjectByProjectId(personInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 涓嶅瓨鍦�";
+                        return responeData;
+                    }
+
+                }
                 using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
                 {
                     var getPerson = db.Bo_Sheng_Person.FirstOrDefault(x => x.ID == personInput.ID);
@@ -169,6 +180,17 @@ namespace WebAPI.Controllers
                     responeData.message = "ProjectId 涓嶈兘涓虹┖";
                     return responeData;
                 }
+                else
+                {
+                    var project = APIProjectService.getProjectByProjectId(trainInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 涓嶅瓨鍦�";
+                        return responeData;
+                    }
+
+                }
                 using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
                 {
                     var getTrain = db.Bo_Sheng_Train.FirstOrDefault(x => x.ID == trainInput.ID);
@@ -295,6 +317,17 @@ namespace WebAPI.Controllers
                     responeData.message = "ProjectId 涓嶈兘涓虹┖";
                     return responeData;
                 }
+                else
+                {
+                    var project = APIProjectService.getProjectByProjectId(trainPersonInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 涓嶅瓨鍦�";
+                        return responeData;
+                    }
+
+                }
                 using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
                 {
                     var getTrainPerson = db.Bo_Sheng_TrainPerson.FirstOrDefault(x => x.ID == trainPersonInput.ID);
@@ -417,6 +450,17 @@ namespace WebAPI.Controllers
                     responeData.message = "ProjectId 涓嶈兘涓虹┖";
                     return responeData;
                 }
+                else
+                {
+                    var project = APIProjectService.getProjectByProjectId(personTrainRecordInput.ProjectId);
+                    if (project == null)
+                    {
+                        responeData.code = 0;
+                        responeData.message = "ProjectId 涓嶅瓨鍦�";
+                        return responeData;
+                    }
+                }
+
                 using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
                 {
                     var getPersonTrainRecord = db.Bo_Sheng_PersonTrainRecord.FirstOrDefault(x => x.ID == personTrainRecordInput.ID);
diff --git a/SGGL/WebAPI/Controllers/BaseInfoController.cs b/SGGL/WebAPI/Controllers/BaseInfoController.cs
index ca6de604..e488b2ee 100644
--- a/SGGL/WebAPI/Controllers/BaseInfoController.cs
+++ b/SGGL/WebAPI/Controllers/BaseInfoController.cs
@@ -78,6 +78,29 @@ namespace WebAPI.Controllers
         }
         #endregion
 
+        #region 鏍规嵁椤圭洰鍚嶇О鑾峰彇椤圭洰淇℃伅
+        /// <summary>
+        ///  鏍规嵁椤圭洰鍚嶇О鑾峰彇椤圭洰淇℃伅
+        /// </summary>
+        /// <param name="projectName"></param>
+        /// <returns></returns>
+        public Model.ResponeData getProjectByName(string projectName)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = BLL.APIBaseInfoService.getProjectByName(projectName);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
         #region 鏍规嵁projectId鑾峰彇鍗曚綅宸ョ▼
         /// <summary>
         ///  鏍规嵁projectId鑾峰彇鍗曚綅宸ョ▼
diff --git a/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs b/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs
index dabedcb1..a718f5f9 100644
--- a/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs
@@ -48,6 +48,7 @@ namespace Mvc.Controllers
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
+        [HttpGet]
         public ResponseData<List<Solution_CQMSConstructSolutionApprove>> GetApproveById(string id,int edition)
         {
             ResponseData<List<Solution_CQMSConstructSolutionApprove>> res = new ResponseData<List<Solution_CQMSConstructSolutionApprove>>();
@@ -56,6 +57,7 @@ namespace Mvc.Controllers
             res.resultValue = BLL.CQMSConstructSolutionApproveService.getListDataForApi(id);
             return res;
         }
+        [HttpGet]
         public ResponseData<Solution_CQMSConstructSolutionApprove> GetCurrApproveById(string id, string userId, int edition)
         {
             ResponseData<Solution_CQMSConstructSolutionApprove> res = new ResponseData<Solution_CQMSConstructSolutionApprove>();
@@ -87,6 +89,7 @@ namespace Mvc.Controllers
         /// <param name="id"></param>
         /// <param name="edition"></param>
         /// <returns></returns>
+        [HttpGet]
         public ResponseData<List<Solution_CQMSConstructSolutionApprove>> GetConApproveById(string id, int edition)
         {
             ResponseData<List<Solution_CQMSConstructSolutionApprove>> res = new ResponseData<List<Solution_CQMSConstructSolutionApprove>>();
diff --git a/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs b/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs
index 82e978c9..299e7571 100644
--- a/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Web.Http;
 using BLL;
 using Model;
+using Model.CQMS;
 
 namespace WebAPI.Controllers.CQMS
 {
@@ -112,5 +113,131 @@ namespace WebAPI.Controllers.CQMS
 
             public string AttachUrl { get; set; }
         }
+
+        #region 灏忕▼搴忕
+        /// <summary>
+        ///   娣诲姞 涓昏〃+瀛愯〃
+        /// </summary>
+        /// <param name="inspectionManagement"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ResponseData<string> AddInspectionManagement([FromBody] InspectionManagement inspectionManagement)
+        {
+            ResponseData<string> res = new ResponseData<string>();
+            try
+            {
+                res.successful = BLL.API.CQMS.ApiInspectionManagementService.AddInspectionManagement(inspectionManagement);
+                res.successful = true;
+            }
+            catch (Exception e)
+            {
+
+            }
+            return res;
+
+        }
+        /// <summary>
+        /// 鑾峰彇瑙傛祴鐐�
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="keyWord"></param>
+        /// <returns></returns>
+        public ResponseData<List<BreakdownProject>> getBreakdownProject(string projectId, string keyWord)
+        {
+            ResponseData<List<BreakdownProject>> res = new ResponseData<List<BreakdownProject>>();
+            try
+            {
+                if (string.IsNullOrEmpty(keyWord))
+                    keyWord = "";
+                res.resultValue = BLL.API.CQMS.BreakdownProjectService.getBreakdowns(projectId, keyWord);
+                res.successful = true;
+            }
+            catch (Exception e)
+            {
+
+            }
+            return res;
+
+        }
+
+        /// <summary>
+        ///   鑾峰彇鏄庣粏鍒楄〃鏁版嵁
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="index"></param>
+        /// <param name="page"></param>
+        /// <param name="state"></param>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public ResponseData<List<InspectionManagement>> getInspectionManagement(string projectId, int index, int page, string state, string name)
+        {
+            ResponseData<List<InspectionManagement>> res = new ResponseData<List<InspectionManagement>>();
+            try
+            {
+                res.successful = true;
+                res.resultValue = BLL.API.CQMS.ApiInspectionManagementService.getInspectionManagement(projectId, index, page, state, name);
+
+            }
+            catch (Exception e)
+            {
+                res.successful = false;
+
+            }
+
+            return res;
+        }
+
+        /// <summary>
+        ///   鑾峰彇鏄庣粏鍒楄〃鏁版嵁
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="index"></param>
+        /// <param name="page"></param>
+        /// <param name="state"></param>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public ResponseData<List<InspectionManagementDetail>> getInspectionManagementDetail(string projectId, int index, int page, string state, string name)
+        {
+            ResponseData<List<InspectionManagementDetail>> res = new ResponseData<List<InspectionManagementDetail>>();
+            try
+            {
+                res.successful = true;
+                res.resultValue = BLL.API.CQMS.ApiInspectionManagementService.getInspectionManagementDetail(projectId, index, page, state, name);
+
+            }
+            catch (Exception e)
+            {
+                res.successful = false;
+
+            }
+
+            return res;
+        }
+        /// <summary>
+        /// 鏍规嵁涓昏〃 鑾峰彇瀛愯〃鏁版嵁
+        /// </summary>
+        /// <param name="InspectionId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public ResponseData<List<InspectionManagementDetail>> getInspectionManagementDetailByInspectionId(string InspectionId)
+        {
+            ResponseData<List<InspectionManagementDetail>> res = new ResponseData<List<InspectionManagementDetail>>();
+            try
+            {
+                res.successful = true;
+                res.resultValue = BLL.API.CQMS.ApiInspectionManagementService.getInspectionManagementDetailByinspectionId(InspectionId);
+
+            }
+            catch (Exception e)
+            {
+                res.successful = false;
+
+            }
+
+            return res;
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/WebAPI/Controllers/CQMS/QualityAssuranceController.cs b/SGGL/WebAPI/Controllers/CQMS/QualityAssuranceController.cs
new file mode 100644
index 00000000..1b80ae5a
--- /dev/null
+++ b/SGGL/WebAPI/Controllers/CQMS/QualityAssuranceController.cs
@@ -0,0 +1,634 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Http;
+using BLL;
+using Model;
+using Model.CQMS;
+
+
+namespace WebAPI.Controllers.CQMS
+{
+    /// <summary>
+    /// 璐ㄩ噺灏忕▼搴忔帴鍙�
+    /// </summary>
+    public class QualityAssuranceController : ApiController
+    {
+        #region 璁捐浜ゅ簳
+        /// <summary>
+        /// 璁捐浜ゅ簳鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getDesignDetailsList(string projectId, int pageIndex = 0,string cNProfessionalId="") {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getDesignDetailsList(projectId, cNProfessionalId);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getDesignDetails(string Id) {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getDesignDetails(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鍥剧焊浼氬
+        /// <summary>
+        /// 鍥剧焊浼氬鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getReviewDrawingsList(string projectId, int pageIndex = 0, string cNProfessionalId = "")
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getReviewDrawingsList(projectId,cNProfessionalId);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鍥剧焊浼氬璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getReviewDrawings(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getReviewDrawings(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鎶�鏈氦搴�
+        /// <summary>
+        /// 鎶�鏈氦搴曞垪琛�
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="cNProfessionalId"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getConTechnologyDisclosureList(string projectId, int pageIndex = 0, string cNProfessionalId = "")
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getConTechnologyDisclosureList(projectId, cNProfessionalId);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鎶�鏈氦搴曡鎯�
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getConTechnologyDisclosure(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getConTechnologyDisclosure(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 浜哄憳鎶ラ獙
+        //
+        /// <summary>
+        /// 浜哄憳鎶ラ獙鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getInspectionPersonList(string projectId,string serachText="", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getInspectionPersonList(projectId,serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 浜哄憳鎶ラ獙璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getInspectionPerson(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getInspectionPerson(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鏉愭枡鎶ラ獙
+        //
+        /// <summary>
+        /// 鏉愭枡鎶ラ獙鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getInspectionEquipmentList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getInspectionEquipmentList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鏉愭枡鎶ラ獙璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getInspectionEquipment(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getInspectionEquipment(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鏈哄叿鎶ラ獙
+        /// <summary>
+        /// 鏈哄叿鎶ラ獙鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getInspectionMachineList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getInspectionMachineList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鏈哄叿鎶ラ獙璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getInspectionMachine(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getInspectionMachine(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+
+        #endregion
+
+        #region 鏃犳崯妫�娴�
+        /// <summary>
+        /// 鏃犳崯妫�娴嬪垪琛�
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getNondestructiveTest_NewList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getNondestructiveTest_NewList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鏃犳崯妫�娴嬭鎯�
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getNondestructiveTest_New(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getNondestructiveTest_New(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鍘嬪姏绠￠亾
+        /// <summary>
+        /// 鍘嬪姏绠￠亾鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getPressurePipeList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getPressurePipeList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鍘嬪姏绠￠亾璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getPressurePipe(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getPressurePipe(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鐗圭璁惧
+        /// <summary>
+        /// 鐗圭璁惧鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getSpecialEquipmentList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getSpecialEquipmentList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鐗圭璁惧璇︽儏
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getSpecialEquipment(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getSpecialEquipment(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 鎺у埗鐐规鏌ユ娴�
+
+        #endregion
+
+        #region 鎺у埗鐐规鏌ユ娴嬪悎鏍肩巼缁熻
+        /// <summary>
+        /// 鎺у埗鐐规鏌ユ娴嬪悎鏍肩巼缁熻鍒楄〃
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getInspectionManagementStatisticsList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getInspectionManagementStatisticsList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+        #endregion
+
+        #region 鏂藉伐缁勭粐璁捐鍙婃柦宸ユ柟妗堢鐞�
+        /// <summary>
+        /// 鏂藉伐缁勭粐璁捐鍙婃柦宸ユ柟妗堢鐞嗗垪琛�
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getGeneralPlanList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getGeneralPlanList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 鏂藉伐缁勭粐璁捐鍙婃柦宸ユ柟妗堢鐞嗚鎯�
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getGeneralPlan(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getGeneralPlan(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+
+        #region 瓒呭嵄澶у伐绋嬫柦宸ユ柟妗堢鐞�
+        /// <summary>
+        /// 瓒呭嵄澶у伐绋嬫柦宸ユ柟妗堢鐞嗗垪琛�
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="serachText"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getMajorPlanList(string projectId, string serachText = "", int pageIndex = 0)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                var getDataList = QualityAssuranceService.getMajorPlanList(projectId, serachText);
+                int pageCount = getDataList.Count();
+                if (pageCount > 0 && pageIndex > 0)
+                {
+                    getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
+                }
+                responeData.data = new { pageCount, getDataList };
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+            return responeData;
+        }
+
+        /// <summary>
+        /// 瓒呭嵄澶у伐绋嬫柦宸ユ柟妗堢鐞嗚鎯�
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Model.ResponeData getMajorPlan(string Id)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = QualityAssuranceService.getMajorPlan(Id);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 698d0994..f2575fcf 100644
--- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -6,7 +6,8 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>E:\Package\涓浗浜旂幆宸ョ▼鏈夐檺鍏徃\SGGLAPI</_PublishTargetUrl>
-    <History>True|2024-07-17T02:29:15.9472548Z;</History>
+    <History>True|2024-09-24T01:51:10.8028974Z;True|2024-09-20T17:30:59.6144803+08:00;True|2024-09-20T15:28:40.2547949+08:00;True|2024-09-19T16:30:51.3047517+08:00;True|2024-09-19T15:53:23.2431713+08:00;True|2024-09-19T15:48:55.0571748+08:00;True|2024-09-19T15:06:29.5748482+08:00;True|2024-09-19T14:55:42.1477578+08:00;True|2024-09-19T10:07:53.8666329+08:00;True|2024-09-03T16:26:17.4985546+08:00;True|2024-07-17T10:29:15.9472548+08:00;</History>
+    <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
     <File Include="Areas/HelpPage/HelpPage.css">
@@ -73,445 +74,451 @@
       <publishTime>07/17/2022 11:13:58</publishTime>
     </File>
     <File Include="bin/AipSdk.dll">
-      <publishTime>05/07/2022 06:29:26</publishTime>
+      <publishTime>05/07/2022 14:29:26</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
-      <publishTime>09/10/2013 16:29:20</publishTime>
+      <publishTime>09/11/2013 00:29:20</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.pdb">
-      <publishTime>09/10/2013 16:29:20</publishTime>
+      <publishTime>09/11/2013 00:29:20</publishTime>
     </File>
     <File Include="bin/AOP.Common.dll">
-      <publishTime>09/23/2018 23:07:04</publishTime>
+      <publishTime>03/11/2024 11:33:45</publishTime>
     </File>
     <File Include="bin/App_global.asax.compiled">
-      <publishTime>08/12/2024 09:53:00</publishTime>
+      <publishTime>09/24/2024 09:51:10</publishTime>
     </File>
     <File Include="bin/App_global.asax.dll">
-      <publishTime>08/12/2024 09:53:00</publishTime>
+      <publishTime>09/24/2024 09:51:10</publishTime>
     </File>
     <File Include="bin/Aspose.Words.dll">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>08/12/2024 09:52:20</publishTime>
+      <publishTime>09/24/2024 09:50:50</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
-      <publishTime>05/15/2024 09:04:09</publishTime>
+      <publishTime>05/22/2024 09:42:30</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>08/12/2024 09:52:20</publishTime>
+      <publishTime>09/24/2024 09:50:50</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
-      <publishTime>12/17/2020 21:32:28</publishTime>
+      <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/EmitMapper.dll">
-      <publishTime>05/10/2011 13:28:12</publishTime>
+      <publishTime>05/10/2011 21:28:12</publishTime>
     </File>
     <File Include="bin/FineUIPro.dll">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:36</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.dll">
-      <publishTime>05/08/2021 17:08:30</publishTime>
+      <publishTime>05/09/2021 01:08:30</publishTime>
     </File>
     <File Include="bin/ICSharpCode.SharpZipLib.pdb">
-      <publishTime>05/08/2021 17:08:30</publishTime>
+      <publishTime>05/09/2021 01:08:30</publishTime>
     </File>
     <File Include="bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/Microsoft.Extensions.Logging.Abstractions.dll">
-      <publishTime>06/07/2018 00:26:54</publishTime>
+      <publishTime>06/07/2018 08:26:54</publishTime>
     </File>
     <File Include="bin/Microsoft.Web.Infrastructure.dll">
-      <publishTime>07/25/2012 11:48:56</publishTime>
+      <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>08/12/2024 09:52:17</publishTime>
+      <publishTime>09/20/2024 15:28:18</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>08/12/2024 09:52:17</publishTime>
+      <publishTime>09/20/2024 15:28:18</publishTime>
     </File>
     <File Include="bin/netstandard.dll">
-      <publishTime>07/07/2022 09:01:04</publishTime>
+      <publishTime>03/11/2024 11:17:08</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
-      <publishTime>11/27/2018 18:07:34</publishTime>
+      <publishTime>11/28/2018 02:07:34</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.pdb">
-      <publishTime>11/27/2018 17:59:08</publishTime>
+      <publishTime>11/28/2018 01:59:08</publishTime>
     </File>
     <File Include="bin/NPOI.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OOXML.dll">
-      <publishTime>10/23/2021 01:07:56</publishTime>
-    </File>
-    <File Include="bin/NPOI.OOXML.pdb">
       <publishTime>10/23/2021 09:07:56</publishTime>
     </File>
+    <File Include="bin/NPOI.OOXML.pdb">
+      <publishTime>10/23/2021 17:07:56</publishTime>
+    </File>
     <File Include="bin/NPOI.OpenXml4Net.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXml4Net.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXmlFormats.dll">
-      <publishTime>10/23/2021 01:07:54</publishTime>
+      <publishTime>10/23/2021 09:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.OpenXmlFormats.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/NPOI.pdb">
-      <publishTime>10/23/2021 09:07:54</publishTime>
+      <publishTime>10/23/2021 17:07:54</publishTime>
     </File>
     <File Include="bin/Quartz.dll">
-      <publishTime>09/18/2022 09:38:18</publishTime>
+      <publishTime>09/18/2022 17:38:18</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
-      <publishTime>12/08/2021 14:02:42</publishTime>
+      <publishTime>12/08/2021 22:02:42</publishTime>
     </File>
     <File Include="bin/roslyn/csc.exe">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csc.exe.config">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csc.rsp">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csi.exe">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csi.exe.config">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/csi.rsp">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.Build.Tasks.CodeAnalysis.dll">
-      <publishTime>05/24/2018 13:38:22</publishTime>
+      <publishTime>05/24/2018 21:38:22</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.CSharp.Core.targets">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.Managed.Core.targets">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/Microsoft.VisualBasic.Core.targets">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.AppContext.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Collections.Immutable.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Console.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Diagnostics.FileVersionInfo.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Diagnostics.StackTrace.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.Compression.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.FileSystem.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.FileSystem.Primitives.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.Pipes.AccessControl.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.IO.Pipes.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Reflection.Metadata.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.AccessControl.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Claims.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.Algorithms.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.Encoding.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.Primitives.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Cryptography.X509Certificates.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Security.Principal.Windows.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Text.Encoding.CodePages.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.ValueTuple.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.ReaderWriter.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.XmlDocument.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.XPath.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/System.Xml.XPath.XDocument.dll">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/vbc.exe">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/vbc.exe.config">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/vbc.rsp">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/VBCSCompiler.exe">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/roslyn/VBCSCompiler.exe.config">
-      <publishTime>05/24/2018 13:38:24</publishTime>
+      <publishTime>05/24/2018 21:38:24</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll">
-      <publishTime>08/12/2024 09:52:15</publishTime>
+      <publishTime>07/17/2024 10:28:48</publishTime>
     </File>
     <File Include="bin/SgManager.AI.dll.config">
-      <publishTime>05/15/2024 09:04:33</publishTime>
+      <publishTime>05/22/2024 09:42:30</publishTime>
     </File>
     <File Include="bin/SgManager.AI.pdb">
-      <publishTime>08/12/2024 09:52:15</publishTime>
+      <publishTime>07/17/2024 10:28:48</publishTime>
+    </File>
+    <File Include="bin/Swashbuckle.Core.dll">
+      <publishTime>07/08/2017 09:30:56</publishTime>
     </File>
     <File Include="bin/System.Buffers.dll">
-      <publishTime>02/19/2020 10:05:18</publishTime>
+      <publishTime>02/19/2020 18:05:18</publishTime>
     </File>
     <File Include="bin/System.Configuration.ConfigurationManager.dll">
       <publishTime>08/19/2022 19:55:18</publishTime>
     </File>
     <File Include="bin/System.Diagnostics.DiagnosticSource.dll">
-      <publishTime>04/14/2020 22:49:20</publishTime>
+      <publishTime>04/15/2020 06:49:20</publishTime>
     </File>
     <File Include="bin/System.Memory.dll">
-      <publishTime>02/19/2020 10:05:18</publishTime>
+      <publishTime>02/19/2020 18:05:18</publishTime>
     </File>
     <File Include="bin/System.Net.Http.Formatting.dll">
-      <publishTime>11/28/2018 13:00:36</publishTime>
+      <publishTime>11/28/2018 21:00:36</publishTime>
     </File>
     <File Include="bin/System.Numerics.Vectors.dll">
-      <publishTime>05/15/2018 13:29:44</publishTime>
+      <publishTime>05/15/2018 21:29:44</publishTime>
     </File>
     <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
-      <publishTime>02/19/2020 10:05:16</publishTime>
+      <publishTime>02/19/2020 18:05:16</publishTime>
     </File>
     <File Include="bin/System.Web.Cors.dll">
-      <publishTime>11/28/2018 12:58:44</publishTime>
+      <publishTime>11/28/2018 20:58:44</publishTime>
     </File>
     <File Include="bin/System.Web.Helpers.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/System.Web.Http.Cors.dll">
-      <publishTime>11/28/2018 13:01:26</publishTime>
+      <publishTime>11/28/2018 21:01:26</publishTime>
     </File>
     <File Include="bin/System.Web.Http.dll">
-      <publishTime>11/28/2018 13:01:00</publishTime>
+      <publishTime>11/28/2018 21:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>02/01/2018 12:19:26</publishTime>
+      <publishTime>02/01/2018 20:19:26</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
-      <publishTime>02/01/2018 12:16:32</publishTime>
+      <publishTime>02/01/2018 20:16:32</publishTime>
     </File>
     <File Include="bin/System.Web.Optimization.dll">
-      <publishTime>02/11/2014 15:26:04</publishTime>
+      <publishTime>02/11/2014 23:26:04</publishTime>
     </File>
     <File Include="bin/System.Web.Razor.dll">
-      <publishTime>02/01/2018 12:16:56</publishTime>
+      <publishTime>02/01/2018 20:16:56</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Deployment.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/System.Web.WebPages.Razor.dll">
-      <publishTime>02/01/2018 12:20:56</publishTime>
+      <publishTime>02/01/2018 20:20:56</publishTime>
     </File>
     <File Include="bin/ThoughtWorks.QRCode.dll">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
+    </File>
+    <File Include="bin/WebActivatorEx.dll">
+      <publishTime>02/09/2013 00:42:28</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>08/12/2024 09:52:21</publishTime>
+      <publishTime>09/24/2024 09:50:50</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>08/12/2024 09:52:21</publishTime>
+      <publishTime>09/24/2024 09:50:50</publishTime>
     </File>
     <File Include="bin/WebAPI.xml">
-      <publishTime>08/12/2024 09:52:21</publishTime>
+      <publishTime>09/24/2024 09:50:50</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
-      <publishTime>01/23/2014 13:57:34</publishTime>
+      <publishTime>01/23/2014 21:57:34</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
-      <publishTime>11/29/2018 13:26:02</publishTime>
+      <publishTime>11/29/2018 21:26:02</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Helpers.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
-      <publishTime>11/29/2018 13:26:30</publishTime>
+      <publishTime>11/29/2018 21:26:30</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Http.WebHost.resources.dll">
-      <publishTime>02/01/2018 12:19:30</publishTime>
+      <publishTime>02/01/2018 20:19:30</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Mvc.resources.dll">
-      <publishTime>02/01/2018 12:16:38</publishTime>
+      <publishTime>02/01/2018 20:16:38</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Optimization.resources.dll">
-      <publishTime>02/11/2014 15:28:40</publishTime>
+      <publishTime>02/11/2014 23:28:40</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.Razor.resources.dll">
-      <publishTime>02/01/2018 12:17:00</publishTime>
+      <publishTime>02/01/2018 20:17:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.Deployment.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.Razor.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="bin/zh-Hans/System.Web.WebPages.resources.dll">
-      <publishTime>02/01/2018 12:21:00</publishTime>
+      <publishTime>02/01/2018 20:21:00</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.min.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap-theme.min.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="ErrLog.txt">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="favicon.ico">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff2">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="PrecompiledApp.config">
-      <publishTime>08/12/2024 09:52:38</publishTime>
+      <publishTime>09/24/2024 09:50:53</publishTime>
     </File>
     <File Include="Scripts/bootstrap.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/bootstrap.min.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.min.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.min.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.min.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/jquery-3.3.1.slim.min.map">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Scripts/modernizr-2.8.3.js">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Home/Index.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/Web.config">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>01/25/2024 16:12:57</publishTime>
+      <publishTime>03/11/2024 11:23:37</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>08/08/2024 09:20:35</publishTime>
+      <publishTime>09/06/2024 14:03:52</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SGGL/WebAPI/Web.config b/SGGL/WebAPI/Web.config
index c854e721..b5114d3e 100644
--- a/SGGL/WebAPI/Web.config
+++ b/SGGL/WebAPI/Web.config
@@ -1,41 +1,41 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0"?>
 <!--
   鏈夊叧濡備綍閰嶇疆 ASP.NET 搴旂敤绋嬪簭鐨勮缁嗕俊鎭紝璇疯闂�
   https://go.microsoft.com/fwlink/?LinkId=301879
   -->
 <configuration>
   <appSettings>
-    <add key="webpages:Version" value="3.0.0.0" />
-    <add key="webpages:Enabled" value="false" />
-    <add key="ClientValidationEnabled" value="true" />
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+    <add key="webpages:Version" value="3.0.0.0"/>
+    <add key="webpages:Enabled" value="false"/>
+    <add key="ClientValidationEnabled" value="true"/>
+    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
     <!--杩炴帴瀛楃涓�-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--鐗堟湰鍙�-->
-    <add key="SystemVersion" value="WebApi_V2019-08-27-001" />
+    <add key="SystemVersion" value="WebApi_V2019-08-27-001"/>
     <!--闄勪欢涓婁紶鐗╃悊璺緞-->
-    <add key="localRoot" value="D:\WuHuan\SGGL\SGGL\FineUIPro.Web\" />
+    <add key="localRoot" value="D:\WuHuan\SGGL\SGGL\FineUIPro.Web\"/>
     <!--姣忛〉鏁伴噺-->
-    <add key="PageSize" value="15" />
+    <add key="PageSize" value="15"/>
     <!--BAIDU AI閰嶇疆-->
-    <add key="APP_ID" value="23518716" />
-    <add key="API_KEY" value="9UGmBxS0TOIDGM5adGrOcBnr" />
-    <add key="SECRET_KEY" value="6yq7q5PTTGfocWDmSN7hjxuiixsfURe1" />
+    <add key="APP_ID" value="23518716"/>
+    <add key="API_KEY" value="9UGmBxS0TOIDGM5adGrOcBnr"/>
+    <add key="SECRET_KEY" value="6yq7q5PTTGfocWDmSN7hjxuiixsfURe1"/>
     <!--瑙嗛鏈嶅姟鍣�-->
-    <add key="Video_URL" value="http://47.104.102.122:10000/" />
+    <add key="Video_URL" value="http://47.104.102.122:10000/"/>
     <!--浜鸿劯妫�娴嬪弬鏁�-->
     <!--浜鸿劯娲讳綋妫�娴嬪弬鏁�1鏈�濂斤紝0鏈�宸� 寤鸿0.995 -->
-    <add key="BD_face_liveness" value="0.3" />
+    <add key="BD_face_liveness" value="0.3"/>
     <!--浜鸿劯楂樺寤鸿100-200-->
     <!--<add key="BD_width" value="200" />-->
     <!--<add key="BD_height" value="200" />-->
     <!--浜鸿劯瑙掑害-->
-    <add key="BD_roll" value="60" />
+    <add key="BD_roll" value="60"/>
     <!--浜鸿劯閬。搴�0鏈�濂斤紝1鏈�涓嶅ソ-->
-    <add key="BD_occlusion" value="1" />
+    <add key="BD_occlusion" value="1"/>
     <!--浜鸿劯妯＄硦搴�0鏈�濂斤紝1鏈�涓嶅ソ-->
-    <add key="BD_blur" value="0.1" />
-    <add key="CEMS_IMG_URL" value="https://zhgd.cwcec.com/" />
+    <add key="BD_blur" value="0.1"/>
+    <add key="CEMS_IMG_URL" value="https://zhgd.cwcec.com/"/>
   </appSettings>
   <!--
     鏈夊叧 web.config 鏇存敼鐨勮鏄庯紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkId=235367銆�
@@ -46,78 +46,78 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime/>
     <pages controlRenderingCompatibilityVersion="4.0"/>
   </system.web>
   <system.webServer>
     <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-      <remove name="OPTIONSVerbHandler" />
-      <remove name="TRACEVerbHandler" />
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
+      <remove name="OPTIONSVerbHandler"/>
+      <remove name="TRACEVerbHandler"/>
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
     </handlers>
     <!-- 璺ㄥ煙璁块棶蹇呴』娣诲姞 -->
     <httpProtocol>
       <customHeaders>
-        <add name="Access-Control-Allow-Origin" value="*" />
-        <add name="Access-Control-Allow-Headers" value="Content-Type" />
-        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
+        <add name="Access-Control-Allow-Origin" value="*"/>
+        <add name="Access-Control-Allow-Headers" value="Content-Type"/>
+        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS"/>
       </customHeaders>
     </httpProtocol>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
+        <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
+        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.codedom>
     <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
     </compilers>
   </system.codedom>
 </configuration>
\ No newline at end of file
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index 89e47133..84dec93a 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -14,7 +14,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WebAPI</RootNamespace>
     <AssemblyName>WebAPI</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
@@ -155,6 +155,7 @@
     <Compile Include="Controllers\CommonController.cs" />
     <Compile Include="Controllers\CQMS\InspectionManagementController.cs" />
     <Compile Include="Controllers\CQMS\PerformanceController.cs" />
+    <Compile Include="Controllers\CQMS\QualityAssuranceController.cs" />
     <Compile Include="Controllers\CQMS\WBSController.cs" />
     <Compile Include="Controllers\DataSync\CNCECServerController.cs" />
     <Compile Include="Controllers\DoorProject\getController.cs" />
@@ -268,6 +269,7 @@
     <Folder Include="Images\" />
     <Folder Include="Models\" />
     <Folder Include="Views\Login\" />
+    <Folder Include="Views\QualityAssurance\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="fonts\glyphicons-halflings-regular.woff2" />
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index c2dcc265..71396b97 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>G:\鍏徃椤圭洰\浜旂幆\CNCEC_SUBQHSE_WUHUAN\SGGL\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
     <WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>